diff options
author | Xiangyu Yao <xiangyu.yao@mongodb.com> | 2019-04-25 14:52:27 -0400 |
---|---|---|
committer | Xiangyu Yao <xiangyu.yao@mongodb.com> | 2019-04-25 14:54:20 -0400 |
commit | 62aa69d685e1b6cde2fd3ab826cf12d1f20221fd (patch) | |
tree | 3f07096bd5f5c7f5edde9a43a084400480a41431 /src/mongo/db/commands/validate.cpp | |
parent | 24d4a296aacf4acc981094f5cdf973ad62ab67fa (diff) | |
download | mongo-62aa69d685e1b6cde2fd3ab826cf12d1f20221fd.tar.gz |
Revert "SERVER-39520 Use database IX lock for dropCollection"
This reverts commit fdc3712e4cb89c23451061b4c927a78340269d89.
Diffstat (limited to 'src/mongo/db/commands/validate.cpp')
-rw-r--r-- | src/mongo/db/commands/validate.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mongo/db/commands/validate.cpp b/src/mongo/db/commands/validate.cpp index df8abe7b222..dbc5ff11323 100644 --- a/src/mongo/db/commands/validate.cpp +++ b/src/mongo/db/commands/validate.cpp @@ -123,7 +123,7 @@ public: } AutoGetDb ctx(opCtx, nss.db(), MODE_IX); - Lock::CollectionLock collLk(opCtx, nss, MODE_X); + auto collLk = stdx::make_unique<Lock::CollectionLock>(opCtx, nss, MODE_X); Collection* collection = ctx.getDb() ? ctx.getDb()->getCollection(opCtx, nss) : NULL; if (!collection) { if (ctx.getDb() && ViewCatalog::get(ctx.getDb())->lookup(opCtx, nss.ns())) { @@ -163,7 +163,8 @@ public: const bool background = false; ValidateResults results; - Status status = collection->validate(opCtx, level, background, &results, &result); + Status status = + collection->validate(opCtx, level, background, std::move(collLk), &results, &result); if (!status.isOK()) { return CommandHelpers::appendCommandStatusNoThrow(result, status); } |