SERVER-30242 SERVER-31513 SERVER-31235 Make method to determine if fCV has been initialized in memory. Make fCV state one atomic variable. Initialize fCV on arbiters once a primary is elected.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/mongo/db/commands/feature_compatibility_version.h b/src/mongo/db/commands/feature_compatibility_version.h
index fef4ebd025f..d1fa7fc742c 100644
--- a/src/mongo/db/commands/feature_compatibility_version.h
+++ b/src/mongo/db/commands/feature_compatibility_version.h
@@ -45,11 +45,9 @@ class OperationContext;
  **/
 struct FeatureCompatibilityVersionInfo {
     ServerGlobalParams::FeatureCompatibility::Version version;
-    ServerGlobalParams::FeatureCompatibility::Version targetVersion;
 
     FeatureCompatibilityVersionInfo()
-        : version(ServerGlobalParams::FeatureCompatibility::Version::kUnset),
-          targetVersion(ServerGlobalParams::FeatureCompatibility::Version::kUnset) {}
+        : version(ServerGlobalParams::FeatureCompatibility::Version::kUnset) {}
 };
 
 /**
@@ -86,6 +84,10 @@ public:
                 return FeatureCompatibilityVersionCommandParser::kVersion36;
             case ServerGlobalParams::FeatureCompatibility::Version::k34:
                 return FeatureCompatibilityVersionCommandParser::kVersion34;
+            case ServerGlobalParams::FeatureCompatibility::Version::kUpgradingTo36:
+                return FeatureCompatibilityVersionCommandParser::kVersionUpgradingTo36;
+            case ServerGlobalParams::FeatureCompatibility::Version::kDowngradingTo34:
+                return FeatureCompatibilityVersionCommandParser::kVersionDowngradingTo34;
             case ServerGlobalParams::FeatureCompatibility::Version::kUnset:
                 return FeatureCompatibilityVersionCommandParser::kVersionUnset;
             default: