SERVER-39079 Move BackgroundOperation checks out of the catalog layer; add parallel IndexBuildsCoordinator checks for all BackgroundOperation checks

37 files changed, 254 insertions, 94 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index a9389aaad96..0e87f6bd85b 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -990,7 +990,6 @@ env.Library(
         "query_exec",
         "service_context",
         "$BUILD_DIR/mongo/base",
-        "$BUILD_DIR/mongo/db/catalog/catalog_helpers",
         "$BUILD_DIR/mongo/db/catalog/commit_quorum_options",
         "$BUILD_DIR/mongo/db/catalog/index_build_entry_idl",
         "$BUILD_DIR/mongo/db/matcher/expressions_mongod_only",
diff --git a/src/mongo/db/background.cpp b/src/mongo/db/background.cpp
index eb24f3c6529..f499e8a1a2e 100644
--- a/src/mongo/db/background.cpp
+++ b/src/mongo/db/background.cpp
@@ -136,6 +136,17 @@ bool BackgroundOperation::inProgForNs(StringData ns) {
     return nsInProg.find(ns) != nsInProg.end();
 }
 
+void BackgroundOperation::assertNoBgOpInProg() {
+    for (auto& db : dbsInProg) {
+        uassert(ErrorCodes::BackgroundOperationInProgressForDatabase,
+                mongoutils::str::stream()
+                    << "cannot perform operation: a background operation is currently running for "
+                       "database "
+                    << db.first,
+                !inProgForDb(db.first));
+    }
+}
+
 void BackgroundOperation::assertNoBgOpInProgForDb(StringData db) {
     uassert(ErrorCodes::BackgroundOperationInProgressForDatabase,
             mongoutils::str::stream()
diff --git a/src/mongo/db/background.h b/src/mongo/db/background.h
index 97495163b44..6aa4a680e03 100644
--- a/src/mongo/db/background.h
+++ b/src/mongo/db/background.h
@@ -61,6 +61,7 @@ public:
     static bool inProgForDb(StringData db);
     static int numInProgForDb(StringData db);
     static bool inProgForNs(StringData ns);
+    static void assertNoBgOpInProg();
     static void assertNoBgOpInProgForDb(StringData db);
     static void assertNoBgOpInProgForNs(StringData ns);
     static void awaitNoBgOpInProgForDb(StringData db);
diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript
index efc323713ce..e8bc9168d3c 100644
--- a/src/mongo/db/catalog/SConscript
+++ b/src/mongo/db/catalog/SConscript
@@ -355,6 +355,7 @@ env.Library(
     LIBDEPS_PRIVATE=[
         'collection',
         'uuid_catalog',
+        '$BUILD_DIR/mongo/db/index_builds_coordinator_interface',
         '$BUILD_DIR/mongo/db/repair_database',
         '$BUILD_DIR/mongo/db/service_context',
     ],
@@ -368,6 +369,7 @@ env.CppUnitTest(
     LIBDEPS=[
         'catalog_control',
         'database_holder',
+        '$BUILD_DIR/mongo/db/index_builds_coordinator_mongod',
         '$BUILD_DIR/mongo/db/service_context',
     ],
 )
@@ -436,6 +438,7 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/background',
         '$BUILD_DIR/mongo/db/db_raii',
+        '$BUILD_DIR/mongo/db/index_builds_coordinator_interface',
         '$BUILD_DIR/mongo/db/query_exec',
         '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/views/views',
diff --git a/src/mongo/db/catalog/capped_utils.cpp b/src/mongo/db/catalog/capped_utils.cpp
index 2ddae23aa80..0f9562d653c 100644
--- a/src/mongo/db/catalog/capped_utils.cpp
+++ b/src/mongo/db/catalog/capped_utils.cpp
@@ -45,6 +45,7 @@
 #include "mongo/db/client.h"
 #include "mongo/db/concurrency/write_conflict_exception.h"
 #include "mongo/db/curop.h"
+#include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/op_observer.h"
 #include "mongo/db/query/internal_plans.h"
 #include "mongo/db/query/plan_yield_policy.h"
@@ -95,6 +96,8 @@ Status emptyCapped(OperationContext* opCtx, const NamespaceString& collectionNam
     }
 
     BackgroundOperation::assertNoBgOpInProgForNs(collectionName.ns());
+    IndexBuildsCoordinator::get(opCtx)->assertNoIndexBuildInProgForCollection(
+        collection->uuid().get());
 
     WriteUnitOfWork wuow(opCtx);
 
@@ -258,6 +261,7 @@ void convertToCapped(OperationContext* opCtx,
         ErrorCodes::NamespaceNotFound, str::stream() << "database " << dbname << " not found", db);
 
     BackgroundOperation::assertNoBgOpInProgForDb(dbname);
+    IndexBuildsCoordinator::get(opCtx)->assertNoBgOpInProgForDb(dbname);
 
     // Generate a temporary collection name that will not collide with any existing collections.
     auto tmpNameResult =
diff --git a/src/mongo/db/catalog/catalog_control.cpp b/src/mongo/db/catalog/catalog_control.cpp
index e9199519632..f3e93ba6814 100644
--- a/src/mongo/db/catalog/catalog_control.cpp
+++ b/src/mongo/db/catalog/catalog_control.cpp
@@ -32,12 +32,14 @@
 
 #include "mongo/db/catalog/catalog_control.h"
 
+#include "mongo/db/background.h"
 #include "mongo/db/catalog/collection.h"
 #include "mongo/db/catalog/database.h"
 #include "mongo/db/catalog/database_catalog_entry.h"
 #include "mongo/db/catalog/database_holder.h"
 #include "mongo/db/catalog/uuid_catalog.h"
 #include "mongo/db/ftdc/ftdc_mongod.h"
+#include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/repair_database.h"
 #include "mongo/util/log.h"
@@ -47,6 +49,9 @@ namespace catalog {
 MinVisibleTimestampMap closeCatalog(OperationContext* opCtx) {
     invariant(opCtx->lockState()->isW());
 
+    BackgroundOperation::assertNoBgOpInProg();
+    IndexBuildsCoordinator::get(opCtx)->assertNoIndexBuildInProgress();
+
     MinVisibleTimestampMap minVisibleTimestampMap;
     std::vector<std::string> allDbs;
     opCtx->getServiceContext()->getStorageEngine()->listDatabases(&allDbs);
diff --git a/src/mongo/db/catalog/catalog_control_test.cpp b/src/mongo/db/catalog/catalog_control_test.cpp
index b887b9ef5d7..39b4d74153b 100644
--- a/src/mongo/db/catalog/catalog_control_test.cpp
+++ b/src/mongo/db/catalog/catalog_control_test.cpp
@@ -31,6 +31,7 @@
 
 #include "mongo/db/catalog/database_holder_mock.h"
 #include "mongo/db/client.h"
+#include "mongo/db/index_builds_coordinator_mongod.h"
 #include "mongo/db/operation_context_noop.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/storage/storage_engine.h"
@@ -112,6 +113,10 @@ void CatalogControlTest::setUp() {
         auto storageEngine = std::make_unique<MockStorageEngine>();
         serviceContext->setStorageEngine(std::move(storageEngine));
         DatabaseHolder::set(serviceContext.get(), std::make_unique<DatabaseHolderMock>());
+        // Only need the IndexBuildsCoordinator to call into and check whether there are any index
+        // builds in progress.
+        IndexBuildsCoordinator::set(serviceContext.get(),
+                                    std::make_unique<IndexBuildsCoordinatorMongod>());
         setGlobalServiceContext(std::move(serviceContext));
     }
 
diff --git a/src/mongo/db/catalog/coll_mod.cpp b/src/mongo/db/catalog/coll_mod.cpp
index b28a7bbccdb..6e2ac01fb74 100644
--- a/src/mongo/db/catalog/coll_mod.cpp
+++ b/src/mongo/db/catalog/coll_mod.cpp
@@ -45,6 +45,7 @@
 #include "mongo/db/command_generic_argument.h"
 #include "mongo/db/db_raii.h"
 #include "mongo/db/index/index_descriptor.h"
+#include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/op_observer.h"
 #include "mongo/db/repl/repl_client_info.h"
 #include "mongo/db/repl/replication_coordinator.h"
@@ -319,6 +320,10 @@ Status _collModInternal(OperationContext* opCtx,
     // This can kill all cursors so don't allow running it while a background operation is in
     // progress.
     BackgroundOperation::assertNoBgOpInProgForNs(nss);
+    if (coll) {
+        IndexBuildsCoordinator::get(opCtx)->assertNoIndexBuildInProgForCollection(
+            coll->uuid().get());
+    }
 
     // If db/collection/view does not exist, short circuit and return.
     if (!db || (!coll && !view)) {
diff --git a/src/mongo/db/catalog/collection.h b/src/mongo/db/catalog/collection.h
index b32c0e449b8..85598d29f51 100644
--- a/src/mongo/db/catalog/collection.h
+++ b/src/mongo/db/catalog/collection.h
@@ -315,6 +315,9 @@ public:
      * removes all documents as fast as possible
      * indexes before and after will be the same
      * as will other characteristics.
+     *
+     * The caller should hold a collection X lock and ensure there are no index builds in progress
+     * on the collection.
      */
     virtual Status truncate(OperationContext* const opCtx) = 0;
 
@@ -343,6 +346,9 @@ public:
      * collection.  The collection cannot be completely emptied using this
      * function.  An assertion will be thrown if that is attempted.
      * @param inclusive - Truncate 'end' as well iff true
+     *
+     * The caller should hold a collection X lock and ensure there are no index builds in progress
+     * on the collection.
      */
     virtual void cappedTruncateAfter(OperationContext* const opCtx,
                                      RecordId end,
diff --git a/src/mongo/db/catalog/collection_impl.cpp b/src/mongo/db/catalog/collection_impl.cpp
index a11d2461ba1..1d53ce43989 100644
--- a/src/mongo/db/catalog/collection_impl.cpp
+++ b/src/mongo/db/catalog/collection_impl.cpp
@@ -780,7 +780,6 @@ uint64_t CollectionImpl::getIndexSize(OperationContext* opCtx, BSONObjBuilder* d
  */
 Status CollectionImpl::truncate(OperationContext* opCtx) {
     dassert(opCtx->lockState()->isCollectionLockedForMode(ns(), MODE_X));
-    BackgroundOperation::assertNoBgOpInProgForNs(ns());
     invariant(_indexCatalog->numIndexesInProgress(opCtx) == 0);
 
     // 1) store index specs
@@ -815,7 +814,6 @@ Status CollectionImpl::truncate(OperationContext* opCtx) {
 void CollectionImpl::cappedTruncateAfter(OperationContext* opCtx, RecordId end, bool inclusive) {
     dassert(opCtx->lockState()->isCollectionLockedForMode(ns(), MODE_X));
     invariant(isCapped());
-    BackgroundOperation::assertNoBgOpInProgForNs(ns());
     invariant(_indexCatalog->numIndexesInProgress(opCtx) == 0);
 
     _recordStore->cappedTruncateAfter(opCtx, end, inclusive);
diff --git a/src/mongo/db/catalog/collection_impl.h b/src/mongo/db/catalog/collection_impl.h
index 1260150ca49..73861c965de 100644
--- a/src/mongo/db/catalog/collection_impl.h
+++ b/src/mongo/db/catalog/collection_impl.h
@@ -224,6 +224,9 @@ public:
      * removes all documents as fast as possible
      * indexes before and after will be the same
      * as will other characteristics
+     *
+     * The caller should hold a collection X lock and ensure there are no index builds in progress
+     * on the collection.
      */
     Status truncate(OperationContext* opCtx) final;
 
@@ -252,6 +255,9 @@ public:
      * collection.  The collection cannot be completely emptied using this
      * function.  An assertion will be thrown if that is attempted.
      * @param inclusive - Truncate 'end' as well iff true
+     *
+     * The caller should hold a collection X lock and ensure there are no index builds in progress
+     * on the collection.
      */
     void cappedTruncateAfter(OperationContext* opCtx, RecordId end, bool inclusive) final;
 
diff --git a/src/mongo/db/catalog/database.h b/src/mongo/db/catalog/database.h
index 30648c41bd9..4e4245f4625 100644
--- a/src/mongo/db/catalog/database.h
+++ b/src/mongo/db/catalog/database.h
@@ -176,6 +176,9 @@ public:
      *
      * If we are applying a 'drop' oplog entry on a secondary, 'dropOpTime' will contain the optime
      * of the oplog entry.
+     *
+     * The caller should hold a DB X lock and ensure there are no index builds in progress on the
+     * collection.
      */
     virtual Status dropCollection(OperationContext* const opCtx,
                                   const StringData fullns,
diff --git a/src/mongo/db/catalog/database_holder.h b/src/mongo/db/catalog/database_holder.h
index 0ddefd433f5..fdadd00bd0f 100644
--- a/src/mongo/db/catalog/database_holder.h
+++ b/src/mongo/db/catalog/database_holder.h
@@ -81,7 +81,8 @@ public:
      * doesn't notify the replication subsystem or do any other consistency checks, so it should
      * not be used directly from user commands.
      *
-     * Must be called with the specified database locked in X mode.
+     * Must be called with the specified database locked in X mode. The caller must ensure no index
+     * builds are in progress on the database.
      */
     virtual void dropDb(OperationContext* opCtx, Database* db) = 0;
 
@@ -94,6 +95,8 @@ public:
     /**
      * Closes all opened databases. Must be called with the global lock acquired in X-mode.
      * Will uassert if any background jobs are running when this function is called.
+     *
+     * The caller must hold the global X lock and ensure there are no index builds in progress.
      */
     virtual void closeAll(OperationContext* opCtx) = 0;
 
diff --git a/src/mongo/db/catalog/database_holder_impl.cpp b/src/mongo/db/catalog/database_holder_impl.cpp
index f518c6c0f13..d333d8bfe0f 100644
--- a/src/mongo/db/catalog/database_holder_impl.cpp
+++ b/src/mongo/db/catalog/database_holder_impl.cpp
@@ -170,7 +170,12 @@ void DatabaseHolderImpl::dropDb(OperationContext* opCtx, Database* db) {
 
     invariant(opCtx->lockState()->isDbLockedForMode(name, MODE_X));
 
-    BackgroundOperation::assertNoBgOpInProgForDb(name);
+    for (auto&& coll : *db) {
+        // It is the caller's responsibility to ensure that no index builds are active in the
+        // database.
+        invariant(!coll->getIndexCatalog()->haveAnyIndexesInProgress(),
+                  str::stream() << "An index is building on collection '" << coll->ns() << "'.");
+    }
 
     audit::logDropDatabase(opCtx->getClient(), name);
 
@@ -232,7 +237,13 @@ void DatabaseHolderImpl::closeAll(OperationContext* opCtx) {
 
     std::set<std::string> dbs;
     for (DBs::const_iterator i = _dbs.begin(); i != _dbs.end(); ++i) {
-        BackgroundOperation::assertNoBgOpInProgForDb(i->first);
+        for (auto&& coll : *(i->second)) {
+            // It is the caller's responsibility to ensure that no index builds are active in the
+            // database.
+            invariant(!coll->getIndexCatalog()->haveAnyIndexesInProgress(),
+                      str::stream() << "An index is building on collection '" << coll->ns()
+                                    << "'.");
+        }
         dbs.insert(i->first);
     }
 
diff --git a/src/mongo/db/catalog/database_impl.cpp b/src/mongo/db/catalog/database_impl.cpp
index e8db845ce50..8833c4fea54 100644
--- a/src/mongo/db/catalog/database_impl.cpp
+++ b/src/mongo/db/catalog/database_impl.cpp
@@ -515,12 +515,10 @@ Status DatabaseImpl::dropCollectionEvenIfSystem(OperationContext* opCtx,
 
     uassertNamespaceNotIndex(fullns.toString(), "dropCollection");
 
-    BackgroundOperation::assertNoBgOpInProgForNs(fullns);
-
     // Make sure no indexes builds are in progress.
     // Use massert() to be consistent with IndexCatalog::dropAllIndexes().
     auto numIndexesInProgress = collection->getIndexCatalog()->numIndexesInProgress(opCtx);
-    massert(40461,
+    massert(ErrorCodes::BackgroundOperationInProgressForNamespace,
             str::stream() << "cannot drop collection " << fullns << " (" << uuidString << ") when "
                           << numIndexesInProgress
                           << " index builds in progress.",
@@ -695,8 +693,6 @@ Status DatabaseImpl::renameCollection(OperationContext* opCtx,
                                       bool stayTemp) {
     audit::logRenameCollection(&cc(), fromNS, toNS);
     invariant(opCtx->lockState()->isDbLockedForMode(name(), MODE_X));
-    BackgroundOperation::assertNoBgOpInProgForNs(fromNS);
-    BackgroundOperation::assertNoBgOpInProgForNs(toNS);
 
     const NamespaceString fromNSS(fromNS);
     const NamespaceString toNSS(toNS);
@@ -713,6 +709,20 @@ Status DatabaseImpl::renameCollection(OperationContext* opCtx,
     if (!collToRename) {
         return Status(ErrorCodes::NamespaceNotFound, "collection not found to rename");
     }
+    invariant(!collToRename->getIndexCatalog()->haveAnyIndexesInProgress(),
+              mongoutils::str::stream()
+                  << "cannot perform operation: an index build is currently running for "
+                     "collection "
+                  << fromNSS);
+
+    Collection* toColl = getCollection(opCtx, toNSS);
+    if (toColl) {
+        invariant(!toColl->getIndexCatalog()->haveAnyIndexesInProgress(),
+                  mongoutils::str::stream()
+                      << "cannot perform operation: an index build is currently running for "
+                         "collection "
+                      << toNSS);
+    }
 
     log() << "renameCollection: renaming collection " << collToRename->uuid()->toString()
           << " from " << fromNS << " to " << toNS;
diff --git a/src/mongo/db/catalog/database_impl.h b/src/mongo/db/catalog/database_impl.h
index 31e04fb8476..09b5441c0bf 100644
--- a/src/mongo/db/catalog/database_impl.h
+++ b/src/mongo/db/catalog/database_impl.h
@@ -83,6 +83,9 @@ public:
      *
      * If we are applying a 'drop' oplog entry on a secondary, 'dropOpTime' will contain the optime
      * of the oplog entry.
+     *
+     * The caller should hold a DB X lock and ensure there are no index builds in progress on the
+     * collection.
      */
     Status dropCollection(OperationContext* opCtx,
                           StringData fullns,
@@ -122,6 +125,9 @@ public:
      * Renames the fully qualified namespace 'fromNS' to the fully qualified namespace 'toNS'.
      * Illegal to call unless both 'fromNS' and 'toNS' are within this database. Returns an error if
      * 'toNS' already exists or 'fromNS' does not exist.
+     *
+     * The caller should hold a DB X lock and ensure there are no index builds in progress on either
+     * the 'fromNS' or the 'toNS'.
      */
     Status renameCollection(OperationContext* opCtx,
                             StringData fromNS,
diff --git a/src/mongo/db/catalog/database_test.cpp b/src/mongo/db/catalog/database_test.cpp
index e1743a76488..70af753caa0 100644
--- a/src/mongo/db/catalog/database_test.cpp
+++ b/src/mongo/db/catalog/database_test.cpp
@@ -324,7 +324,9 @@ void _testDropCollectionThrowsExceptionIfThereAreIndexesInProgress(OperationCont
         ASSERT_GREATER_THAN(indexCatalog->numIndexesInProgress(opCtx), 0);
 
         WriteUnitOfWork wuow(opCtx);
-        ASSERT_THROWS_CODE(db->dropCollection(opCtx, nss.ns()), AssertionException, 40461);
+        ASSERT_THROWS_CODE(db->dropCollection(opCtx, nss.ns()),
+                           AssertionException,
+                           ErrorCodes::BackgroundOperationInProgressForNamespace);
     });
 }
 
diff --git a/src/mongo/db/catalog/drop_collection.cpp b/src/mongo/db/catalog/drop_collection.cpp
index 93b281930a1..110016b1474 100644
--- a/src/mongo/db/catalog/drop_collection.cpp
+++ b/src/mongo/db/catalog/drop_collection.cpp
@@ -39,6 +39,7 @@
 #include "mongo/db/concurrency/write_conflict_exception.h"
 #include "mongo/db/curop.h"
 #include "mongo/db/db_raii.h"
+#include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/repl/replication_coordinator.h"
 #include "mongo/db/server_options.h"
 #include "mongo/db/service_context.h"
@@ -98,6 +99,8 @@ Status dropCollection(OperationContext* opCtx,
             int numIndexes = coll->getIndexCatalog()->numIndexesTotal(opCtx);
 
             BackgroundOperation::assertNoBgOpInProgForNs(collectionName.ns());
+            IndexBuildsCoordinator::get(opCtx)->assertNoIndexBuildInProgForCollection(
+                coll->uuid().get());
 
             Status s = systemCollectionMode ==
                     DropCollectionSystemCollectionMode::kDisallowSystemCollectionDrops
diff --git a/src/mongo/db/catalog/drop_database.cpp b/src/mongo/db/catalog/drop_database.cpp
index 13b8193f36c..2f2b9f79d29 100644
--- a/src/mongo/db/catalog/drop_database.cpp
+++ b/src/mongo/db/catalog/drop_database.cpp
@@ -41,6 +41,7 @@
 #include "mongo/db/client.h"
 #include "mongo/db/concurrency/write_conflict_exception.h"
 #include "mongo/db/curop.h"
+#include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/op_observer.h"
 #include "mongo/db/repl/repl_client_info.h"
 #include "mongo/db/repl/replication_coordinator.h"
@@ -65,6 +66,10 @@ Status _finishDropDatabase(OperationContext* opCtx,
                            const std::string& dbName,
                            Database* db,
                            std::size_t numCollections) {
+    invariant(opCtx->lockState()->isDbLockedForMode(dbName, MODE_X));
+    BackgroundOperation::assertNoBgOpInProgForDb(dbName);
+    IndexBuildsCoordinator::get(opCtx)->assertNoBgOpInProgForDb(dbName);
+
     // If DatabaseHolder::dropDb() fails, we should reset the drop-pending state on Database.
     auto dropPendingGuard = makeGuard([db, opCtx] { db->setDropPending(opCtx, false); });
 
@@ -175,6 +180,10 @@ Status dropDatabase(OperationContext* opCtx, const std::string& dbName) {
                 invariant(!nss.isReplicated() || nss.coll().startsWith("tmp.mr"));
             }
 
+            BackgroundOperation::assertNoBgOpInProgForNs(nss.ns());
+            IndexBuildsCoordinator::get(opCtx)->assertNoIndexBuildInProgForCollection(
+                db->getCollection(opCtx, nss)->uuid().get());
+
             WriteUnitOfWork wunit(opCtx);
             // A primary processing this will assign a timestamp when the operation is written to
             // the oplog. As stated above, a secondary processing must only observe non-replicated
diff --git a/src/mongo/db/catalog/drop_indexes.cpp b/src/mongo/db/catalog/drop_indexes.cpp
index eb8049c3090..56143447308 100644
--- a/src/mongo/db/catalog/drop_indexes.cpp
+++ b/src/mongo/db/catalog/drop_indexes.cpp
@@ -40,6 +40,7 @@
 #include "mongo/db/curop.h"
 #include "mongo/db/db_raii.h"
 #include "mongo/db/index/index_descriptor.h"
+#include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/op_observer.h"
 #include "mongo/db/repl/replication_coordinator.h"
 #include "mongo/db/service_context.h"
@@ -225,9 +226,12 @@ Status dropIndexes(OperationContext* opCtx,
             return Status(ErrorCodes::NamespaceNotFound, "ns not found");
         }
 
+        BackgroundOperation::assertNoBgOpInProgForNs(nss);
+        IndexBuildsCoordinator::get(opCtx)->assertNoIndexBuildInProgForCollection(
+            collection->uuid().get());
+
         WriteUnitOfWork wunit(opCtx);
         OldClientContext ctx(opCtx, nss.ns());
-        BackgroundOperation::assertNoBgOpInProgForNs(nss);
 
         Status status = wrappedRun(opCtx, collection, cmdObj, result);
         if (!status.isOK()) {
diff --git a/src/mongo/db/catalog/index_catalog.h b/src/mongo/db/catalog/index_catalog.h
index 5ee4aed313c..5ba372df577 100644
--- a/src/mongo/db/catalog/index_catalog.h
+++ b/src/mongo/db/catalog/index_catalog.h
@@ -218,6 +218,8 @@ public:
 
     virtual bool haveAnyIndexes() const = 0;
 
+    virtual bool haveAnyIndexesInProgress() const = 0;
+
     virtual int numIndexesTotal(OperationContext* const opCtx) const = 0;
 
     virtual int numIndexesReady(OperationContext* const opCtx) const = 0;
@@ -301,6 +303,9 @@ public:
      * Use this method to notify the IndexCatalog that the spec for this index has changed.
      *
      * It is invalid to dereference 'oldDesc' after calling this method.
+     *
+     * The caller must hold the collection X lock and ensure no index builds are in progress
+     * on the collection.
      */
     virtual const IndexDescriptor* refreshEntry(OperationContext* const opCtx,
                                                 const IndexDescriptor* const oldDesc) = 0;
@@ -372,6 +377,12 @@ public:
                                 stdx::function<void(const IndexDescriptor*)> onDropFn) = 0;
     virtual void dropAllIndexes(OperationContext* opCtx, bool includingIdIndex) = 0;
 
+    /**
+     * Drops the index.
+     *
+     * The caller must hold the collection X lock and ensure no index builds are in progress on the
+     * collection.
+     */
     virtual Status dropIndex(OperationContext* const opCtx, const IndexDescriptor* const desc) = 0;
 
     /**
diff --git a/src/mongo/db/catalog/index_catalog_impl.cpp b/src/mongo/db/catalog/index_catalog_impl.cpp
index 7f7d98b17c5..902daebfa3c 100644
--- a/src/mongo/db/catalog/index_catalog_impl.cpp
+++ b/src/mongo/db/catalog/index_catalog_impl.cpp
@@ -740,7 +740,10 @@ void IndexCatalogImpl::dropAllIndexes(OperationContext* opCtx,
                                       stdx::function<void(const IndexDescriptor*)> onDropFn) {
     invariant(opCtx->lockState()->isCollectionLockedForMode(_collection->ns(), MODE_X));
 
-    BackgroundOperation::assertNoBgOpInProgForNs(_collection->ns().ns());
+    uassert(ErrorCodes::BackgroundOperationInProgressForNamespace,
+            mongoutils::str::stream()
+                << "cannot perform operation: an index build is currently running",
+            !haveAnyIndexesInProgress());
 
     // make sure nothing in progress
     massert(17348,
@@ -813,8 +816,7 @@ void IndexCatalogImpl::dropAllIndexes(OperationContext* opCtx, bool includingIdI
 
 Status IndexCatalogImpl::dropIndex(OperationContext* opCtx, const IndexDescriptor* desc) {
     invariant(opCtx->lockState()->isCollectionLockedForMode(_collection->ns(), MODE_X));
-    BackgroundOperation::assertNoBgOpInProgForNs(_collection->ns().ns());
-    invariant(_buildingIndexes.size() == 0);
+    invariant(!haveAnyIndexesInProgress());
 
     IndexCatalogEntry* entry = _readyIndexes.find(desc);
 
@@ -960,6 +962,10 @@ bool IndexCatalogImpl::haveAnyIndexes() const {
     return _readyIndexes.size() > 0 || _buildingIndexes.size() > 0;
 }
 
+bool IndexCatalogImpl::haveAnyIndexesInProgress() const {
+    return _buildingIndexes.size() > 0;
+}
+
 int IndexCatalogImpl::numIndexesTotal(OperationContext* opCtx) const {
     int count = _readyIndexes.size() + _buildingIndexes.size() + _unfinishedIndexes.size();
     dassert(_collection->getCatalogEntry()->getTotalIndexCount(opCtx) == count);
@@ -1124,7 +1130,6 @@ std::vector<std::shared_ptr<const IndexCatalogEntry>> IndexCatalogImpl::getAllRe
 const IndexDescriptor* IndexCatalogImpl::refreshEntry(OperationContext* opCtx,
                                                       const IndexDescriptor* oldDesc) {
     invariant(opCtx->lockState()->isCollectionLockedForMode(_collection->ns(), MODE_X));
-    invariant(!BackgroundOperation::inProgForNs(_collection->ns()));
     invariant(_buildingIndexes.size() == 0);
 
     const std::string indexName = oldDesc->indexName();
diff --git a/src/mongo/db/catalog/index_catalog_impl.h b/src/mongo/db/catalog/index_catalog_impl.h
index 933bab58b62..d95f557102f 100644
--- a/src/mongo/db/catalog/index_catalog_impl.h
+++ b/src/mongo/db/catalog/index_catalog_impl.h
@@ -67,6 +67,7 @@ public:
     // ---- accessors -----
 
     bool haveAnyIndexes() const override;
+    bool haveAnyIndexesInProgress() const override;
     int numIndexesTotal(OperationContext* opCtx) const override;
     int numIndexesReady(OperationContext* opCtx) const override;
     int numIndexesInProgress(OperationContext* opCtx) const {
@@ -154,6 +155,9 @@ public:
      * Use this method to notify the IndexCatalog that the spec for this index has changed.
      *
      * It is invalid to dereference 'oldDesc' after calling this method.
+     *
+     * The caller must hold the collection X lock and ensure no index builds are in progress
+     * on the collection.
      */
     const IndexDescriptor* refreshEntry(OperationContext* opCtx,
                                         const IndexDescriptor* oldDesc) override;
@@ -201,6 +205,12 @@ public:
                         stdx::function<void(const IndexDescriptor*)> onDropFn) override;
     void dropAllIndexes(OperationContext* opCtx, bool includingIdIndex) override;
 
+    /**
+     * Drops the index.
+     *
+     * The caller must hold the collection X lock and ensure no index builds are in progress on the
+     * collection.
+     */
     Status dropIndex(OperationContext* opCtx, const IndexDescriptor* desc) override;
 
     /**
diff --git a/src/mongo/db/catalog/index_catalog_noop.h b/src/mongo/db/catalog/index_catalog_noop.h
index b1730c1fd05..445b26f384c 100644
--- a/src/mongo/db/catalog/index_catalog_noop.h
+++ b/src/mongo/db/catalog/index_catalog_noop.h
@@ -51,6 +51,10 @@ public:
         return false;
     }
 
+    bool haveAnyIndexesInProgress() const override {
+        return false;
+    }
+
     int numIndexesTotal(OperationContext* const opCtx) const override {
         return 0;
     }
diff --git a/src/mongo/db/catalog/rename_collection.cpp b/src/mongo/db/catalog/rename_collection.cpp
index fcf5d8065ce..89e99ac6cd4 100644
--- a/src/mongo/db/catalog/rename_collection.cpp
+++ b/src/mongo/db/catalog/rename_collection.cpp
@@ -45,6 +45,7 @@
 #include "mongo/db/curop.h"
 #include "mongo/db/db_raii.h"
 #include "mongo/db/index/index_descriptor.h"
+#include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/ops/insert.h"
@@ -202,6 +203,8 @@ Status renameCollectionCommon(OperationContext* opCtx,
     }
 
     BackgroundOperation::assertNoBgOpInProgForNs(source.ns());
+    IndexBuildsCoordinator::get(opCtx)->assertNoIndexBuildInProgForCollection(
+        sourceColl->uuid().get());
 
     auto targetDB = databaseHolder->openDb(opCtx, target.db());
 
@@ -353,6 +356,10 @@ Status renameCollectionCommon(OperationContext* opCtx,
             // No logOp necessary because the entire renameCollection command is one logOp.
             repl::UnreplicatedWritesBlock uwb(opCtx);
 
+            BackgroundOperation::assertNoBgOpInProgForNs(targetColl->ns().ns());
+            IndexBuildsCoordinator::get(opCtx)->assertNoIndexBuildInProgForCollection(
+                targetColl->uuid().get());
+
             status = targetDB->dropCollection(opCtx, targetColl->ns().ns(), renameOpTime);
             if (!status.isOK()) {
                 return status;
diff --git a/src/mongo/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp
index dd933d76470..217db0ed3d5 100644
--- a/src/mongo/db/commands/mr.cpp
+++ b/src/mongo/db/commands/mr.cpp
@@ -52,6 +52,7 @@
 #include "mongo/db/dbhelpers.h"
 #include "mongo/db/exec/working_set_common.h"
 #include "mongo/db/index/index_descriptor.h"
+#include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/matcher/extensions_callback_real.h"
 #include "mongo/db/op_observer.h"
 #include "mongo/db/ops/insert.h"
@@ -176,15 +177,20 @@ void dropTempCollections(OperationContext* cleanupOpCtx,
             [cleanupOpCtx, &tempNamespace] {
                 AutoGetDb autoDb(cleanupOpCtx, tempNamespace.db(), MODE_X);
                 if (auto db = autoDb.getDb()) {
-                    WriteUnitOfWork wunit(cleanupOpCtx);
-                    uassert(ErrorCodes::PrimarySteppedDown,
-                            str::stream() << "no longer primary while dropping temporary "
-                                             "collection for mapReduce: "
-                                          << tempNamespace.ns(),
-                            repl::ReplicationCoordinator::get(cleanupOpCtx)
-                                ->canAcceptWritesFor(cleanupOpCtx, tempNamespace));
-                    uassertStatusOK(db->dropCollection(cleanupOpCtx, tempNamespace.ns()));
-                    wunit.commit();
+                    if (auto collection = db->getCollection(cleanupOpCtx, tempNamespace)) {
+                        uassert(ErrorCodes::PrimarySteppedDown,
+                                str::stream() << "no longer primary while dropping temporary "
+                                                 "collection for mapReduce: "
+                                              << tempNamespace.ns(),
+                                repl::ReplicationCoordinator::get(cleanupOpCtx)
+                                    ->canAcceptWritesFor(cleanupOpCtx, tempNamespace));
+                        BackgroundOperation::assertNoBgOpInProgForNs(tempNamespace.ns());
+                        IndexBuildsCoordinator::get(cleanupOpCtx)
+                            ->assertNoIndexBuildInProgForCollection(collection->uuid().get());
+                        WriteUnitOfWork wunit(cleanupOpCtx);
+                        uassertStatusOK(db->dropCollection(cleanupOpCtx, tempNamespace.ns()));
+                        wunit.commit();
+                    }
                 }
             });
         // Always forget about temporary namespaces, so we don't cache lots of them
@@ -196,9 +202,14 @@ void dropTempCollections(OperationContext* cleanupOpCtx,
                 Lock::DBLock lk(cleanupOpCtx, incLong.db(), MODE_X);
                 auto databaseHolder = DatabaseHolder::get(cleanupOpCtx);
                 if (auto db = databaseHolder->getDb(cleanupOpCtx, incLong.ns())) {
-                    WriteUnitOfWork wunit(cleanupOpCtx);
-                    uassertStatusOK(db->dropCollection(cleanupOpCtx, incLong.ns()));
-                    wunit.commit();
+                    if (auto collection = db->getCollection(cleanupOpCtx, incLong)) {
+                        BackgroundOperation::assertNoBgOpInProgForNs(incLong.ns());
+                        IndexBuildsCoordinator::get(cleanupOpCtx)
+                            ->assertNoIndexBuildInProgForCollection(collection->uuid().get());
+                        WriteUnitOfWork wunit(cleanupOpCtx);
+                        uassertStatusOK(db->dropCollection(cleanupOpCtx, incLong.ns()));
+                        wunit.commit();
+                    }
                 }
             });
 
diff --git a/src/mongo/db/commands/rename_collection_cmd.cpp b/src/mongo/db/commands/rename_collection_cmd.cpp
index fe2a048b153..7107a370ce0 100644
--- a/src/mongo/db/commands/rename_collection_cmd.cpp
+++ b/src/mongo/db/commands/rename_collection_cmd.cpp
@@ -80,14 +80,6 @@ public:
         return CommandHelpers::parseNsFullyQualified(cmdObj);
     }
 
-    static void dropCollection(OperationContext* opCtx, Database* db, StringData collName) {
-        WriteUnitOfWork wunit(opCtx);
-        if (db->dropCollection(opCtx, collName).isOK()) {
-            // ignoring failure case
-            wunit.commit();
-        }
-    }
-
     virtual bool errmsgRun(OperationContext* opCtx,
                            const string& dbname,
                            const BSONObj& cmdObj,
diff --git a/src/mongo/db/commands/test_commands.cpp b/src/mongo/db/commands/test_commands.cpp
index 99c3b94f1e7..29a3be76ea2 100644
--- a/src/mongo/db/commands/test_commands.cpp
+++ b/src/mongo/db/commands/test_commands.cpp
@@ -41,6 +41,7 @@
 #include "mongo/db/commands.h"
 #include "mongo/db/commands/test_commands_enabled.h"
 #include "mongo/db/db_raii.h"
+#include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/op_observer.h"
 #include "mongo/db/query/internal_plans.h"
 #include "mongo/db/service_context.h"
@@ -169,6 +170,10 @@ public:
             }
         }
 
+        BackgroundOperation::assertNoBgOpInProgForNs(fullNs.ns());
+        IndexBuildsCoordinator::get(opCtx)->assertNoIndexBuildInProgForCollection(
+            collection->uuid().get());
+
         collection->cappedTruncateAfter(opCtx, end, inc);
 
         return true;
diff --git a/src/mongo/db/index_builds_coordinator.cpp b/src/mongo/db/index_builds_coordinator.cpp
index b606277d287..5082c3d318f 100644
--- a/src/mongo/db/index_builds_coordinator.cpp
+++ b/src/mongo/db/index_builds_coordinator.cpp
@@ -68,25 +68,6 @@ constexpr auto kUniqueFieldName = "unique"_sd;
 constexpr auto kKeyFieldName = "key"_sd;
 
 /**
- * Returns the collection UUID for the given 'nss', or a NamespaceNotFound error.
- *
- * Momentarily takes the collection IS lock for 'nss' to access the collection UUID.
- */
-StatusWith<UUID> getCollectionUUID(OperationContext* opCtx, const NamespaceString& nss) {
-    try {
-        AutoGetCollection autoColl(opCtx, nss, MODE_IS);
-        auto collection = autoColl.getCollection();
-        if (!collection) {
-            return {ErrorCodes::NamespaceNotFound, nss.ns()};
-        }
-        return collection->uuid().get();
-    } catch (const DBException& ex) {
-        invariant(ex.toStatus().code() == ErrorCodes::NamespaceNotFound);
-        return ex.toStatus();
-    }
-}
-
-/**
  * Checks if unique index specification is compatible with sharding configuration.
  */
 void checkShardKeyRestrictions(OperationContext* opCtx,
@@ -282,6 +263,8 @@ void IndexBuildsCoordinator::interruptAllIndexBuilds(const std::string& reason)
 
     // Wait for all the index builds to stop.
     for (auto& dbIt : _databaseIndexBuilds) {
+        // Take a shared ptr, rather than accessing the Tracker through the map's iterator, so that
+        // the object does not destruct while we are waiting, causing a use-after-free memory error.
         auto dbIndexBuildsSharedPtr = dbIt.second;
         dbIndexBuildsSharedPtr->waitUntilNoIndexBuildsRemain(lk);
     }
@@ -302,6 +285,8 @@ void IndexBuildsCoordinator::abortCollectionIndexBuilds(const UUID& collectionUU
 
     collIndexBuildsIt->second->runOperationOnAllBuilds(
         lk, &_indexBuildsManager, abortIndexBuild, reason);
+    // Take a shared ptr, rather than accessing the Tracker through the map's iterator, so that the
+    // object does not destruct while we are waiting, causing a use-after-free memory error.
     auto collIndexBuildsSharedPtr = collIndexBuildsIt->second;
     collIndexBuildsSharedPtr->waitUntilNoIndexBuildsRemain(lk);
 }
@@ -319,6 +304,9 @@ void IndexBuildsCoordinator::abortDatabaseIndexBuilds(StringData db, const std::
     }
 
     dbIndexBuilds->runOperationOnAllBuilds(lk, &_indexBuildsManager, abortIndexBuild, reason);
+
+    // 'dbIndexBuilds' is a shared ptr, so it can be safely waited upon without destructing before
+    // waitUntilNoIndexBuildsRemain() returns, which would cause a use-after-free memory error.
     dbIndexBuilds->waitUntilNoIndexBuildsRemain(lk);
 }
 
@@ -381,6 +369,15 @@ bool IndexBuildsCoordinator::inProgForDb(StringData db) const {
     return _databaseIndexBuilds.find(db) != _databaseIndexBuilds.end();
 }
 
+void IndexBuildsCoordinator::assertNoIndexBuildInProgress() const {
+    stdx::unique_lock<stdx::mutex> lk(_mutex);
+    uassert(ErrorCodes::BackgroundOperationInProgressForDatabase,
+            mongoutils::str::stream() << "cannot perform operation: there are currently "
+                                      << _allIndexBuilds.size()
+                                      << " index builds running.",
+            _allIndexBuilds.size() == 0);
+}
+
 void IndexBuildsCoordinator::assertNoIndexBuildInProgForCollection(
     const UUID& collectionUUID) const {
     uassert(ErrorCodes::BackgroundOperationInProgressForNamespace,
@@ -398,21 +395,17 @@ void IndexBuildsCoordinator::assertNoBgOpInProgForDb(StringData db) const {
             !inProgForDb(db));
 }
 
-void IndexBuildsCoordinator::awaitNoBgOpInProgForNs(OperationContext* opCtx, StringData ns) const {
-    auto statusWithCollectionUUID = getCollectionUUID(opCtx, NamespaceString(ns));
-    if (!statusWithCollectionUUID.isOK()) {
-        // The collection does not exist, so there are no index builds on it.
-        invariant(statusWithCollectionUUID.getStatus().code() == ErrorCodes::NamespaceNotFound);
-        return;
-    }
-
+void IndexBuildsCoordinator::awaitNoIndexBuildInProgressForCollection(
+    const UUID& collectionUUID) const {
     stdx::unique_lock<stdx::mutex> lk(_mutex);
 
-    auto collIndexBuildsIt = _collectionIndexBuilds.find(statusWithCollectionUUID.getValue());
+    auto collIndexBuildsIt = _collectionIndexBuilds.find(collectionUUID);
     if (collIndexBuildsIt == _collectionIndexBuilds.end()) {
         return;
     }
 
+    // Take a shared ptr, rather than accessing the Tracker through the map's iterator, so that the
+    // object does not destruct while we are waiting, causing a use-after-free memory error.
     auto collIndexBuildsSharedPtr = collIndexBuildsIt->second;
     collIndexBuildsSharedPtr->waitUntilNoIndexBuildsRemain(lk);
 }
@@ -421,10 +414,12 @@ void IndexBuildsCoordinator::awaitNoBgOpInProgForDb(StringData db) const {
     stdx::unique_lock<stdx::mutex> lk(_mutex);
 
     auto dbIndexBuildsIt = _databaseIndexBuilds.find(db);
-    if (dbIndexBuildsIt != _databaseIndexBuilds.end()) {
+    if (dbIndexBuildsIt == _databaseIndexBuilds.end()) {
         return;
     }
 
+    // Take a shared ptr, rather than accessing the Tracker through the map's iterator, so that the
+    // object does not destruct while we are waiting, causing a use-after-free memory error.
     auto dbIndexBuildsSharedPtr = dbIndexBuildsIt->second;
     dbIndexBuildsSharedPtr->waitUntilNoIndexBuildsRemain(lk);
 }
diff --git a/src/mongo/db/index_builds_coordinator.h b/src/mongo/db/index_builds_coordinator.h
index 6ed20f5c3b8..d49178017da 100644
--- a/src/mongo/db/index_builds_coordinator.h
+++ b/src/mongo/db/index_builds_coordinator.h
@@ -263,6 +263,11 @@ public:
     bool inProgForDb(StringData db) const;
 
     /**
+     * Uasserts if any index builds are in progress on any database.
+     */
+    void assertNoIndexBuildInProgress() const;
+
+    /**
      * Uasserts if any index builds is in progress on the specified collection.
      */
     void assertNoIndexBuildInProgForCollection(const UUID& collectionUUID) const;
@@ -274,13 +279,8 @@ public:
 
     /**
      * Waits for all index builds on a specified collection to finish.
-     *
-     * Momentarily takes the collection IS lock for 'ns', to fetch the collection UUID.
      */
-    void awaitNoBgOpInProgForNs(OperationContext* opCtx, StringData ns) const;
-    void awaitNoBgOpInProgForNs(OperationContext* opCtx, const NamespaceString& ns) const {
-        awaitNoBgOpInProgForNs(opCtx, ns.ns());
-    }
+    void awaitNoIndexBuildInProgressForCollection(const UUID& collectionUUID) const;
 
     /**
      * Waits for all index builds on a specified database to finish.
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index b24fddfcfce..3df073fdf83 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -629,6 +629,7 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         'drop_pending_collection_reaper',
+        '$BUILD_DIR/mongo/db/index_builds_coordinator_interface',
         '$BUILD_DIR/mongo/idl/server_parameter',
     ],
 )
diff --git a/src/mongo/db/repl/apply_ops.cpp b/src/mongo/db/repl/apply_ops.cpp
index 82c5717eb8a..e4ea07d203e 100644
--- a/src/mongo/db/repl/apply_ops.cpp
+++ b/src/mongo/db/repl/apply_ops.cpp
@@ -46,6 +46,7 @@
 #include "mongo/db/db_raii.h"
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/index/index_descriptor.h"
+#include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/matcher/matcher.h"
 #include "mongo/db/op_observer.h"
 #include "mongo/db/operation_context.h"
@@ -298,9 +299,9 @@ Status _applyPrepareTransaction(OperationContext* opCtx,
     // commits.
     for (const auto& opObj : info.getOperations()) {
         auto ns = opObj.getField("ns").checkAndGetStringData();
-        if (BackgroundOperation::inProgForNs(ns)) {
-            BackgroundOperation::awaitNoBgOpInProgForNs(ns);
-        }
+        auto uuid = uassertStatusOK(UUID::parse(opObj.getField("ui")));
+        BackgroundOperation::awaitNoBgOpInProgForNs(ns);
+        IndexBuildsCoordinator::get(opCtx)->awaitNoIndexBuildInProgressForCollection(uuid);
     }
 
     // Transaction operations are in its own batch, so we can modify their opCtx.
diff --git a/src/mongo/db/repl/idempotency_test_fixture.cpp b/src/mongo/db/repl/idempotency_test_fixture.cpp
index 6d12069a194..b47d798d3ee 100644
--- a/src/mongo/db/repl/idempotency_test_fixture.cpp
+++ b/src/mongo/db/repl/idempotency_test_fixture.cpp
@@ -387,7 +387,7 @@ OplogEntry IdempotencyTest::update(IdType _id, const BSONObj& obj) {
 
 OplogEntry IdempotencyTest::buildIndex(const BSONObj& indexSpec,
                                        const BSONObj& options,
-                                       UUID uuid) {
+                                       const UUID& uuid) {
     BSONObjBuilder bob;
     bob.append("createIndexes", nss.coll());
     bob.append("v", 2);
@@ -397,9 +397,9 @@ OplogEntry IdempotencyTest::buildIndex(const BSONObj& indexSpec,
     return makeCommandOplogEntry(nextOpTime(), nss, bob.obj(), uuid);
 }
 
-OplogEntry IdempotencyTest::dropIndex(const std::string& indexName) {
+OplogEntry IdempotencyTest::dropIndex(const std::string& indexName, const UUID& uuid) {
     auto cmd = BSON("dropIndexes" << nss.coll() << "index" << indexName);
-    return makeCommandOplogEntry(nextOpTime(), nss, cmd);
+    return makeCommandOplogEntry(nextOpTime(), nss, cmd, uuid);
 }
 
 std::string IdempotencyTest::computeDataHash(Collection* collection) {
@@ -431,8 +431,19 @@ std::string IdempotencyTest::computeDataHash(Collection* collection) {
 }
 
 CollectionState IdempotencyTest::validate() {
-    // Allow in-progress indexes to complete before validating collection contents.
-    IndexBuildsCoordinator::get(_opCtx.get())->awaitNoBgOpInProgForNs(_opCtx.get(), nss);
+    auto collUUID = [&]() -> OptionalCollectionUUID {
+        AutoGetCollectionForReadCommand autoColl(_opCtx.get(), nss);
+        if (auto collection = autoColl.getCollection()) {
+            return collection->uuid();
+        }
+        return boost::none;
+    }();
+
+    if (collUUID) {
+        // Allow in-progress indexes to complete before validating collection contents.
+        IndexBuildsCoordinator::get(_opCtx.get())
+            ->awaitNoIndexBuildInProgressForCollection(collUUID.get());
+    }
 
     AutoGetCollectionForReadCommand autoColl(_opCtx.get(), nss);
     auto collection = autoColl.getCollection();
diff --git a/src/mongo/db/repl/idempotency_test_fixture.h b/src/mongo/db/repl/idempotency_test_fixture.h
index 2823f31cb41..d86278c9810 100644
--- a/src/mongo/db/repl/idempotency_test_fixture.h
+++ b/src/mongo/db/repl/idempotency_test_fixture.h
@@ -95,8 +95,8 @@ protected:
     OplogEntry insert(const BSONObj& obj);
     template <class IdType>
     OplogEntry update(IdType _id, const BSONObj& obj);
-    OplogEntry buildIndex(const BSONObj& indexSpec, const BSONObj& options, UUID uuid);
-    OplogEntry dropIndex(const std::string& indexName);
+    OplogEntry buildIndex(const BSONObj& indexSpec, const BSONObj& options, const UUID& uuid);
+    OplogEntry dropIndex(const std::string& indexName, const UUID& uuid);
     virtual Status resetState();
 
     /**
diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index 16166e15ca8..03a447a1d2c 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -1992,6 +1992,7 @@ Status applyCommand_inlock(OperationContext* opCtx,
                 Lock::TempRelease release(opCtx->lockState());
 
                 BackgroundOperation::awaitNoBgOpInProgForDb(nss.db());
+                IndexBuildsCoordinator::get(opCtx)->awaitNoBgOpInProgForDb(nss.db());
                 opCtx->recoveryUnit()->abandonSnapshot();
                 opCtx->checkForInterrupt();
                 break;
@@ -2003,8 +2004,16 @@ Status applyCommand_inlock(OperationContext* opCtx,
                 invariant(cmd);
 
                 // TODO: This parse could be expensive and not worth it.
-                BackgroundOperation::awaitNoBgOpInProgForNs(
-                    cmd->parse(opCtx, OpMsgRequest::fromDBAndBody(nss.db(), o))->ns().toString());
+                auto ns =
+                    cmd->parse(opCtx, OpMsgRequest::fromDBAndBody(nss.db(), o))->ns().toString();
+                auto swUUID = UUID::parse(fieldUI);
+                if (!swUUID.isOK()) {
+                    error() << "Failed command " << redact(o) << " on " << ns << " with status "
+                            << swUUID.getStatus() << "during oplog application. Expected a UUID.";
+                }
+                BackgroundOperation::awaitNoBgOpInProgForNs(ns);
+                IndexBuildsCoordinator::get(opCtx)->awaitNoIndexBuildInProgressForCollection(
+                    swUUID.getValue());
 
                 opCtx->recoveryUnit()->abandonSnapshot();
                 opCtx->checkForInterrupt();
diff --git a/src/mongo/db/repl/rollback_impl.cpp b/src/mongo/db/repl/rollback_impl.cpp
index f8092ab3896..def645df987 100644
--- a/src/mongo/db/repl/rollback_impl.cpp
+++ b/src/mongo/db/repl/rollback_impl.cpp
@@ -43,6 +43,7 @@
 #include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/concurrency/replication_state_transition_lock_guard.h"
 #include "mongo/db/db_raii.h"
+#include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/kill_sessions_local.h"
 #include "mongo/db/logical_time_validator.h"
 #include "mongo/db/operation_context.h"
@@ -375,10 +376,13 @@ Status RollbackImpl::_awaitBgIndexCompletion(OperationContext* opCtx) {
     log() << "Waiting for all background operations to complete before starting rollback";
     for (auto db : dbNames) {
         auto numInProg = BackgroundOperation::numInProgForDb(db);
-        if (numInProg > 0) {
-            LOG(1) << "Waiting for " << numInProg
+        auto numInProgInCoordinator = IndexBuildsCoordinator::get(opCtx)->numInProgForDb(db);
+        if (numInProg > 0 || numInProgInCoordinator > 0) {
+            LOG(1) << "Waiting for "
+                   << (numInProg > numInProgInCoordinator ? numInProg : numInProgInCoordinator)
                    << " background operations to complete on database '" << db << "'";
             BackgroundOperation::awaitNoBgOpInProgForDb(db);
+            IndexBuildsCoordinator::get(opCtx)->awaitNoBgOpInProgForDb(db);
         }
 
         // Check for shutdown again.
diff --git a/src/mongo/db/repl/sync_tail_test.cpp b/src/mongo/db/repl/sync_tail_test.cpp
index f080f656c4d..368080f8b1e 100644
--- a/src/mongo/db/repl/sync_tail_test.cpp
+++ b/src/mongo/db/repl/sync_tail_test.cpp
@@ -1101,7 +1101,7 @@ TEST_F(IdempotencyTest, Geo2dsphereIndexFailedOnIndexing) {
     ASSERT_OK(runOpInitialSync(createCollection(kUuid)));
     auto indexOp =
         buildIndex(fromjson("{loc: '2dsphere'}"), BSON("2dsphereIndexVersion" << 3), kUuid);
-    auto dropIndexOp = dropIndex("loc_index");
+    auto dropIndexOp = dropIndex("loc_index", kUuid);
     auto insertOp = insert(fromjson("{_id: 1, loc: 'hi'}"));
 
     auto ops = {indexOp, dropIndexOp, insertOp};
@@ -1174,7 +1174,7 @@ TEST_F(IdempotencyTest, IndexWithDifferentOptions) {
 
     auto indexOp1 =
         buildIndex(fromjson("{x: 'text'}"), fromjson("{default_language: 'spanish'}"), kUuid);
-    auto dropIndexOp = dropIndex("x_index");
+    auto dropIndexOp = dropIndex("x_index", kUuid);
     auto indexOp2 =
         buildIndex(fromjson("{x: 'text'}"), fromjson("{default_language: 'english'}"), kUuid);
 
@@ -1209,7 +1209,7 @@ TEST_F(IdempotencyTest, InsertDocumentWithNonStringLanguageFieldWhenTextIndexExi
 
     ASSERT_OK(runOpInitialSync(createCollection(kUuid)));
     auto indexOp = buildIndex(fromjson("{x: 'text'}"), BSONObj(), kUuid);
-    auto dropIndexOp = dropIndex("x_index");
+    auto dropIndexOp = dropIndex("x_index", kUuid);
     auto insertOp = insert(fromjson("{_id: 1, x: 'words to index', language: 1}"));
 
     auto ops = {indexOp, dropIndexOp, insertOp};
@@ -1243,7 +1243,7 @@ TEST_F(IdempotencyTest, InsertDocumentWithNonStringLanguageOverrideFieldWhenText
 
     ASSERT_OK(runOpInitialSync(createCollection(kUuid)));
     auto indexOp = buildIndex(fromjson("{x: 'text'}"), fromjson("{language_override: 'y'}"), kUuid);
-    auto dropIndexOp = dropIndex("x_index");
+    auto dropIndexOp = dropIndex("x_index", kUuid);
     auto insertOp = insert(fromjson("{_id: 1, x: 'words to index', y: 1}"));
 
     auto ops = {indexOp, dropIndexOp, insertOp};
@@ -1411,8 +1411,8 @@ TEST_F(IdempotencyTest, CollModNamespaceNotFound) {
 
     auto indexChange = fromjson("{keyPattern: {createdAt:1}, expireAfterSeconds:4000}}");
     auto collModCmd = BSON("collMod" << nss.coll() << "index" << indexChange);
-    auto collModOp = makeCommandOplogEntry(nextOpTime(), nss, collModCmd);
-    auto dropCollOp = makeCommandOplogEntry(nextOpTime(), nss, BSON("drop" << nss.coll()));
+    auto collModOp = makeCommandOplogEntry(nextOpTime(), nss, collModCmd, kUuid);
+    auto dropCollOp = makeCommandOplogEntry(nextOpTime(), nss, BSON("drop" << nss.coll()), kUuid);
 
     auto ops = {collModOp, dropCollOp};
     testOpsAreIdempotent(ops);
@@ -1428,8 +1428,8 @@ TEST_F(IdempotencyTest, CollModIndexNotFound) {
 
     auto indexChange = fromjson("{keyPattern: {createdAt:1}, expireAfterSeconds:4000}}");
     auto collModCmd = BSON("collMod" << nss.coll() << "index" << indexChange);
-    auto collModOp = makeCommandOplogEntry(nextOpTime(), nss, collModCmd);
-    auto dropIndexOp = dropIndex("createdAt_index");
+    auto collModOp = makeCommandOplogEntry(nextOpTime(), nss, collModCmd, kUuid);
+    auto dropIndexOp = dropIndex("createdAt_index", kUuid);
 
     auto ops = {collModOp, dropIndexOp};
     testOpsAreIdempotent(ops);