summaryrefslogtreecommitdiff
path: root/src/mongo/db/s/collection_sharding_state.cpp
diff options
context:
space:
mode:
authorGeert Bosch <geert@mongodb.com>2019-03-07 19:33:27 -0500
committerGeert Bosch <geert@mongodb.com>2019-03-07 19:33:27 -0500
commit7f6279afcc08a84cd980ea193b9962eab0ae4f25 (patch)
treec905df0551e07f69808c0b46d6ef3d5b00eeec72 /src/mongo/db/s/collection_sharding_state.cpp
parenta76788e89bf54abacccefeba62d4e3775f20c555 (diff)
downloadmongo-7f6279afcc08a84cd980ea193b9962eab0ae4f25.tar.gz
SERVER-40020 Make isCollectionLockHeldForMode take NamespaceString, not StringData
Diffstat (limited to 'src/mongo/db/s/collection_sharding_state.cpp')
-rw-r--r--src/mongo/db/s/collection_sharding_state.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/s/collection_sharding_state.cpp b/src/mongo/db/s/collection_sharding_state.cpp
index b9037015042..1ce7bd0f7b2 100644
--- a/src/mongo/db/s/collection_sharding_state.cpp
+++ b/src/mongo/db/s/collection_sharding_state.cpp
@@ -141,7 +141,7 @@ CollectionShardingState::CollectionShardingState(NamespaceString nss)
CollectionShardingState* CollectionShardingState::get(OperationContext* opCtx,
const NamespaceString& nss) {
// Collection lock must be held to have a reference to the collection's sharding state
- dassert(opCtx->lockState()->isCollectionLockedForMode(nss.ns(), MODE_IS));
+ dassert(opCtx->lockState()->isCollectionLockedForMode(nss, MODE_IS));
auto& collectionsMap = CollectionShardingStateMap::get(opCtx->getServiceContext());
return &collectionsMap->getOrCreate(nss);
@@ -266,17 +266,17 @@ void CollectionShardingState::checkShardVersionOrThrow(OperationContext* opCtx)
}
void CollectionShardingState::enterCriticalSectionCatchUpPhase(OperationContext* opCtx, CSRLock&) {
- invariant(opCtx->lockState()->isCollectionLockedForMode(_nss.ns(), MODE_X));
+ invariant(opCtx->lockState()->isCollectionLockedForMode(_nss, MODE_X));
_critSec.enterCriticalSectionCatchUpPhase();
}
void CollectionShardingState::enterCriticalSectionCommitPhase(OperationContext* opCtx, CSRLock&) {
- invariant(opCtx->lockState()->isCollectionLockedForMode(_nss.ns(), MODE_X));
+ invariant(opCtx->lockState()->isCollectionLockedForMode(_nss, MODE_X));
_critSec.enterCriticalSectionCommitPhase();
}
void CollectionShardingState::exitCriticalSection(OperationContext* opCtx, CSRLock&) {
- invariant(opCtx->lockState()->isCollectionLockedForMode(_nss.ns(), MODE_IX));
+ invariant(opCtx->lockState()->isCollectionLockedForMode(_nss, MODE_IX));
_critSec.exitCriticalSection();
}