SERVER-17923 prohibit database/collection actions when bg index is running

1 files changed, 2 insertions, 30 deletions

diff --git a/src/mongo/db/catalog/rename_collection.cpp b/src/mongo/db/catalog/rename_collection.cpp
index ecf7b5e2515..361500933f5 100644
--- a/src/mongo/db/catalog/rename_collection.cpp
+++ b/src/mongo/db/catalog/rename_collection.cpp
@@ -32,6 +32,7 @@
 
 #include "mongo/db/catalog/rename_collection.h"
 
+#include "mongo/db/background.h"
 #include "mongo/db/catalog/collection.h"
 #include "mongo/db/catalog/collection_catalog_entry.h"
 #include "mongo/db/catalog/database.h"
@@ -57,31 +58,6 @@ namespace {
             wunit.commit();
         }
     }
-
-    // renameCollection's
-    std::vector<BSONObj> stopIndexBuilds(OperationContext* opCtx,
-                                         Database* db,
-                                         const NamespaceString& source,
-                                         const NamespaceString& target) {
-
-        IndexCatalog::IndexKillCriteria criteria;
-        criteria.ns = source;
-        std::vector<BSONObj> prelim = 
-            IndexBuilder::killMatchingIndexBuilds(db->getCollection(source), criteria);
-
-        std::vector<BSONObj> indexes;
-
-        for (int i = 0; i < static_cast<int>(prelim.size()); i++) {
-            // Change the ns
-            BSONObj stripped = prelim[i].removeField("ns");
-            BSONObjBuilder builder;
-            builder.appendElements(stripped);
-            builder.append("ns", target);
-            indexes.push_back(builder.obj());
-        }
-
-        return indexes;
-    }
 } // namespace
 
     Status renameCollection(OperationContext* txn,
@@ -136,9 +112,7 @@ namespace {
             }
         }
 
-        const std::vector<BSONObj> indexesInProg = stopIndexBuilds(txn, sourceDB, source, target);
-        // Dismissed on success
-        ScopeGuard indexBuildRestorer = MakeGuard(IndexBuilder::restoreIndexes, txn, indexesInProg);
+        BackgroundOperation::assertNoBgOpInProgForNs(source.ns());
 
         Database* const targetDB = dbHolder().openDb(txn, target.db());
 
@@ -175,7 +149,6 @@ namespace {
                         stayTemp);
 
                 wunit.commit();
-                indexBuildRestorer.Dismiss();
                 return Status::OK();
             }
 
@@ -278,7 +251,6 @@ namespace {
             wunit.commit();
         }
 
-        indexBuildRestorer.Dismiss();
         targetCollectionDropper.Dismiss();
         return Status::OK();
     }