From 433f5cb57fbe21a5aefc9fab4380e6d4b66240a9 Mon Sep 17 00:00:00 2001 From: Alberto Lerner Date: Fri, 3 Dec 2010 15:40:51 -0500 Subject: [PATCH] migrate and split can now change sharding state (to be hooked) --- s/d_logic.h | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- s/d_state.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/s/d_logic.h b/s/d_logic.h index 76e44cde53c..07d58367c98 100644 --- a/s/d_logic.h +++ b/s/d_logic.h @@ -55,9 +55,53 @@ namespace mongo { bool needShardChunkManager( const string& ns ) const; ShardChunkManagerPtr getShardChunkManager( const string& ns ); + // chunk migrate and split support + + /** + * Creates and installs a new chunk manager for a given collection by "forgetting" about one of its chunks. + * The new manager uses the provided version, which has to be higher than the current manager's. + * One exception: if the forgotten chunk is the last one in this shard for the collection, version has to be 0. + * + * If it runs successfully, clients need to grab the new version to access the collection. + * + * @param ns the collection + * @param min max the chunk to eliminate from the current manager + * @param version at which the new manager should be at + */ + void donateChunk( const string& ns , const BSONObj& min , const BSONObj& max , ShardChunkVersion version ); + + /** + * Creates and installs a new chunk manager for a given collection by reclaiming a previously donated chunk. + * The previous manager's version has to be provided. + * + * If it runs successfully, clients that became stale by the previous donateChunk will be able to access the + * collection again. + * + * @param ns the collection + * @param min max the chunk to reclaim and add to the current manager + * @param version at which the new manager should be at + */ + void undoDonateChunk( const string& ns , const BSONObj& min , const BSONObj& max , ShardChunkVersion version ); + + /** + * Creates and installs a new chunk manager for a given collection by splitting one of its chunks in two or more. + * The version for the first split chunk should be provided. The subsequent chunks' version would be the latter with the + * minor portion incremented. + * + * The effect on clients will depend on the version used. If the major portion is the same as the current shards, + * clients shouldn't perceive the split. + * + * @param ns the collection + * @param min max the chunk that should be split + * @param splitKeys point in which to split + * @param version at which the new manager should be at + */ + void splitChunk( const string& ns , const BSONObj& min , const BSONObj& max , const vector& splitKeys , + ShardChunkVersion version ); + bool inCriticalMigrateSection(); - private: - + + private: bool _enabled; string _configServer; @@ -72,7 +116,8 @@ namespace mongo { NSVersionMap _versions; // map from a namespace into the ensemble of chunk ranges that are stored in this mongod - map _chunks; + typedef map ChunkManagersMap; + ChunkManagersMap _chunks; }; extern ShardingState shardingState; diff --git a/s/d_state.cpp b/s/d_state.cpp index f1c3d969744..f4b86fa3ea4 100644 --- a/s/d_state.cpp +++ b/s/d_state.cpp @@ -127,6 +127,49 @@ namespace mongo { } } + void ShardingState::donateChunk( const string& ns , const BSONObj& min , const BSONObj& max , ShardChunkVersion version ) { + scoped_lock lk( _mutex ); + + ChunkManagersMap::const_iterator it = _chunks.find( ns ); + assert( it != _chunks.end() ) ; + ShardChunkManagerPtr p = it->second; + + // empty shards should have version 0 + version = ( p->getNumChunks() > 1 ) ? version : ShardChunkVersion( 0 , 0 ); + + ShardChunkManagerPtr cloned( p->cloneMinus( min , max , version ) ); + _chunks[ns] = cloned; + } + + void ShardingState::undoDonateChunk( const string& ns , const BSONObj& min , const BSONObj& max , ShardChunkVersion version ) { + scoped_lock lk( _mutex ); + + ChunkManagersMap::const_iterator it = _chunks.find( ns ); + assert( it != _chunks.end() ) ; + ShardChunkManagerPtr p( it->second->clonePlus( min , max , version ) ); + _chunks[ns] = p; + } + + void ShardingState::splitChunk( const string& ns , const BSONObj& min , const BSONObj& max , const vector& splitKeys , + ShardChunkVersion version ) { + scoped_lock lk( _mutex ); + + ChunkManagersMap::const_iterator it = _chunks.find( ns ); + assert( it != _chunks.end() ) ; + + ShardChunkManagerPtr p; + BSONObj startKey = min; + for ( vector::const_iterator itKeys = splitKeys.begin(); itKeys != splitKeys.end(); ++itKeys ) { + BSONObj splitKey = *itKeys; + ShardChunkManagerPtr cloned( it->second->cloneSplit( startKey , max , splitKey , version ) ); + + version.incMinor(); + startKey = splitKey; + p = cloned; + } + _chunks[ns] = p; + } + void ShardingState::setVersion( const string& ns , const ConfigVersion& version ){ scoped_lock lk(_mutex);