diff options
| author | agirbal <antoine@10gen.com> | 2011-06-27 13:52:12 -0700 |
|---|---|---|
| committer | agirbal <antoine@10gen.com> | 2011-06-27 13:53:24 -0700 |
| commit | 17ba23539c86aa8b8c3bedc6bf6898a51ca12017 (patch) | |
| tree | febdc6e26a637c38fa3498d1c5edc57b87e80bef /s/strategy_shard.cpp | |
| parent | 29156d4a006df61acabb2807387b3089002bf8e3 (diff) | |
| download | mongo-17ba23539c86aa8b8c3bedc6bf6898a51ca12017.tar.gz | |
SERVER-2531: remove possible shard chunk splitting during M/R output
Diffstat (limited to 's/strategy_shard.cpp')
| -rw-r--r-- | s/strategy_shard.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/s/strategy_shard.cpp b/s/strategy_shard.cpp index 4ff35673220..12d2049cdbf 100644 --- a/s/strategy_shard.cpp +++ b/s/strategy_shard.cpp @@ -224,16 +224,11 @@ namespace mongo { ChunkPtr c = manager->findChunk( o ); log(4) << " server:" << c->getShard().toString() << " " << o << endl; insert( c->getShard() , ns , o , flags, safe); - -// r.gotInsert(); -// if ( r.getClientInfo()->autoSplitOk() ) - c->splitIfShould( o.objsize() ); break; } catch ( StaleConfigException& e ) { int logLevel = i < ( maxTries / 2 ); LOG( logLevel ) << "retrying insert because of StaleConfigException: " << e << " object: " << o << endl; -// r.reset(); unsigned long long old = manager->getSequenceNumber(); manager = conf->getChunkManager(ns); @@ -421,8 +416,6 @@ namespace mongo { try { ChunkPtr c = manager->findChunk( chunkFinder ); update(c->getShard(), ns, query, toupdate, flags); -// if ( r.getClientInfo()->autoSplitOk() ) - c->splitIfShould( toupdate.objsize() ); break; } catch ( StaleConfigException& e ) { @@ -431,7 +424,6 @@ namespace mongo { left--; log() << "update will be retried b/c sharding config info is stale, " << " left:" << left << " ns: " << ns << " query: " << query << endl; -// r.reset( false ); manager = conf->getChunkManager(ns); uassert(14849, "collection no longer sharded", manager); } |