summaryrefslogtreecommitdiff
path: root/src/mongo/db/catalog/catalog_control.cpp
diff options
context:
space:
mode:
authorBenety Goh <benety@mongodb.com>2020-08-01 07:43:35 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-08-01 12:19:45 +0000
commit12e5de609fff3086168681a15133656509ccf42b (patch)
tree220d05156637638001efb45015764caccd51bc53 /src/mongo/db/catalog/catalog_control.cpp
parentb9353930bcb5387857620f1d45fb87b79f4a0064 (diff)
downloadmongo-12e5de609fff3086168681a15133656509ccf42b.tar.gz
SERVER-49301 StorageEngine::loadCatalog() accepts previous shutdown state rather than checking decorator for handling orphaned idents
Diffstat (limited to 'src/mongo/db/catalog/catalog_control.cpp')
-rw-r--r--src/mongo/db/catalog/catalog_control.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mongo/db/catalog/catalog_control.cpp b/src/mongo/db/catalog/catalog_control.cpp
index ed052ee2bf6..4d433798cb1 100644
--- a/src/mongo/db/catalog/catalog_control.cpp
+++ b/src/mongo/db/catalog/catalog_control.cpp
@@ -110,7 +110,10 @@ void openCatalog(OperationContext* opCtx, const MinVisibleTimestampMap& minVisib
// Load the catalog in the storage engine.
LOGV2(20273, "openCatalog: loading storage engine catalog");
auto storageEngine = opCtx->getServiceContext()->getStorageEngine();
- storageEngine->loadCatalog(opCtx);
+ // Ignore orphaned idents because this function is used during rollback and not at
+ // startup recovery, when we may try to recover orphaned idents.
+ auto loadingFromUncleanShutdown = false;
+ storageEngine->loadCatalog(opCtx, loadingFromUncleanShutdown);
LOGV2(20274, "openCatalog: reconciling catalog and idents");
// Retain unknown internal idents because this function is used during rollback and not at