Revert "SERVER-48413 Add evergreen builder for resumable index builds"

This reverts commit 29e2a6737ef643bf663579c5c7b378a5c383c9b8.

8 files changed, 1 insertions, 35 deletions

diff --git a/src/mongo/db/index_builds_coordinator.cpp b/src/mongo/db/index_builds_coordinator.cpp
index fb1527d1158..5d083373387 100644
--- a/src/mongo/db/index_builds_coordinator.cpp
+++ b/src/mongo/db/index_builds_coordinator.cpp
@@ -2580,14 +2580,4 @@ std::vector<BSONObj> IndexBuildsCoordinator::normalizeIndexSpecs(
     });
     return normalSpecs;
 }
-
-bool IndexBuildsCoordinator::supportsResumableIndexBuilds() const {
-    auto serviceContext = getGlobalServiceContext();
-    invariant(serviceContext);
-
-    auto storageEngine = serviceContext->getStorageEngine();
-    invariant(storageEngine);
-
-    return storageEngine->supportsResumableIndexBuilds();
-}
 }  // namespace mongo
diff --git a/src/mongo/db/index_builds_coordinator.h b/src/mongo/db/index_builds_coordinator.h
index db8040fd227..fa843e73a1c 100644
--- a/src/mongo/db/index_builds_coordinator.h
+++ b/src/mongo/db/index_builds_coordinator.h
@@ -446,8 +446,6 @@ public:
         std::shared_ptr<ReplIndexBuildState> replState,
         IndexBuildAction signal) = 0;
 
-    bool supportsResumableIndexBuilds() const;
-
 private:
     /**
      * Registers an index build so that the rest of the system can discover it.
diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript
index 7d2bc4aba98..4d5f1ef273b 100644
--- a/src/mongo/db/storage/SConscript
+++ b/src/mongo/db/storage/SConscript
@@ -520,7 +520,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/logical_clock',
         '$BUILD_DIR/mongo/db/storage/storage_repair_observer',
         '$BUILD_DIR/mongo/db/catalog/collection_catalog_helper',
-        'two_phase_index_build_knobs_idl',
     ],
 )
 
diff --git a/src/mongo/db/storage/storage_engine.h b/src/mongo/db/storage/storage_engine.h
index 75ade54103f..8d7df601b5a 100644
--- a/src/mongo/db/storage/storage_engine.h
+++ b/src/mongo/db/storage/storage_engine.h
@@ -430,8 +430,6 @@ public:
      */
     virtual bool supportsPendingDrops() const = 0;
 
-    virtual bool supportsResumableIndexBuilds() const = 0;
-
     /**
      * Returns a set of drop pending idents inside the storage engine.
      */
diff --git a/src/mongo/db/storage/storage_engine_impl.cpp b/src/mongo/db/storage/storage_engine_impl.cpp
index bd0318aa798..80c9a181a07 100644
--- a/src/mongo/db/storage/storage_engine_impl.cpp
+++ b/src/mongo/db/storage/storage_engine_impl.cpp
@@ -46,7 +46,6 @@
 #include "mongo/db/storage/kv/kv_engine.h"
 #include "mongo/db/storage/kv/temporary_kv_record_store.h"
 #include "mongo/db/storage/storage_repair_observer.h"
-#include "mongo/db/storage/two_phase_index_build_knobs_gen.h"
 #include "mongo/db/unclean_shutdown.h"
 #include "mongo/logv2/log.h"
 #include "mongo/stdx/unordered_map.h"
@@ -860,13 +859,6 @@ bool StorageEngineImpl::supportsPendingDrops() const {
     return supportsReadConcernMajority();
 }
 
-bool StorageEngineImpl::supportsResumableIndexBuilds() const {
-    return enableResumableIndexBuilds && supportsReadConcernMajority() && !isEphemeral() &&
-        serverGlobalParams.featureCompatibility.isVersionInitialized() &&
-        serverGlobalParams.featureCompatibility.getVersion() ==
-        ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo46;
-}
-
 void StorageEngineImpl::clearDropPendingState() {
     _dropPendingIdentReaper.clearDropPendingState();
 }
diff --git a/src/mongo/db/storage/storage_engine_impl.h b/src/mongo/db/storage/storage_engine_impl.h
index af4170d3245..70bc31830c3 100644
--- a/src/mongo/db/storage/storage_engine_impl.h
+++ b/src/mongo/db/storage/storage_engine_impl.h
@@ -157,8 +157,6 @@ public:
 
     bool supportsPendingDrops() const final;
 
-    bool supportsResumableIndexBuilds() const final;
-
     void clearDropPendingState() final;
 
     SnapshotManager* getSnapshotManager() const final;
diff --git a/src/mongo/db/storage/storage_init.cpp b/src/mongo/db/storage/storage_init.cpp
index a00940b5d2d..1da860e1e0d 100644
--- a/src/mongo/db/storage/storage_init.cpp
+++ b/src/mongo/db/storage/storage_init.cpp
@@ -69,9 +69,7 @@ public:
                            << "supportsSnapshotReadConcern" << engine->supportsReadConcernSnapshot()
                            << "readOnly" << storageGlobalParams.readOnly << "persistent"
                            << !engine->isEphemeral() << "backupCursorOpen"
-                           << backupCursorHooks->isBackupCursorOpen()
-                           << "supportsResumableIndexBuilds"
-                           << engine->supportsResumableIndexBuilds());
+                           << backupCursorHooks->isBackupCursorOpen());
     }
 
 } storageSSS;
diff --git a/src/mongo/db/storage/two_phase_index_build_knobs.idl b/src/mongo/db/storage/two_phase_index_build_knobs.idl
index 11c4203b399..2dd6bed23e9 100644
--- a/src/mongo/db/storage/two_phase_index_build_knobs.idl
+++ b/src/mongo/db/storage/two_phase_index_build_knobs.idl
@@ -52,10 +52,3 @@ server_parameters:
     default: 3
     validator:
       gte: 0
-
-  enableResumableIndexBuilds:
-    description: "Support for using resumable index builds."
-    set_at: startup
-    cpp_vartype: bool
-    cpp_varname: "enableResumableIndexBuilds"
-    default: false