diff options
| author | Gregory Wlodarek <gregory.wlodarek@mongodb.com> | 2020-02-19 13:56:28 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-19 20:39:41 +0000 |
| commit | 95335e138106df460056105e2cf0bec08e45708e (patch) | |
| tree | 00f85fb4b651866c74017a3edbdb2a0cfdb1cc70 /src/mongo/db/pipeline/process_interface | |
| parent | 37b61a5057dee96f7d0db0b592dd084b459b7824 (diff) | |
| download | mongo-95335e138106df460056105e2cf0bec08e45708e.tar.gz | |
SERVER-46122 Make the drop command abort in-progress index builds before dropping the ready indexes and collection itself
Diffstat (limited to 'src/mongo/db/pipeline/process_interface')
| -rw-r--r-- | src/mongo/db/pipeline/process_interface/replica_set_node_process_interface.cpp | 5 | ||||
| -rw-r--r-- | src/mongo/db/pipeline/process_interface/standalone_process_interface.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/mongo/db/pipeline/process_interface/replica_set_node_process_interface.cpp b/src/mongo/db/pipeline/process_interface/replica_set_node_process_interface.cpp index bed008e597e..002e261099e 100644 --- a/src/mongo/db/pipeline/process_interface/replica_set_node_process_interface.cpp +++ b/src/mongo/db/pipeline/process_interface/replica_set_node_process_interface.cpp @@ -167,9 +167,8 @@ void ReplicaSetNodeProcessInterface::createCollection(OperationContext* opCtx, void ReplicaSetNodeProcessInterface::dropCollection(OperationContext* opCtx, const NamespaceString& ns) { - BSONObjBuilder result; - uassertStatusOK(mongo::dropCollection( - opCtx, ns, result, {}, DropCollectionSystemCollectionMode::kDisallowSystemCollectionDrops)); + uassertStatusOK(mongo::dropCollectionForApplyOps( + opCtx, ns, {}, DropCollectionSystemCollectionMode::kDisallowSystemCollectionDrops)); } std::unique_ptr<Pipeline, PipelineDeleter> diff --git a/src/mongo/db/pipeline/process_interface/standalone_process_interface.cpp b/src/mongo/db/pipeline/process_interface/standalone_process_interface.cpp index f4a805a595f..a5d38eb6fc1 100644 --- a/src/mongo/db/pipeline/process_interface/standalone_process_interface.cpp +++ b/src/mongo/db/pipeline/process_interface/standalone_process_interface.cpp @@ -145,9 +145,8 @@ void StandaloneProcessInterface::createCollection(OperationContext* opCtx, void StandaloneProcessInterface::dropCollection(OperationContext* opCtx, const NamespaceString& ns) { - BSONObjBuilder result; - uassertStatusOK(mongo::dropCollection( - opCtx, ns, result, {}, DropCollectionSystemCollectionMode::kDisallowSystemCollectionDrops)); + uassertStatusOK(mongo::dropCollectionForApplyOps( + opCtx, ns, {}, DropCollectionSystemCollectionMode::kDisallowSystemCollectionDrops)); } std::unique_ptr<Pipeline, PipelineDeleter> StandaloneProcessInterface::attachCursorSourceToPipeline( |