diff options
| author | Dianna Hohensee <dianna.hohensee@10gen.com> | 2018-02-20 17:26:45 -0500 |
|---|---|---|
| committer | Dianna Hohensee <dianna.hohensee@10gen.com> | 2018-02-23 16:56:20 -0500 |
| commit | de6ceb82f5b554f16517295adfd39c8bfd407926 (patch) | |
| tree | 398687bf08c09379e46d38e2f00f17b2352b2fb4 /src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp | |
| parent | fd83ef4e9069e4dee7149b3dc589be66590a520f (diff) | |
| download | mongo-de6ceb82f5b554f16517295adfd39c8bfd407926.tar.gz | |
SERVER-33179 Remove featureCompatibilityVersion 3.4
Diffstat (limited to 'src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp')
| -rw-r--r-- | src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp b/src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp index 79489af4c9e..5d93e1d7a62 100644 --- a/src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp +++ b/src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp @@ -340,20 +340,14 @@ StatusWith<ShardType> ShardingCatalogManager::_validateHostAsShard( } if (serverGlobalParams.featureCompatibility.getVersion() > ServerGlobalParams::FeatureCompatibility::Version::kFullyDowngradedTo36) { - // If FCV 4.0, or upgrading to / downgrading from, wire version must be LATEST. + // If the cluster's FCV is 4.0, or upgrading to / downgrading from, the node being added + // must be a v4.0 binary. invariant(maxWireVersion == WireVersion::LATEST_WIRE_VERSION); - } else if (serverGlobalParams.featureCompatibility.getVersion() > - ServerGlobalParams::FeatureCompatibility::Version::kFullyDowngradedTo34 && - serverGlobalParams.featureCompatibility.getVersion() <= - ServerGlobalParams::FeatureCompatibility::Version::kFullyDowngradedTo36) { - // If FCV 3.6, or upgrading to / downgrading from, wire version must be v3.6 - // LATEST_WIRE_VERSION or greater. - invariant(maxWireVersion >= WireVersion::LATEST_WIRE_VERSION - 1); } else { - // If FCV 3.4, wire version cannot be less than v3.4 LATEST_WIRE_VERSION. + // If the cluster's FCV is 3.6, the node being added must be a v3.6 or v4.0 binary. invariant(serverGlobalParams.featureCompatibility.getVersion() == - ServerGlobalParams::FeatureCompatibility::Version::kFullyDowngradedTo34); - invariant(maxWireVersion >= WireVersion::LATEST_WIRE_VERSION - 2); + ServerGlobalParams::FeatureCompatibility::Version::kFullyDowngradedTo36); + invariant(maxWireVersion >= WireVersion::LATEST_WIRE_VERSION - 1); } // Check whether there is a master. If there isn't, the replica set may not have been |