diff options
| author | Ali Mir <ali.mir@mongodb.com> | 2020-04-06 11:48:04 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-04-07 14:52:49 +0000 |
| commit | f44ca2e82c0a3aa4e834565e057bed60c588ba51 (patch) | |
| tree | 17aedcfe23b9cb724c793485d02c695e0f7d12a4 /src/mongo/db/repl/repl_set_commands.cpp | |
| parent | 85c88cbaa6b16b00d92e502e9d72ccb2f15321de (diff) | |
| download | mongo-f44ca2e82c0a3aa4e834565e057bed60c588ba51.tar.gz | |
SERVER-46999 Remove safe replica set reconfig feature gate
Diffstat (limited to 'src/mongo/db/repl/repl_set_commands.cpp')
| -rw-r--r-- | src/mongo/db/repl/repl_set_commands.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/db/repl/repl_set_commands.cpp b/src/mongo/db/repl/repl_set_commands.cpp index 3e4fa84987d..b3a687f0f73 100644 --- a/src/mongo/db/repl/repl_set_commands.cpp +++ b/src/mongo/db/repl/repl_set_commands.cpp @@ -56,7 +56,6 @@ #include "mongo/db/op_observer.h" #include "mongo/db/repl/drop_pending_collection_reaper.h" #include "mongo/db/repl/oplog.h" -#include "mongo/db/repl/repl_server_parameters_gen.h" #include "mongo/db/repl/repl_set_heartbeat_args_v1.h" #include "mongo/db/repl/repl_set_heartbeat_response.h" #include "mongo/db/repl/replication_coordinator.h" @@ -424,7 +423,7 @@ public: // For safe reconfig, wait for the current config to be committed before running a new one. // We will check again after acquiring the repl mutex in processReplSetReconfig(), in case // of concurrent reconfigs. - if (!parsedArgs.force && enableSafeReplicaSetReconfig) { + if (!parsedArgs.force) { // Check primary before waiting. auto memberState = replCoord->getMemberState(); uassert(ErrorCodes::NotMaster, @@ -471,7 +470,7 @@ public: // Now that the new config has been persisted and installed in memory, wait for the new // config to become replicated. For force reconfigs we don't need to do this waiting. - if (!parsedArgs.force && enableSafeReplicaSetReconfig) { + if (!parsedArgs.force) { auto status = replCoord->awaitConfigCommitment(opCtx, false /* waitForOplogCommitment */); uassertStatusOK( |