diff options
| author | Pierlauro Sciarelli <pierlauro.sciarelli@mongodb.com> | 2021-07-01 14:41:53 +0000 |
|---|---|---|
| committer | Pierlauro Sciarelli <pierlauro.sciarelli@mongodb.com> | 2021-07-01 14:41:53 +0000 |
| commit | 6d9e84f1309183faf35e33bff9d59cf264e7c707 (patch) | |
| tree | 1bcba2e5ff112bb1c9110221663dbbb487842612 | |
| parent | 5bed5eb87281673fcbbde620033091437ba5db6b (diff) | |
| download | mongo-6d9e84f1309183faf35e33bff9d59cf264e7c707.tar.gz | |
Revert "SERVER-58012 Serialize implicit create collection with drop database"
This reverts commit 752121dad0a8da460f9010c4c5a8fcd6c90c6f3b.
| -rw-r--r-- | src/mongo/db/s/database_sharding_state.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/s/drop_database_coordinator.cpp | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/src/mongo/db/s/database_sharding_state.cpp b/src/mongo/db/s/database_sharding_state.cpp index f096f6abfdc..79b9db6a2cb 100644 --- a/src/mongo/db/s/database_sharding_state.cpp +++ b/src/mongo/db/s/database_sharding_state.cpp @@ -187,7 +187,7 @@ void DatabaseShardingState::checkDbVersion(OperationContext* opCtx, DSSLock&) co criticalSectionSignal); uasserted(StaleDbRoutingVersion(_dbName, *clientDbVersion, boost::none), - "database's critical section active"); + "movePrimary critical section active"); } uassert(StaleDbRoutingVersion(_dbName, *clientDbVersion, boost::none), diff --git a/src/mongo/db/s/drop_database_coordinator.cpp b/src/mongo/db/s/drop_database_coordinator.cpp index 6195cbe05d9..17d2b612f24 100644 --- a/src/mongo/db/s/drop_database_coordinator.cpp +++ b/src/mongo/db/s/drop_database_coordinator.cpp @@ -33,7 +33,6 @@ #include "mongo/db/api_parameters.h" #include "mongo/db/persistent_task_store.h" -#include "mongo/db/s/database_sharding_state.h" #include "mongo/db/s/sharding_ddl_util.h" #include "mongo/db/s/sharding_logging.h" #include "mongo/db/s/sharding_state.h" @@ -168,16 +167,6 @@ ExecutorFuture<void> DropDatabaseCoordinator::_runImpl( auto* opCtx = opCtxHolder.get(); getForwardableOpMetadata().setOn(opCtx); - const auto critSecReason = BSON("dropDatabase" << _dbName); - - { - Lock::DBLock dbLock(opCtx, _dbName, MODE_X); - auto dss = DatabaseShardingState::get(opCtx, _dbName); - auto dssLock = DatabaseShardingState::DSSLock::lockExclusive(opCtx, dss); - dss->enterCriticalSectionCatchUpPhase(opCtx, dssLock, critSecReason); - dss->enterCriticalSectionCommitPhase(opCtx, dssLock, critSecReason); - } - if (_doc.getCollInfo()) { const auto& coll = _doc.getCollInfo().get(); LOGV2_DEBUG(5494504, @@ -231,12 +220,6 @@ ExecutorFuture<void> DropDatabaseCoordinator::_runImpl( removeDatabaseMetadataFromConfig(opCtx, _dbName); { - Lock::DBLock dbLock(opCtx, _dbName, MODE_X); - auto dss = DatabaseShardingState::get(opCtx, _dbName); - dss->exitCriticalSection(opCtx, critSecReason); - } - - { // Send _flushDatabaseCacheUpdates to all shards IgnoreAPIParametersBlock ignoreApiParametersBlock{opCtx}; sharding_ddl_util::sendAuthenticatedCommandToShards( |