diff options
Diffstat (limited to 'src/mongo/db/s/drop_collection_coordinator.cpp')
| -rw-r--r-- | src/mongo/db/s/drop_collection_coordinator.cpp | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/src/mongo/db/s/drop_collection_coordinator.cpp b/src/mongo/db/s/drop_collection_coordinator.cpp index 11c6fe8d601..16269e0f9e8 100644 --- a/src/mongo/db/s/drop_collection_coordinator.cpp +++ b/src/mongo/db/s/drop_collection_coordinator.cpp @@ -44,24 +44,6 @@ #include "mongo/s/request_types/sharded_ddl_commands_gen.h" namespace mongo { -namespace { - -void dropCollectionHonouringFromMigrateFlag(OperationContext* opCtx, - const NamespaceString& nss, - bool fromMigrate) { - if (fromMigrate) { - mongo::sharding_ddl_util::ensureCollectionDroppedNoChangeEvent(opCtx, nss); - } else { - DropReply unused; - uassertStatusOK( - dropCollection(opCtx, - nss, - &unused, - DropCollectionSystemCollectionMode::kDisallowSystemCollectionDrops)); - } -} - -} // namespace DropCollectionCoordinator::DropCollectionCoordinator(ShardingDDLCoordinatorService* service, const BSONObj& initialState) @@ -106,7 +88,13 @@ void DropCollectionCoordinator::dropCollectionLocally(OperationContext* opCtx, } try { - dropCollectionHonouringFromMigrateFlag(opCtx, nss, fromMigrate); + DropReply unused; + uassertStatusOK( + dropCollection(opCtx, + nss, + &unused, + DropCollectionSystemCollectionMode::kDisallowSystemCollectionDrops, + fromMigrate)); } catch (const ExceptionFor<ErrorCodes::NamespaceNotFound>&) { // Note that even if the namespace was not found we have to execute the code below! LOGV2_DEBUG(5280920, |