diff options
| author | Xiangyu Yao <xiangyu.yao@mongodb.com> | 2019-04-17 16:47:36 -0400 |
|---|---|---|
| committer | Xiangyu Yao <xiangyu.yao@mongodb.com> | 2019-04-25 14:24:32 -0400 |
| commit | fdc3712e4cb89c23451061b4c927a78340269d89 (patch) | |
| tree | 151f8e9cfdad4a83dc30542c11c8f94b612c9fed /src/mongo/db/catalog/collection_impl.cpp | |
| parent | e4b0acb5770c5664db031d0c51389932fc2c4d56 (diff) | |
| download | mongo-fdc3712e4cb89c23451061b4c927a78340269d89.tar.gz | |
SERVER-39520 Use database IX lock for dropCollection
Diffstat (limited to 'src/mongo/db/catalog/collection_impl.cpp')
| -rw-r--r-- | src/mongo/db/catalog/collection_impl.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mongo/db/catalog/collection_impl.cpp b/src/mongo/db/catalog/collection_impl.cpp index fcb62484ea6..aa662981b29 100644 --- a/src/mongo/db/catalog/collection_impl.cpp +++ b/src/mongo/db/catalog/collection_impl.cpp @@ -1273,7 +1273,6 @@ void _validateCatalogEntry(OperationContext* opCtx, Status CollectionImpl::validate(OperationContext* opCtx, ValidateCmdLevel level, bool background, - std::unique_ptr<Lock::CollectionLock> collLk, ValidateResults* results, BSONObjBuilder* output) { dassert(opCtx->lockState()->isCollectionLockedForMode(ns(), MODE_IS)); @@ -1281,8 +1280,7 @@ Status CollectionImpl::validate(OperationContext* opCtx, try { ValidateResultsMap indexNsResultsMap; BSONObjBuilder keysPerIndex; // not using subObjStart to be exception safe - IndexConsistency indexConsistency( - opCtx, this, ns(), _recordStore, std::move(collLk), background); + IndexConsistency indexConsistency(opCtx, this, ns(), _recordStore, background); RecordStoreValidateAdaptor indexValidator = RecordStoreValidateAdaptor( opCtx, &indexConsistency, level, _indexCatalog.get(), &indexNsResultsMap); |