diff options
Diffstat (limited to 'src/mongo/db/db.cpp')
| -rw-r--r-- | src/mongo/db/db.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp index 54b5c8fabfa..8c3d00618f3 100644 --- a/src/mongo/db/db.cpp +++ b/src/mongo/db/db.cpp @@ -286,8 +286,6 @@ Status restoreMissingFeatureCompatibilityVersionDocument(OperationContext* opCtx const NamespaceString startupLogCollectionName("local.startup_log"); const NamespaceString kSystemReplSetCollection("local.system.replset"); -MONGO_EXPORT_SERVER_PARAMETER(waitForStepDownOnNonCommandShutdown, bool, true); - #ifdef _WIN32 const ntservice::NtServiceDefaultStrings defaultServiceStrings = { L"MongoDB", L"MongoDB", L"MongoDB Server"}; @@ -1291,13 +1289,8 @@ void shutdownTask(const ShutdownTaskArgs& shutdownArgs) { } try { - // For faster tests, we allow a short wait time with setParameter. - auto waitTime = waitForStepDownOnNonCommandShutdown.load() - ? Milliseconds(Seconds(10)) - : Milliseconds(100); - uassertStatusOK( - replCoord->stepDown(opCtx, false /* force */, waitTime, Seconds(120))); + replCoord->stepDown(opCtx, false /* force */, Seconds(10), Seconds(120))); } catch (const ExceptionFor<ErrorCodes::NotMaster>&) { // ignore not master errors } catch (const DBException& e) { |