Revert "SERVER-30131 Ensure collections on local have UUIDs"

This reverts commit 84690cb878db1b231c00d3c9fcb0005ca7cb6361.

13 files changed, 63 insertions, 379 deletions

diff --git a/jstests/multiVersion/set_schema_version.js b/jstests/multiVersion/set_schema_version.js
index e7ee9079230..928d788e4a1 100644
--- a/jstests/multiVersion/set_schema_version.js
+++ b/jstests/multiVersion/set_schema_version.js
@@ -8,7 +8,7 @@
     const latest = "latest";
     const downgrade = "3.4";
 
-    let checkCollectionUUIDs = function(adminDB, isDowngrade) {
+    let checkCollectionUUIDs = function(adminDB, isDowngrade, excludeLocal) {
         let databaseList = adminDB.runCommand({"listDatabases": 1}).databases;
 
         databaseList.forEach(function(database) {
@@ -19,12 +19,19 @@
                 if (collectionInfos[i].name == "system.indexes") {
                     continue;
                 }
-                if (isDowngrade) {
-                    assert(!collectionInfos[i].info.uuid,
-                           "Unexpected uuid for collection: " + tojson(collectionInfos[i]));
+                if (excludeLocal) {
+                    // Exclude checking all collections in local until SERVER-30131 is fixed.
+                    if (currentDatabase != "local") {
+                        assert(collectionInfos[i].info.uuid);
+                    }
                 } else {
-                    assert(collectionInfos[i].info.uuid,
-                           "Expect uuid for collection: " + tojson(collectionInfos[i]));
+                    if (isDowngrade) {
+                        assert(!collectionInfos[i].info.uuid,
+                               "Unexpected uuid for collection: " + tojson(collectionInfos[i]));
+                    } else {
+                        assert(collectionInfos[i].info.uuid,
+                               "Expect uuid for collection: " + tojson(collectionInfos[i]));
+                    }
                 }
             }
         });
@@ -85,13 +92,13 @@
         insertDataForConn(conn, ["admin", "local", "test"]);
 
         // Ensure all collections have UUIDs in 3.6 mode.
-        checkCollectionUUIDs(adminDB, false);
+        checkCollectionUUIDs(adminDB, false, true);
 
         // Set featureCompatibilityVersion to 3.4.
         setFCV(adminDB, "3.4");
 
         // Ensure no collections in a featureCompatibilityVersion 3.4 database have UUIDs.
-        checkCollectionUUIDs(adminDB, true);
+        checkCollectionUUIDs(adminDB, true, false);
 
         // Stop Mongod 3.6
         MongoRunner.stopMongod(conn);
@@ -105,7 +112,7 @@
         checkFCV(downgradeAdminDB, "3.4", true);
 
         // Ensure there are no UUIDs
-        checkCollectionUUIDs(downgradeAdminDB, true);
+        checkCollectionUUIDs(downgradeAdminDB, true, false);
 
         // Stop 3.4
         MongoRunner.stopMongod(downgradeConn);
@@ -118,7 +125,7 @@
         // Ensure all collections have UUIDs after switching back to featureCompatibilityVersion
         // 3.6.
         setFCV(adminDB, "3.6");
-        checkCollectionUUIDs(adminDB, false);
+        checkCollectionUUIDs(adminDB, false, true);
 
         // Stop Mongod 3.6 for the last time
         MongoRunner.stopMongod(conn);
@@ -150,10 +157,10 @@
         }
 
         // Ensure all collections have UUIDs in 3.6 mode on both primary and secondaries.
-        checkCollectionUUIDs(primaryAdminDB, false);
+        checkCollectionUUIDs(primaryAdminDB, false, true);
         for (let j = 0; j < secondaries.length; j++) {
             let secondaryAdminDB = secondaries[j].getDB("admin");
-            checkCollectionUUIDs(secondaryAdminDB, false);
+            checkCollectionUUIDs(secondaryAdminDB, false, true);
         }
 
         // Change featureCompatibilityVersion to 3.4.
@@ -165,10 +172,10 @@
         }
 
         // Ensure no collections have UUIDs in 3.4 mode on both primary and secondaries.
-        checkCollectionUUIDs(primaryAdminDB, true);
+        checkCollectionUUIDs(primaryAdminDB, true, false);
         for (let j = 0; j < secondaries.length; j++) {
             let secondaryAdminDB = secondaries[j].getDB("admin");
-            checkCollectionUUIDs(secondaryAdminDB, true);
+            checkCollectionUUIDs(secondaryAdminDB, true, false);
         }
 
         // Stop 3.6 RS
@@ -184,14 +191,14 @@
         let downgradeSecondaries = downgradeRst.getSecondaries();
 
         // Initially featureCompatibilityVersion document is 3.4 on primary and secondaries.
-        checkCollectionUUIDs(downgradePrimaryAdminDB, true);
+        checkCollectionUUIDs(downgradePrimaryAdminDB, true, false);
         checkFCV(downgradePrimaryAdminDB, "3.4", true);
         for (let j = 0; j < downgradeSecondaries.length; j++) {
             let secondaryAdminDB = downgradeSecondaries[j].getDB("admin");
             checkFCV(secondaryAdminDB, "3.4", true);
 
             // Ensure no collections have UUIDs
-            checkCollectionUUIDs(secondaryAdminDB, true);
+            checkCollectionUUIDs(secondaryAdminDB, true, false);
         }
 
         downgradeRst.stopSet();
@@ -212,10 +219,10 @@
             checkFCV(secondaryAdminDB, "3.6");
         }
 
-        checkCollectionUUIDs(primaryAdminDB, false);
+        checkCollectionUUIDs(primaryAdminDB, false, true);
         for (let j = 0; j < secondaries.length; j++) {
             let secondaryAdminDB = secondaries[j].getDB("admin");
-            checkCollectionUUIDs(secondaryAdminDB, false);
+            checkCollectionUUIDs(secondaryAdminDB, false, true);
         }
 
         rst.stopSet();
diff --git a/src/mongo/db/catalog/coll_mod.cpp b/src/mongo/db/catalog/coll_mod.cpp
index cc58787cead..9badcf39050 100644
--- a/src/mongo/db/catalog/coll_mod.cpp
+++ b/src/mongo/db/catalog/coll_mod.cpp
@@ -443,10 +443,10 @@ Status _collModInternal(OperationContext* opCtx,
     return Status::OK();
 }
 
-void _updateDatabaseUUIDSchemaVersion(OperationContext* opCtx,
-                                      const std::string& dbname,
-                                      std::map<std::string, UUID>& collToUUID,
-                                      bool needUUIDAdded) {
+void _updateDBSchemaVersion(OperationContext* opCtx,
+                            const std::string& dbname,
+                            std::map<std::string, UUID>& collToUUID,
+                            bool needUUIDAdded) {
     // Iterate through all collections of database dbname and make necessary UUID changes.
     std::vector<NamespaceString> collNamespaceStrings;
     {
@@ -498,17 +498,16 @@ void _updateDatabaseUUIDSchemaVersion(OperationContext* opCtx,
     }
 }
 
-Status _updateDatabaseUUIDSchemaVersionNonReplicated(OperationContext* opCtx,
-                                                     const std::string& dbname,
-                                                     bool needUUIDAdded) {
+void _updateDBSchemaVersionNonReplicated(OperationContext* opCtx,
+                                         const std::string& dbname,
+                                         bool needUUIDAdded) {
     // Iterate through all collections if we're in the "local" database.
     std::vector<NamespaceString> collNamespaceStrings;
     if (dbname == "local") {
         AutoGetDb autoDb(opCtx, dbname, MODE_X);
         Database* const db = autoDb.getDb();
         if (!db) {
-            return Status(ErrorCodes::NamespaceNotFound,
-                          str::stream() << "database " << dbname << " does not exist");
+            return;
         }
         for (auto collectionIt = db->begin(); collectionIt != db->end(); ++collectionIt) {
             Collection* coll = *collectionIt;
@@ -541,14 +540,27 @@ Status _updateDatabaseUUIDSchemaVersionNonReplicated(OperationContext* opCtx,
         }
         if ((needUUIDAdded && !coll->uuid()) || (!needUUIDAdded && coll->uuid())) {
             BSONObjBuilder resultWeDontCareAbout;
-            auto collModStatus = _collModInternal(
-                opCtx, coll->ns(), collModObj, &resultWeDontCareAbout, /*upgradeUUID*/ true, uuid);
-            if (!collModStatus.isOK()) {
-                return collModStatus;
-            }
+            uassertStatusOK(_collModInternal(
+                opCtx, coll->ns(), collModObj, &resultWeDontCareAbout, /*upgradeUUID*/ true, uuid));
         }
     }
-    return Status::OK();
+}
+
+void updateUUIDSchemaVersionNonReplicated(OperationContext* opCtx, bool upgrade) {
+    if (!enableCollectionUUIDs) {
+        return;
+    }
+    // Update UUIDs on all collections of all non-replicated databases.
+    std::vector<std::string> dbNames;
+    StorageEngine* storageEngine = opCtx->getServiceContext()->getGlobalStorageEngine();
+    {
+        Lock::GlobalLock lk(opCtx, MODE_IS, UINT_MAX);
+        storageEngine->listDatabases(&dbNames);
+    }
+    for (auto it = dbNames.begin(); it != dbNames.end(); ++it) {
+        auto dbName = *it;
+        _updateDBSchemaVersionNonReplicated(opCtx, dbName, upgrade);
+    }
 }
 }  // namespace
 
@@ -567,10 +579,7 @@ Status collModForUUIDUpgrade(OperationContext* opCtx,
     BSONObjBuilder resultWeDontCareAbout;
     // Update all non-replicated collection UUIDs.
     if (nss.ns() == "admin.system.version") {
-        auto schemaStatus = updateUUIDSchemaVersionNonReplicated(opCtx, !!uuid);
-        if (!schemaStatus.isOK()) {
-            return schemaStatus;
-        }
+        updateUUIDSchemaVersionNonReplicated(opCtx, !!uuid);
     }
     return _collModInternal(opCtx, nss, cmdObj, &resultWeDontCareAbout, /*upgradeUUID*/ true, uuid);
 }
@@ -623,32 +632,11 @@ void updateUUIDSchemaVersion(OperationContext* opCtx, bool upgrade) {
 
     for (auto it = dbNames.begin(); it != dbNames.end(); ++it) {
         auto dbName = *it;
-        _updateDatabaseUUIDSchemaVersion(opCtx, dbName, dbToCollToUUID[dbName], upgrade);
+        _updateDBSchemaVersion(opCtx, dbName, dbToCollToUUID[dbName], upgrade);
     }
     const WriteConcernOptions writeConcern(WriteConcernOptions::kMajority,
                                            WriteConcernOptions::SyncMode::UNSET,
                                            /*timeout*/ INT_MAX);
     repl::getGlobalReplicationCoordinator()->awaitReplicationOfLastOpForClient(opCtx, writeConcern);
 }
-
-Status updateUUIDSchemaVersionNonReplicated(OperationContext* opCtx, bool upgrade) {
-    if (!enableCollectionUUIDs) {
-        return Status::OK();
-    }
-    // Update UUIDs on all collections of all non-replicated databases.
-    std::vector<std::string> dbNames;
-    StorageEngine* storageEngine = opCtx->getServiceContext()->getGlobalStorageEngine();
-    {
-        Lock::GlobalLock lk(opCtx, MODE_IS, UINT_MAX);
-        storageEngine->listDatabases(&dbNames);
-    }
-    for (auto it = dbNames.begin(); it != dbNames.end(); ++it) {
-        auto dbName = *it;
-        auto schemaStatus = _updateDatabaseUUIDSchemaVersionNonReplicated(opCtx, dbName, upgrade);
-        if (!schemaStatus.isOK()) {
-            return schemaStatus;
-        }
-    }
-    return Status::OK();
-}
 }  // namespace mongo
diff --git a/src/mongo/db/catalog/coll_mod.h b/src/mongo/db/catalog/coll_mod.h
index 6eb8b58b883..8a6eda14f46 100644
--- a/src/mongo/db/catalog/coll_mod.h
+++ b/src/mongo/db/catalog/coll_mod.h
@@ -37,20 +37,9 @@ class Collection;
 class NamespaceString;
 class OperationContext;
 
-/**
- * If upgrade is true, adds UUIDs to all collections of all databases. If upgrade is false, removes
- * UUIDs from all collections of all databases. It updates non-replicated collections by indirectly
- * calling updateUUIDSchemaVersionNonReplicated().
- */
 void updateUUIDSchemaVersion(OperationContext* opCtx, bool upgrade);
 
 /**
- * If upgrade is true, adds UUIDs to all non-replicated collections of all databases. If upgrade is
- * false, removes UUIDs from all non-replicated collections of all databases.
- */
-Status updateUUIDSchemaVersionNonReplicated(OperationContext* opCtx, bool upgrade);
-
-/**
  * Performs the collection modification described in "cmdObj" on the collection "ns".
  */
 Status collMod(OperationContext* opCtx,
diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
index 26fd4faab3b..d3bc602d95e 100644
--- a/src/mongo/db/db.cpp
+++ b/src/mongo/db/db.cpp
@@ -633,15 +633,6 @@ ExitCode _initAndListen(int listenPort) {
 
     auto startupOpCtx = serviceContext->makeOperationContext(&cc());
 
-    if (!storageGlobalParams.readOnly) {
-        if (!replSettings.usingReplSets() && !replSettings.isSlave() &&
-            storageGlobalParams.engine != "devnull") {
-            Lock::GlobalWrite lk(startupOpCtx.get());
-            FeatureCompatibilityVersion::setIfCleanStartup(
-                startupOpCtx.get(), repl::StorageInterface::get(serviceContext));
-        }
-    }
-
     repairDatabasesAndCheckVersion(startupOpCtx.get());
 
     if (storageGlobalParams.upgrade) {
@@ -780,6 +771,13 @@ ExitCode _initAndListen(int listenPort) {
             startTTLBackgroundJob();
         }
 
+        if (!replSettings.usingReplSets() && !replSettings.isSlave() &&
+            storageGlobalParams.engine != "devnull") {
+            Lock::GlobalWrite lk(startupOpCtx.get());
+            FeatureCompatibilityVersion::setIfCleanStartup(
+                startupOpCtx.get(), repl::StorageInterface::get(serviceContext));
+        }
+
         if (replSettings.usingReplSets() || (!replSettings.isMaster() && replSettings.isSlave()) ||
             !internalValidateFeaturesAsMaster) {
             serverGlobalParams.featureCompatibility.validateFeaturesAsMaster.store(false);
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index 63ab84d278a..08592d21e55 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -1592,7 +1592,6 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/client/clientdriver',
         '$BUILD_DIR/mongo/db/auth/authcore',
-        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/cloner',
         '$BUILD_DIR/mongo/db/commands/dcommands_fcv',
         '$BUILD_DIR/mongo/db/commands/list_collections_filter',
diff --git a/src/mongo/db/repl/initial_syncer.cpp b/src/mongo/db/repl/initial_syncer.cpp
index 471bb84f034..4660bf29f14 100644
--- a/src/mongo/db/repl/initial_syncer.cpp
+++ b/src/mongo/db/repl/initial_syncer.cpp
@@ -1011,28 +1011,6 @@ void InitialSyncer::_rollbackCheckerCheckForRollbackCallback(
         return;
     }
 
-    // Set UUIDs for all non-replicated collections on secondaries. See comment in
-    // ReplicationCoordinatorExternalStateImpl::initializeReplSetStorage() for the explanation of
-    // why we do this and why it is not necessary for sharded clusters.
-    if (serverGlobalParams.clusterRole != ClusterRole::ShardServer &&
-        serverGlobalParams.clusterRole != ClusterRole::ConfigServer) {
-        const NamespaceString nss("admin", "system.version");
-        auto opCtx = makeOpCtx();
-        auto statusWithUUID = _storage->getCollectionUUID(opCtx.get(), nss);
-        if (!statusWithUUID.isOK()) {
-            onCompletionGuard->setResultAndCancelRemainingWork_inlock(lock,
-                                                                      statusWithUUID.getStatus());
-            return;
-        }
-        if (statusWithUUID.getValue()) {
-            auto schemaStatus = _storage->upgradeUUIDSchemaVersionNonReplicated(opCtx.get());
-            if (!schemaStatus.isOK()) {
-                onCompletionGuard->setResultAndCancelRemainingWork_inlock(lock, schemaStatus);
-                return;
-            }
-        }
-    }
-
     // Success!
     onCompletionGuard->setResultAndCancelRemainingWork_inlock(lock, _lastApplied);
 }
diff --git a/src/mongo/db/repl/initial_syncer_test.cpp b/src/mongo/db/repl/initial_syncer_test.cpp
index 04e7b67c32a..952c3d5e2f4 100644
--- a/src/mongo/db/repl/initial_syncer_test.cpp
+++ b/src/mongo/db/repl/initial_syncer_test.cpp
@@ -222,10 +222,6 @@ protected:
         bool droppedUserDBs = false;
         std::vector<std::string> droppedCollections;
         int documentsInsertedCount = 0;
-        bool schemaUpgraded = false;
-        OptionalCollectionUUID uuid;
-        bool getCollectionUUIDShouldFail = false;
-        bool upgradeUUIDSchemaVersionNonReplicatedShouldFail = false;
     };
 
     stdx::mutex _storageInterfaceWorkDoneMutex;  // protects _storageInterfaceWorkDone.
@@ -238,10 +234,6 @@ protected:
                                                   const NamespaceString& nss) {
             LockGuard lock(_storageInterfaceWorkDoneMutex);
             _storageInterfaceWorkDone.createOplogCalled = true;
-            _storageInterfaceWorkDone.schemaUpgraded = false;
-            _storageInterfaceWorkDone.uuid = boost::none;
-            _storageInterfaceWorkDone.getCollectionUUIDShouldFail = false;
-            _storageInterfaceWorkDone.upgradeUUIDSchemaVersionNonReplicatedShouldFail = false;
             return Status::OK();
         };
         _storageInterface->truncateCollFn = [this](OperationContext* opCtx,
@@ -294,35 +286,6 @@ protected:
                 return StatusWith<std::unique_ptr<CollectionBulkLoader>>(
                     std::unique_ptr<CollectionBulkLoader>(collInfo->loader));
             };
-        _storageInterface->getCollectionUUIDFn = [this](OperationContext* opCtx,
-                                                        const NamespaceString& nss) {
-            LockGuard lock(_storageInterfaceWorkDoneMutex);
-            if (_storageInterfaceWorkDone.getCollectionUUIDShouldFail) {
-                // getCollectionUUID returns NamespaceNotFound if either the db or the collection is
-                // missing.
-                return StatusWith<OptionalCollectionUUID>(Status(
-                    ErrorCodes::NamespaceNotFound,
-                    str::stream() << "getCollectionUUID failed because namespace " << nss.ns()
-                                  << " not found."));
-            } else {
-                return StatusWith<OptionalCollectionUUID>(_storageInterfaceWorkDone.uuid);
-            }
-        };
-
-        _storageInterface->upgradeUUIDSchemaVersionNonReplicatedFn =
-            [this](OperationContext* opCtx) {
-                LockGuard lock(_storageInterfaceWorkDoneMutex);
-                if (_storageInterfaceWorkDone.upgradeUUIDSchemaVersionNonReplicatedShouldFail) {
-                    // One of the status codes a failed upgradeUUIDSchemaVersionNonReplicated call
-                    // can return is NamespaceNotFound.
-                    return Status(ErrorCodes::NamespaceNotFound,
-                                  "upgradeUUIDSchemaVersionNonReplicated failed because the "
-                                  "desired ns was not found.");
-                } else {
-                    _storageInterfaceWorkDone.schemaUpgraded = true;
-                    return Status::OK();
-                }
-            };
 
         _dbWorkThreadPool = stdx::make_unique<OldThreadPool>(1);
 
@@ -442,9 +405,6 @@ protected:
         }
     }
 
-    void doSuccessfulInitialSyncWithOneBatch();
-    OplogEntry doInitialSyncWithOneBatch();
-
     std::unique_ptr<TaskExecutorMock> _executorProxy;
 
     InitialSyncerOptions _options;
@@ -3038,7 +2998,8 @@ TEST_F(InitialSyncerTest, InitialSyncerCancelsGetNextApplierBatchCallbackOnOplog
     ASSERT_EQUALS(ErrorCodes::OperationFailed, _lastApplied);
 }
 
-OplogEntry InitialSyncerTest::doInitialSyncWithOneBatch() {
+TEST_F(InitialSyncerTest,
+       InitialSyncerReturnsLastAppliedOnReachingStopTimestampAfterApplyingOneBatch) {
     auto initialSyncer = &getInitialSyncer();
     auto opCtx = makeOpCtx();
 
@@ -3095,11 +3056,6 @@ OplogEntry InitialSyncerTest::doInitialSyncWithOneBatch() {
     }
 
     initialSyncer->join();
-    return lastOp;
-}
-
-void InitialSyncerTest::doSuccessfulInitialSyncWithOneBatch() {
-    auto lastOp = doInitialSyncWithOneBatch();
     ASSERT_EQUALS(lastOp.getOpTime(), unittest::assertGet(_lastApplied).opTime);
     ASSERT_EQUALS(lastOp.getHash(), unittest::assertGet(_lastApplied).value);
 
@@ -3108,17 +3064,6 @@ void InitialSyncerTest::doSuccessfulInitialSyncWithOneBatch() {
 }
 
 TEST_F(InitialSyncerTest,
-       InitialSyncerReturnsLastAppliedOnReachingStopTimestampAfterApplyingOneBatch) {
-    // In this test, getCollectionUUID should not return a UUID. Hence,
-    // upgradeUUIDSchemaVersionNonReplicated should not be called.
-    doSuccessfulInitialSyncWithOneBatch();
-
-    // Ensure upgradeUUIDSchemaVersionNonReplicated was not called.
-    LockGuard lock(_storageInterfaceWorkDoneMutex);
-    ASSERT_FALSE(_storageInterfaceWorkDone.schemaUpgraded);
-}
-
-TEST_F(InitialSyncerTest,
        InitialSyncerReturnsLastAppliedOnReachingStopTimestampAfterApplyingMultipleBatches) {
     auto initialSyncer = &getInitialSyncer();
     auto opCtx = makeOpCtx();
@@ -3641,53 +3586,4 @@ TEST_F(InitialSyncerTest, GetInitialSyncProgressReturnsCorrectProgress) {
         << attempt1;
 }
 
-TEST_F(InitialSyncerTest, InitialSyncerUpdatesCollectionUUIDsIfgetCollectionUUIDReturnsUUID) {
-    // Ensure getCollectionUUID returns a UUID. This should trigger a call to
-    // upgradeUUIDSchemaVersionNonReplicated.
-    {
-        LockGuard lock(_storageInterfaceWorkDoneMutex);
-        _storageInterfaceWorkDone.uuid = UUID::gen();
-    }
-    doSuccessfulInitialSyncWithOneBatch();
-
-    // Ensure upgradeUUIDSchemaVersionNonReplicated was called.
-    LockGuard lock(_storageInterfaceWorkDoneMutex);
-    ASSERT_TRUE(_storageInterfaceWorkDone.schemaUpgraded);
-}
-
-TEST_F(InitialSyncerTest, InitialSyncerCapturesGetCollectionUUIDError) {
-    // Ensure getCollectionUUID returns a bad status. This should be passed to the initial syncer.
-    {
-        LockGuard lock(_storageInterfaceWorkDoneMutex);
-        _storageInterfaceWorkDone.getCollectionUUIDShouldFail = true;
-    }
-    doInitialSyncWithOneBatch();
-
-    // Ensure the getCollectionUUID status was captured.
-    ASSERT_EQUALS(ErrorCodes::NamespaceNotFound, _lastApplied);
-
-    // Ensure upgradeUUIDSchemaVersionNonReplicated was not called.
-    LockGuard lock(_storageInterfaceWorkDoneMutex);
-    ASSERT_FALSE(_storageInterfaceWorkDone.schemaUpgraded);
-}
-
-TEST_F(InitialSyncerTest, InitialSyncerCapturesUpgradeUUIDSchemaVersionError) {
-    // Ensure getCollectionUUID returns a UUID. This should trigger a call to
-    // upgradeUUIDSchemaVersionNonReplicated.
-    {
-        LockGuard lock(_storageInterfaceWorkDoneMutex);
-        _storageInterfaceWorkDone.uuid = UUID::gen();
-    }
-
-    // Ensure upgradeUUIDSchemaVersionNonReplicated returns a bad status. This should be passed to
-    // the initial syncer.
-    {
-        LockGuard lock(_storageInterfaceWorkDoneMutex);
-        _storageInterfaceWorkDone.upgradeUUIDSchemaVersionNonReplicatedShouldFail = true;
-    }
-    doInitialSyncWithOneBatch();
-
-    // Ensure the upgradeUUIDSchemaVersionNonReplicated status was captured.
-    ASSERT_EQUALS(ErrorCodes::NamespaceNotFound, _lastApplied);
-}
 }  // namespace
diff --git a/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp b/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp
index e62bbf0066d..f1085c548f6 100644
--- a/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp
+++ b/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp
@@ -38,7 +38,6 @@
 #include "mongo/base/status_with.h"
 #include "mongo/bson/oid.h"
 #include "mongo/bson/util/bson_extract.h"
-#include "mongo/db/catalog/coll_mod.h"
 #include "mongo/db/catalog/database.h"
 #include "mongo/db/catalog/database_holder.h"
 #include "mongo/db/client.h"
@@ -391,21 +390,6 @@ Status ReplicationCoordinatorExternalStateImpl::initializeReplSetStorage(Operati
                                waitForAllEarlierOplogWritesToBeVisible(opCtx);
                            });
 
-        // Set UUIDs for all non-replicated collections. This is necessary for independent replica
-        // sets started with no data files because collections in local are created prior to the
-        // featureCompatibilityVersion being set to 3.6, so the collections are not created with
-        // UUIDs. This is not an issue for sharded clusters because the config server sends a
-        // setFeatureCompatibilityVersion command with the featureCompatibilityVersion equal to the
-        // cluster's featureCompatibilityVersion during addShard, which will add UUIDs to all
-        // collections that do not already have them. Here, we add UUIDs to the non-replicated
-        // collections on the primary. We add them on the secondaries during InitialSync.
-        if (serverGlobalParams.clusterRole != ClusterRole::ShardServer &&
-            serverGlobalParams.clusterRole != ClusterRole::ConfigServer) {
-            auto schemaStatus = updateUUIDSchemaVersionNonReplicated(opCtx, true);
-            if (!schemaStatus.isOK()) {
-                return schemaStatus;
-            }
-        }
         FeatureCompatibilityVersion::setIfCleanStartup(opCtx, _storageInterface);
     } catch (const DBException& ex) {
         return ex.toStatus();
diff --git a/src/mongo/db/repl/storage_interface.h b/src/mongo/db/repl/storage_interface.h
index afbeb3561a2..837d73fa4f1 100644
--- a/src/mongo/db/repl/storage_interface.h
+++ b/src/mongo/db/repl/storage_interface.h
@@ -290,18 +290,6 @@ public:
                                                            const NamespaceString& nss) = 0;
 
     /**
-     * Returns the UUID of the collection specified by nss, if such a UUID exists.
-     */
-    virtual StatusWith<OptionalCollectionUUID> getCollectionUUID(OperationContext* opCtx,
-                                                                 const NamespaceString& nss) = 0;
-
-    /**
-     * Adds UUIDs for non-replicated collections. To be called only at the end of initial
-     * sync and only if the admin.system.version collection has a UUID.
-     */
-    virtual Status upgradeUUIDSchemaVersionNonReplicated(OperationContext* opCtx) = 0;
-
-    /**
      * Sets the highest timestamp at which the storage engine is allowed to take a checkpoint.
      * This timestamp can never decrease, and thus should be a timestamp that can never roll back.
      */
diff --git a/src/mongo/db/repl/storage_interface_impl.cpp b/src/mongo/db/repl/storage_interface_impl.cpp
index 2e048f66c3f..47f2fd8d92f 100644
--- a/src/mongo/db/repl/storage_interface_impl.cpp
+++ b/src/mongo/db/repl/storage_interface_impl.cpp
@@ -43,7 +43,6 @@
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/util/bson_extract.h"
 #include "mongo/db/auth/authorization_manager.h"
-#include "mongo/db/catalog/coll_mod.h"
 #include "mongo/db/catalog/collection.h"
 #include "mongo/db/catalog/collection_catalog_entry.h"
 #include "mongo/db/catalog/database.h"
@@ -923,23 +922,6 @@ StatusWith<StorageInterface::CollectionCount> StorageInterfaceImpl::getCollectio
     return collection->numRecords(opCtx);
 }
 
-StatusWith<OptionalCollectionUUID> StorageInterfaceImpl::getCollectionUUID(
-    OperationContext* opCtx, const NamespaceString& nss) {
-    AutoGetCollectionForRead autoColl(opCtx, nss);
-
-    auto collectionResult = getCollection(
-        autoColl, nss, str::stream() << "Unable to get UUID of " << nss.ns() << " collection.");
-    if (!collectionResult.isOK()) {
-        return collectionResult.getStatus();
-    }
-    auto collection = collectionResult.getValue();
-    return collection->uuid();
-}
-
-Status StorageInterfaceImpl::upgradeUUIDSchemaVersionNonReplicated(OperationContext* opCtx) {
-    return updateUUIDSchemaVersionNonReplicated(opCtx, true);
-}
-
 void StorageInterfaceImpl::setStableTimestamp(ServiceContext* serviceCtx,
                                               SnapshotName snapshotName) {
     serviceCtx->getGlobalStorageEngine()->setStableTimestamp(snapshotName);
diff --git a/src/mongo/db/repl/storage_interface_impl.h b/src/mongo/db/repl/storage_interface_impl.h
index 94d973ed4e7..c020648106d 100644
--- a/src/mongo/db/repl/storage_interface_impl.h
+++ b/src/mongo/db/repl/storage_interface_impl.h
@@ -137,11 +137,6 @@ public:
     StatusWith<StorageInterface::CollectionCount> getCollectionCount(
         OperationContext* opCtx, const NamespaceString& nss) override;
 
-    StatusWith<OptionalCollectionUUID> getCollectionUUID(OperationContext* opCtx,
-                                                         const NamespaceString& nss) override;
-
-    Status upgradeUUIDSchemaVersionNonReplicated(OperationContext* opCtx) override;
-
     void setStableTimestamp(ServiceContext* serviceCtx, SnapshotName snapshotName) override;
 
     void setInitialDataTimestamp(ServiceContext* serviceCtx, SnapshotName snapshotName) override;
diff --git a/src/mongo/db/repl/storage_interface_impl_test.cpp b/src/mongo/db/repl/storage_interface_impl_test.cpp
index 62cab56c86d..607ba207b57 100644
--- a/src/mongo/db/repl/storage_interface_impl_test.cpp
+++ b/src/mongo/db/repl/storage_interface_impl_test.cpp
@@ -2283,103 +2283,6 @@ TEST_F(StorageInterfaceImplTest, GetCollectionCountReturnsCollectionCount) {
 }
 
 TEST_F(StorageInterfaceImplTest,
-       GetCollectionUUIDReturnsNamespaceNotFoundWhenDatabaseDoesNotExist) {
-    auto opCtx = getOperationContext();
-    StorageInterfaceImpl storage;
-    NamespaceString nss("nosuchdb.coll");
-    ASSERT_EQUALS(ErrorCodes::NamespaceNotFound, storage.getCollectionUUID(opCtx, nss).getStatus());
-}
-
-TEST_F(StorageInterfaceImplTest,
-       GetCollectionUUIDReturnsNamespaceNotFoundWhenCollectionDoesNotExist) {
-    auto opCtx = getOperationContext();
-    StorageInterfaceImpl storage;
-    auto nss = makeNamespace(_agent);
-    NamespaceString wrongColl(nss.db(), "wrongColl"_sd);
-    ASSERT_OK(storage.createCollection(opCtx, nss, CollectionOptions()));
-    ASSERT_EQUALS(ErrorCodes::NamespaceNotFound,
-                  storage.getCollectionUUID(opCtx, wrongColl).getStatus());
-}
-
-TEST_F(StorageInterfaceImplTest, GetCollectionUUIDReturnsBoostNoneWhenCollectionHasNoUUID) {
-    auto opCtx = getOperationContext();
-    StorageInterfaceImpl storage;
-    auto nss = makeNamespace(_agent);
-    ASSERT_OK(storage.createCollection(opCtx, nss, CollectionOptions()));
-    auto uuid = unittest::assertGet(storage.getCollectionUUID(opCtx, nss));
-    ASSERT_EQ(uuid, boost::none);
-}
-
-TEST_F(StorageInterfaceImplTest, GetCollectionUUIDReturnsUUIDIfExists) {
-    auto opCtx = getOperationContext();
-    StorageInterfaceImpl storage;
-    auto nss = makeNamespace(_agent);
-    CollectionOptions options;
-    options.uuid = UUID::gen();
-    ASSERT_OK(storage.createCollection(opCtx, nss, options));
-    auto uuid = unittest::assertGet(storage.getCollectionUUID(opCtx, nss));
-    ASSERT_EQ(uuid, options.uuid);
-}
-
-TEST_F(StorageInterfaceImplTest, UpgradeUUIDSchemaVersionNonReplicatedUpgradesLocalCollections) {
-    auto opCtx = getOperationContext();
-    StorageInterfaceImpl storage;
-    auto nss = makeNamespace(_agent);
-
-    // Create a collection on the local database with no UUID.
-    ASSERT_OK(storage.createCollection(opCtx, nss, CollectionOptions()));
-    auto uuid = unittest::assertGet(storage.getCollectionUUID(opCtx, nss));
-    ASSERT_EQ(uuid, boost::none);
-    ASSERT_OK(storage.upgradeUUIDSchemaVersionNonReplicated(opCtx));
-
-    // Ensure a UUID now exists on the collection.
-    uuid = unittest::assertGet(storage.getCollectionUUID(opCtx, nss));
-    ASSERT_NOT_EQUALS(uuid, boost::none);
-}
-
-TEST_F(StorageInterfaceImplTest, UpgradeUUIDSchemaVersionNonReplicatedIgnoresUpgradedCollections) {
-    auto opCtx = getOperationContext();
-    StorageInterfaceImpl storage;
-    auto nss = makeNamespace(_agent);
-    CollectionOptions options;
-    options.uuid = UUID::gen();
-
-    // Create a collection on the local database with a UUID.
-    ASSERT_OK(storage.createCollection(opCtx, nss, options));
-    auto uuid = unittest::assertGet(storage.getCollectionUUID(opCtx, nss));
-    ASSERT_EQ(uuid, options.uuid);
-    ASSERT_OK(storage.upgradeUUIDSchemaVersionNonReplicated(opCtx));
-
-    // Ensure the UUID has not changed after the upgrade.
-    uuid = unittest::assertGet(storage.getCollectionUUID(opCtx, nss));
-    ASSERT_EQUALS(uuid, options.uuid);
-}
-
-TEST_F(StorageInterfaceImplTest, UpgradeUUIDSchemaVersionNonReplicatedUpgradesSystemDotProfile) {
-    auto opCtx = getOperationContext();
-    StorageInterfaceImpl storage;
-    const NamespaceString nss("testdb", "system.profile");
-
-    // Create a system.profile collection with no UUID.
-    ASSERT_OK(storage.createCollection(opCtx, nss, CollectionOptions()));
-    auto uuid = unittest::assertGet(storage.getCollectionUUID(opCtx, nss));
-    ASSERT_EQ(uuid, boost::none);
-
-    // Also create another collection on the same database that will not be assigned a UUID.
-    const NamespaceString noUUIDNss("testdb", "noUUIDCollection");
-    ASSERT_OK(storage.createCollection(opCtx, noUUIDNss, CollectionOptions()));
-    auto noUUID = unittest::assertGet(storage.getCollectionUUID(opCtx, noUUIDNss));
-    ASSERT_EQ(noUUID, boost::none);
-    ASSERT_OK(storage.upgradeUUIDSchemaVersionNonReplicated(opCtx));
-
-    // Ensure a UUID now exists on the system.profile collection but not noUUIDCollection.
-    uuid = unittest::assertGet(storage.getCollectionUUID(opCtx, nss));
-    ASSERT_NOT_EQUALS(uuid, boost::none);
-    noUUID = unittest::assertGet(storage.getCollectionUUID(opCtx, noUUIDNss));
-    ASSERT_EQ(noUUID, boost::none);
-}
-
-TEST_F(StorageInterfaceImplTest,
        GetCollectionSizeReturnsNamespaceNotFoundWhenDatabaseDoesNotExist) {
     auto opCtx = getOperationContext();
     StorageInterfaceImpl storage;
diff --git a/src/mongo/db/repl/storage_interface_mock.h b/src/mongo/db/repl/storage_interface_mock.h
index 9c88532781f..f0c14a61b9e 100644
--- a/src/mongo/db/repl/storage_interface_mock.h
+++ b/src/mongo/db/repl/storage_interface_mock.h
@@ -122,9 +122,6 @@ public:
                                                         BoundInclusion boundInclusion,
                                                         std::size_t limit)>;
     using IsAdminDbValidFn = stdx::function<Status(OperationContext* opCtx)>;
-    using GetCollectionUUIDFn = stdx::function<StatusWith<OptionalCollectionUUID>(
-        OperationContext* opCtx, const NamespaceString& nss)>;
-    using UpgradeUUIDSchemaVersionNonReplicatedFn = stdx::function<Status(OperationContext* opCtx)>;
 
     StorageInterfaceMock() = default;
 
@@ -256,15 +253,6 @@ public:
         return 0;
     }
 
-    StatusWith<OptionalCollectionUUID> getCollectionUUID(OperationContext* opCtx,
-                                                         const NamespaceString& nss) override {
-        return getCollectionUUIDFn(opCtx, nss);
-    }
-
-    Status upgradeUUIDSchemaVersionNonReplicated(OperationContext* opCtx) override {
-        return upgradeUUIDSchemaVersionNonReplicatedFn(opCtx);
-    }
-
     void setStableTimestamp(ServiceContext* serviceCtx, SnapshotName snapshotName) override;
 
     void setInitialDataTimestamp(ServiceContext* serviceCtx, SnapshotName snapshotName) override;
@@ -342,15 +330,6 @@ public:
     IsAdminDbValidFn isAdminDbValidFn = [](OperationContext*) {
         return Status{ErrorCodes::IllegalOperation, "IsAdminDbValidFn not implemented."};
     };
-    GetCollectionUUIDFn getCollectionUUIDFn = [](
-        OperationContext* opCtx, const NamespaceString& nss) -> StatusWith<OptionalCollectionUUID> {
-        return Status{ErrorCodes::IllegalOperation, "GetCollectionUUIDFn not implemented."};
-    };
-    UpgradeUUIDSchemaVersionNonReplicatedFn upgradeUUIDSchemaVersionNonReplicatedFn =
-        [](OperationContext* opCtx) -> Status {
-        return Status{ErrorCodes::IllegalOperation,
-                      "UpgradeUUIDSchemaVersionNonReplicatedFn not implemented."};
-    };
 
 private:
     mutable stdx::mutex _mutex;
@@ -358,8 +337,6 @@ private:
     bool _rbidInitialized = false;
     SnapshotName _stableTimestamp = SnapshotName::min();
     SnapshotName _initialDataTimestamp = SnapshotName::min();
-    OptionalCollectionUUID _uuid;
-    bool _schemaUpgraded;
 };
 
 }  // namespace repl