From 0d8371f7e13b3455506f62d8e9129e4e66ed9a15 Mon Sep 17 00:00:00 2001 From: Judah Schvimer Date: Thu, 26 Oct 2017 10:34:39 -0400 Subject: SERVER-31608 remove FCV getters --- src/mongo/db/repl/bgsync.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/mongo/db/repl/bgsync.cpp') diff --git a/src/mongo/db/repl/bgsync.cpp b/src/mongo/db/repl/bgsync.cpp index 3e7147c1ba0..dc3bc01c529 100644 --- a/src/mongo/db/repl/bgsync.cpp +++ b/src/mongo/db/repl/bgsync.cpp @@ -684,7 +684,8 @@ void BackgroundSync::_runRollback(OperationContext* opCtx, opCtx, source, &localOplog, storageInterface, getConnection); } else if (rollbackMethod != kRollbackViaRefetchNoUUID && - (serverGlobalParams.featureCompatibility.isFullyUpgradedTo36())) { + (serverGlobalParams.featureCompatibility.getVersion() == + ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo36)) { // If the user is in FCV 3.6 and the user did not specify to fall back on "roll back via // refetch" without UUID support, then we use "roll back via refetch" with UUIDs. @@ -702,12 +703,14 @@ void BackgroundSync::_runRollback(OperationContext* opCtx, } else { if (rollbackMethod == kRollbackToCheckpoint) { invariant(!supportsCheckpointRollback); - invariant(!serverGlobalParams.featureCompatibility.isFullyUpgradedTo36()); + invariant(serverGlobalParams.featureCompatibility.getVersion() != + ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo36); log() << "Rollback using the 'rollbackViaRefetchNoUUID' method because this storage " "engine does not support 'roll back to a checkpoint' and we are " "in featureCompatibilityVersion 3.4."; } else if (rollbackMethod == kRollbackViaRefetch) { - invariant(!serverGlobalParams.featureCompatibility.isFullyUpgradedTo36()); + invariant(serverGlobalParams.featureCompatibility.getVersion() != + ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo36); log() << "Rollback using the 'rollbackViaRefetchNoUUID' method. 'rollbackViaRefetch' " "with UUID support is not feature compatible with featureCompatabilityVersion " "3.4."; -- cgit v1.2.1