diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-12-10 16:47:48 -0500 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-12-10 16:47:48 -0500 |
| commit | 8e3fe7f38c3d1ae8e072839bd4e2aaf78e19783c (patch) | |
| tree | 7d733766a32619e19bfb550e68ce4e3e097d5eb9 /src/mongo/s/d_state.cpp | |
| parent | d3ad0ad3cc1bcba0523860eedbd508d4d055309e (diff) | |
| download | mongo-8e3fe7f38c3d1ae8e072839bd4e2aaf78e19783c.tar.gz | |
Revert "SERVER-16429 Get rid of assertWriteLocked which was doing incomplete check"
This reverts commit 77f3100bc8753055224abb0c6439fc506eeb02de.
Diffstat (limited to 'src/mongo/s/d_state.cpp')
| -rw-r--r-- | src/mongo/s/d_state.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mongo/s/d_state.cpp b/src/mongo/s/d_state.cpp index e45afddb60e..4addb2b72e1 100644 --- a/src/mongo/s/d_state.cpp +++ b/src/mongo/s/d_state.cpp @@ -198,7 +198,7 @@ namespace mongo { const BSONObj& max, ChunkVersion version) { - invariant(txn->lockState()->isCollectionLockedForMode(ns, MODE_X)); + txn->lockState()->assertWriteLocked( ns ); scoped_lock lk( _mutex ); CollectionMetadataMap::const_iterator it = _collMetadata.find( ns ); @@ -227,8 +227,8 @@ namespace mongo { void ShardingState::undoDonateChunk(OperationContext* txn, const string& ns, CollectionMetadataPtr prevMetadata) { - - invariant(txn->lockState()->isCollectionLockedForMode(ns, MODE_X)); + + txn->lockState()->assertWriteLocked( ns ); scoped_lock lk( _mutex ); log() << "ShardingState::undoDonateChunk acquired _mutex" << endl; @@ -245,7 +245,7 @@ namespace mongo { const OID& epoch, string* errMsg ) { - invariant(txn->lockState()->isCollectionLockedForMode(ns, MODE_X)); + txn->lockState()->assertWriteLocked( ns ); scoped_lock lk( _mutex ); CollectionMetadataMap::const_iterator it = _collMetadata.find( ns ); @@ -290,7 +290,7 @@ namespace mongo { const OID& epoch, string* errMsg ) { - invariant(txn->lockState()->isCollectionLockedForMode(ns, MODE_X)); + txn->lockState()->assertWriteLocked( ns ); scoped_lock lk( _mutex ); CollectionMetadataMap::const_iterator it = _collMetadata.find( ns ); @@ -335,7 +335,7 @@ namespace mongo { const vector<BSONObj>& splitKeys, ChunkVersion version ) { - invariant(txn->lockState()->isCollectionLockedForMode(ns, MODE_X)); + txn->lockState()->assertWriteLocked( ns ); scoped_lock lk( _mutex ); CollectionMetadataMap::const_iterator it = _collMetadata.find( ns ); @@ -359,7 +359,7 @@ namespace mongo { const BSONObj& maxKey, ChunkVersion mergedVersion ) { - invariant(txn->lockState()->isCollectionLockedForMode(ns, MODE_X)); + txn->lockState()->assertWriteLocked( ns ); scoped_lock lk( _mutex ); CollectionMetadataMap::const_iterator it = _collMetadata.find( ns ); |