diff options
author | Dianna Hohensee <dianna.hohensee@10gen.com> | 2019-03-12 09:53:51 -0400 |
---|---|---|
committer | Dianna Hohensee <dianna.hohensee@10gen.com> | 2019-03-12 09:53:51 -0400 |
commit | 83fa6e3879ab93549824fff82cab7030869563d0 (patch) | |
tree | b492270544038677da915b21600de788ac470e2c /src/mongo/db/catalog/drop_database.cpp | |
parent | b7007e36f6a080cb1fadeef65e768f79e091b239 (diff) | |
download | mongo-83fa6e3879ab93549824fff82cab7030869563d0.tar.gz |
Revert "SERVER-39079 Move BackgroundOperation checks out of the catalog layer; add parallel IndexBuildsCoordinator checks for all BackgroundOperation checks"
This reverts commit d02edd5290131978f901ffc657bee3470d03f8fd.
Diffstat (limited to 'src/mongo/db/catalog/drop_database.cpp')
-rw-r--r-- | src/mongo/db/catalog/drop_database.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/mongo/db/catalog/drop_database.cpp b/src/mongo/db/catalog/drop_database.cpp index 2f2b9f79d29..13b8193f36c 100644 --- a/src/mongo/db/catalog/drop_database.cpp +++ b/src/mongo/db/catalog/drop_database.cpp @@ -41,7 +41,6 @@ #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" @@ -66,10 +65,6 @@ 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); }); @@ -180,10 +175,6 @@ 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 |