diff options
author | Patrick Freed <patrick.freed@mongodb.com> | 2023-02-17 15:23:40 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-02-17 18:04:39 +0000 |
commit | b221af175a73b66a640a92fb364b8cc1a759e5e3 (patch) | |
tree | e7cf414f83050f1caa476f2febde773ec92f87c4 /src/mongo/db/commands/dbcommands.cpp | |
parent | 6289f39abc73003ad1f7ac9f0ecfc038170b131c (diff) | |
download | mongo-b221af175a73b66a640a92fb364b8cc1a759e5e3.tar.gz |
SERVER-73307 Ensure CurOpStack always has access to its OperationContext (#10536)
This also ensures base lock stats are properly subtracted out when getting the lock stats for a given sub operation (fixes SERVER-73571).
Diffstat (limited to 'src/mongo/db/commands/dbcommands.cpp')
-rw-r--r-- | src/mongo/db/commands/dbcommands.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mongo/db/commands/dbcommands.cpp b/src/mongo/db/commands/dbcommands.cpp index efca6b757d7..83a886f42c3 100644 --- a/src/mongo/db/commands/dbcommands.cpp +++ b/src/mongo/db/commands/dbcommands.cpp @@ -634,7 +634,7 @@ public: NamespaceString::DollarInDbNameBehavior::Allow)); { - CurOp::get(opCtx)->ensureStarted(opCtx); + CurOp::get(opCtx)->ensureStarted(); stdx::lock_guard<Client> lk(*opCtx->getClient()); CurOp::get(opCtx)->setNS_inlock(dbname); } @@ -676,9 +676,7 @@ public: { stdx::lock_guard<Client> lk(*opCtx->getClient()); CurOp::get(opCtx)->enter_inlock( - opCtx, - dbname, - CollectionCatalog::get(opCtx)->getDatabaseProfileLevel(dbname)); + dbname, CollectionCatalog::get(opCtx)->getDatabaseProfileLevel(dbname)); } db->getStats(opCtx, &reply, cmd.getFreeStorage(), cmd.getScale()); |