summaryrefslogtreecommitdiff
path: root/src/mongo/db/s/config/sharding_catalog_manager_database_operations.cpp
diff options
context:
space:
mode:
authorBlake Oler <blake.oler@mongodb.com>2018-06-05 13:20:17 -0400
committerBlake Oler <blake.oler@mongodb.com>2018-06-15 13:19:44 -0400
commit7a46f808c6e24613ba08cdd7260877122813d59c (patch)
tree53859740d65ff615022b5eae08f4ead60b6e210e /src/mongo/db/s/config/sharding_catalog_manager_database_operations.cpp
parent82b62cf1e513657a0c35d757cf37eab0231ebc9b (diff)
downloadmongo-7a46f808c6e24613ba08cdd7260877122813d59c.tar.gz
SERVER-34285 Remove FCV 3.6 switch logic in movePrimary
Diffstat (limited to 'src/mongo/db/s/config/sharding_catalog_manager_database_operations.cpp')
-rw-r--r--src/mongo/db/s/config/sharding_catalog_manager_database_operations.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/mongo/db/s/config/sharding_catalog_manager_database_operations.cpp b/src/mongo/db/s/config/sharding_catalog_manager_database_operations.cpp
index a7371789025..c98b33d10e6 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager_database_operations.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager_database_operations.cpp
@@ -211,19 +211,6 @@ Status ShardingCatalogManager::commitMovePrimary(OperationContext* opCtx,
auto const configShard = Grid::get(opCtx)->shardRegistry()->getConfigShard();
- // Hold the Global IX lock across checking the FCV and writing the database entry. Because of
- // the Global S lock barrier in setFCV, this ensures a concurrent setFCV will block before
- // performing schema downgrade until we have written the entry.
- Lock::GlobalLock lk(opCtx, MODE_IX);
-
- auto currentFCV = serverGlobalParams.featureCompatibility.getVersion();
-
- // If we're not in 4.0, then fail. We want to have assurance that the schema will accept a
- // version field in config.databases.
- uassert(ErrorCodes::ConflictingOperationInProgress,
- "committing movePrimary failed due to version mismatch",
- currentFCV == ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo40);
-
// Must use local read concern because we will perform subsequent writes.
auto findResponse = uassertStatusOK(
configShard->exhaustiveFindOnConfig(opCtx,