SERVER-29350 Bump featureCompatibilityVersion to 3.6

1 files changed, 1 insertions, 31 deletions

diff --git a/src/mongo/db/index/index_descriptor.cpp b/src/mongo/db/index/index_descriptor.cpp
index 08696cd525e..5115a5edda6 100644
--- a/src/mongo/db/index/index_descriptor.cpp
+++ b/src/mongo/db/index/index_descriptor.cpp
@@ -116,21 +116,8 @@ Status IndexDescriptor::isIndexVersionAllowedForCreation(
         case IndexVersion::kV0:
             break;
         case IndexVersion::kV1:
+        case IndexVersion::kV2:
             return Status::OK();
-        case IndexVersion::kV2: {
-            if (ServerGlobalParams::FeatureCompatibility::Version::k32 ==
-                    featureCompatibility.version.load() &&
-                featureCompatibility.validateFeaturesAsMaster.load()) {
-                return {ErrorCodes::CannotCreateIndex,
-                        str::stream() << "Invalid index specification " << indexSpec
-                                      << "; cannot create an index with v="
-                                      << static_cast<int>(IndexVersion::kV2)
-                                      << " when the featureCompatibilityVersion is 3.2. See "
-                                         "http://dochub.mongodb.org/core/"
-                                         "3.4-feature-compatibility."};
-            }
-            return Status::OK();
-        }
     }
     return {ErrorCodes::CannotCreateIndex,
             str::stream() << "Invalid index specification " << indexSpec
@@ -140,23 +127,6 @@ Status IndexDescriptor::isIndexVersionAllowedForCreation(
 
 IndexVersion IndexDescriptor::getDefaultIndexVersion(
     ServerGlobalParams::FeatureCompatibility::Version featureCompatibilityVersion) {
-    ServerGlobalParams::FeatureCompatibility featureCompatibility;
-    featureCompatibility.version.store(featureCompatibilityVersion);
-    // We always pass validateFeaturesAsMaster=true since this flag should not affect our
-    // determination of the default index version.
-    featureCompatibility.validateFeaturesAsMaster.store(true);
-    // We pass in an empty object for the index specification because it is only used within the
-    // error reason.
-    if (!IndexDescriptor::isIndexVersionAllowedForCreation(
-             IndexVersion::kV2, featureCompatibility, BSONObj())
-             .isOK()) {
-        // When the featureCompatibilityVersion is 3.2, we use index version v=1 as the default
-        // index version.
-        return IndexVersion::kV1;
-    }
-
-    // When the featureCompatibilityVersion is 3.4, we use index version v=2 as the default index
-    // version.
     return IndexVersion::kV2;
 }