diff options
Diffstat (limited to 'src/mongo/db/db.cpp')
| -rw-r--r-- | src/mongo/db/db.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp index 2dbb2b1065e..c6272425bf5 100644 --- a/src/mongo/db/db.cpp +++ b/src/mongo/db/db.cpp @@ -103,10 +103,10 @@ #include "mongo/db/startup_warnings_mongod.h" #include "mongo/db/stats/counters.h" #include "mongo/db/stats/snapshots.h" +#include "mongo/db/storage/encryption_hooks.h" #include "mongo/db/storage/mmap_v1/mmap_v1_options.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/storage_options.h" -#include "mongo/db/storage/wiredtiger/wiredtiger_customization_hooks.h" #include "mongo/db/ttl.h" #include "mongo/db/wire_version.h" #include "mongo/executor/network_interface_factory.h" @@ -596,7 +596,7 @@ ExitCode _initAndListen(int listenPort) { getGlobalServiceContext()->initializeGlobalStorageEngine(); #ifdef MONGO_CONFIG_WIREDTIGER_ENABLED - if (WiredTigerCustomizationHooks::get(getGlobalServiceContext())->restartRequired()) { + if (EncryptionHooks::get(getGlobalServiceContext())->restartRequired()) { exitCleanly(EXIT_CLEAN); } #endif @@ -704,7 +704,11 @@ ExitCode _initAndListen(int listenPort) { Status status = authindex::verifySystemIndexes(startupOpCtx.get()); if (!status.isOK()) { log() << redact(status); - exitCleanly(EXIT_NEED_UPGRADE); + if (status.code() == ErrorCodes::AuthSchemaIncompatible) { + exitCleanly(EXIT_NEED_UPGRADE); + } else { + quickExit(EXIT_FAILURE); + } } // SERVER-14090: Verify that auth schema version is schemaVersion26Final. @@ -752,7 +756,7 @@ ExitCode _initAndListen(int listenPort) { if (!storageGlobalParams.readOnly) { logStartup(startupOpCtx.get()); - startFTDC(); + startMongoDFTDC(); getDeleter()->startWorkers(); @@ -1108,7 +1112,7 @@ static void shutdownTask() { #endif // Shutdown Full-Time Data Capture - stopFTDC(); + stopMongoDFTDC(); if (txn) { ShardingState::get(txn)->shutDown(txn); |