diff options
| author | Eric Milkie <milkie@10gen.com> | 2019-05-30 09:47:39 -0400 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2019-05-31 08:22:30 -0400 |
| commit | 7ffc3e775f941622e8b3f1e7eb768594d4687820 (patch) | |
| tree | d5200de99f981a065853998377cfb07214ba2a5d | |
| parent | 9af7bcb6619d6041926053922f90577f9bc81b9f (diff) | |
| download | mongo-7ffc3e775f941622e8b3f1e7eb768594d4687820.tar.gz | |
SERVER-38477 index build lock acquisitions should be interruptible
| -rw-r--r-- | src/mongo/db/commands/create_indexes.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/mongo/db/commands/create_indexes.cpp b/src/mongo/db/commands/create_indexes.cpp index d443a6f148d..e581943a350 100644 --- a/src/mongo/db/commands/create_indexes.cpp +++ b/src/mongo/db/commands/create_indexes.cpp @@ -368,10 +368,6 @@ bool runCreateIndexes(OperationContext* opCtx, // final drain phase conflicts with prepared transactions. opCtx->recoveryUnit()->setIgnorePrepared(true); - // Allow the strong lock acquisition above to be interrupted, but from this point forward do - // not allow locks or re-locks to be interrupted. - UninterruptibleLockGuard noInterrupt(opCtx->lockState()); - Collection* collection = db->getCollection(opCtx, ns); bool createCollectionAutomatically = collection == nullptr; result.appendBool("createdCollectionAutomatically", createCollectionAutomatically); @@ -599,10 +595,6 @@ bool runCreateIndexesWithCoordinator(OperationContext* opCtx, opCtx->recoveryUnit()->abandonSnapshot(); dbLock.relockWithMode(MODE_X); - // Allow the strong lock acquisition above to be interrupted, but from this point - // forward do not allow locks or re-locks to be interrupted. - UninterruptibleLockGuard noInterrupt(opCtx->lockState()); - auto databaseHolder = DatabaseHolder::get(opCtx); db = databaseHolder->getDb(opCtx, ns.db()); if (!db) { |