diff options
| author | Blake Oler <blake.oler@mongodb.com> | 2020-04-01 15:41:51 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-04-02 23:26:41 +0000 |
| commit | 203772a9c04dd8f6edd703639157c73851e9f35a (patch) | |
| tree | 84d2f3a8f03779f07a41dde64a3e78c044d242db /src | |
| parent | 907fc7a809ae947f24395033027c68de9c7ae415 (diff) | |
| download | mongo-203772a9c04dd8f6edd703639157c73851e9f35a.tar.gz | |
SERVER-46828 Remove FCV-dependent checks from finer-grained stale shard version code
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/db/s/scoped_operation_completion_sharding_actions.cpp | 6 | ||||
| -rw-r--r-- | src/mongo/db/service_entry_point_mongod.cpp | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/mongo/db/s/scoped_operation_completion_sharding_actions.cpp b/src/mongo/db/s/scoped_operation_completion_sharding_actions.cpp index c49f26c39fb..4dd5443ed4e 100644 --- a/src/mongo/db/s/scoped_operation_completion_sharding_actions.cpp +++ b/src/mongo/db/s/scoped_operation_completion_sharding_actions.cpp @@ -78,11 +78,7 @@ ScopedOperationCompletionShardingActions::~ScopedOperationCompletionShardingActi oss.setMigrationCriticalSectionSignal(staleInfo->getCriticalSectionSignal()); } - if (serverGlobalParams.featureCompatibility.isVersionInitialized() && - serverGlobalParams.featureCompatibility.getVersion() == - ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo44) { - invariant(staleInfo->getShardId()); - } + invariant(staleInfo->getShardId()); auto handleMismatchStatus = onShardVersionMismatchNoExcept( _opCtx, staleInfo->getNss(), staleInfo->getVersionReceived()); diff --git a/src/mongo/db/service_entry_point_mongod.cpp b/src/mongo/db/service_entry_point_mongod.cpp index 137f921bb6e..bb873e70e20 100644 --- a/src/mongo/db/service_entry_point_mongod.cpp +++ b/src/mongo/db/service_entry_point_mongod.cpp @@ -198,11 +198,7 @@ public: oss.setMigrationCriticalSectionSignal(sce->getCriticalSectionSignal()); } - if (serverGlobalParams.featureCompatibility.isVersionInitialized() && - serverGlobalParams.featureCompatibility.getVersion() == - ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo44) { - invariant(sce->getShardId()); - } + invariant(sce->getShardId()); if (!opCtx->getClient()->isInDirectClient()) { // We already have the StaleConfig exception, so just swallow any errors due to |