diff options
| author | Dianna Hohensee <dianna.hohensee@mongodb.com> | 2020-07-23 11:38:26 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-10 23:53:53 +0000 |
| commit | 85d1de04863eea1d550aa540f41ae74cb3f6c80f (patch) | |
| tree | 9a140e41faf31b3b57f33167847eaa5e21fd5578 /src/mongo/db/repair.cpp | |
| parent | 9ea64254a1b38973ec5fd54cb04a179f7fdd8926 (diff) | |
| download | mongo-85d1de04863eea1d550aa540f41ae74cb3f6c80f.tar.gz | |
SERVER-49807 Move onCommit KVDropPendingIdentReaper handling out of the DurableCatlaog
Diffstat (limited to 'src/mongo/db/repair.cpp')
| -rw-r--r-- | src/mongo/db/repair.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/db/repair.cpp b/src/mongo/db/repair.cpp index 89f7e28e244..d69dbcfb691 100644 --- a/src/mongo/db/repair.cpp +++ b/src/mongo/db/repair.cpp @@ -60,6 +60,7 @@ #include "mongo/db/storage/durable_catalog.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/storage_repair_observer.h" +#include "mongo/db/storage/storage_util.h" #include "mongo/logv2/log.h" #include "mongo/util/scopeguard.h" @@ -98,10 +99,8 @@ Status dropUnfinishedIndexes(OperationContext* opCtx, Collection* collection) { "Dropping unfinished index after collection was modified by repair", "index"_attr = indexName); WriteUnitOfWork wuow(opCtx); - auto status = durableCatalog->removeIndex(opCtx, collection->getCatalogId(), indexName); - if (!status.isOK()) { - return status; - } + catalog::removeIndex( + opCtx, indexName, collection->getCatalogId(), collection->uuid(), collection->ns()); wuow.commit(); StorageRepairObserver::get(opCtx->getServiceContext()) ->invalidatingModification(str::stream() |