summaryrefslogtreecommitdiff
path: root/src/mongo/db/catalog
diff options
context:
space:
mode:
authorDianna <dianna.hohensee@10gen.com>2019-05-09 08:13:31 -0400
committerDianna <dianna.hohensee@10gen.com>2019-05-14 18:10:38 -0400
commit09db7023065f42ccc39dd3309536726814379c86 (patch)
tree7d7f153b943b1afc0546433b3efae61bd1812cd9 /src/mongo/db/catalog
parentafa6c9136387f07c0bba8dfc33178acfb826fe43 (diff)
downloadmongo-09db7023065f42ccc39dd3309536726814379c86.tar.gz
SERVER-39860 Separate reporting of RSTL and PBWM locks metrics in serverStatus and currentOp
Diffstat (limited to 'src/mongo/db/catalog')
-rw-r--r--src/mongo/db/catalog/rename_collection.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mongo/db/catalog/rename_collection.cpp b/src/mongo/db/catalog/rename_collection.cpp
index 203db323fd5..7aa953aa7c6 100644
--- a/src/mongo/db/catalog/rename_collection.cpp
+++ b/src/mongo/db/catalog/rename_collection.cpp
@@ -650,9 +650,7 @@ Status renameBetweenDBs(OperationContext* opCtx,
if (opCtx->getServiceContext()->getStorageEngine()->supportsDBLocking()) {
if (globalWriteLock) {
- const ResourceId globalLockResourceId(RESOURCE_GLOBAL,
- ResourceId::SINGLETON_GLOBAL);
- opCtx->lockState()->downgrade(globalLockResourceId, MODE_IX);
+ opCtx->lockState()->downgrade(resourceIdGlobal, MODE_IX);
invariant(!opCtx->lockState()->isW());
} else {
invariant(opCtx->lockState()->isW());