diff options
| author | Katherine Walker <katherine.walker@mongodb.com> | 2017-09-19 14:38:25 -0400 |
|---|---|---|
| committer | Katherine Walker <katherine.walker@mongodb.com> | 2017-09-19 14:38:25 -0400 |
| commit | dde9b54199fe375977f2721258620191079c8abb (patch) | |
| tree | 4eb512e94b8901897c4e8e04d3389ca02ea2d673 /src/mongo/db/startup_warnings_mongod.cpp | |
| parent | a14ac80417995193d0e713dc3d0c2edd489d123a (diff) | |
| download | mongo-dde9b54199fe375977f2721258620191079c8abb.tar.gz | |
Revert "SERVER-30346 Add startupWarnings for master-slave replication".
Diffstat (limited to 'src/mongo/db/startup_warnings_mongod.cpp')
| -rw-r--r-- | src/mongo/db/startup_warnings_mongod.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/mongo/db/startup_warnings_mongod.cpp b/src/mongo/db/startup_warnings_mongod.cpp index 4d6b9ab906c..abfc763739f 100644 --- a/src/mongo/db/startup_warnings_mongod.cpp +++ b/src/mongo/db/startup_warnings_mongod.cpp @@ -38,7 +38,6 @@ #include <sys/resource.h> #endif -#include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" #include "mongo/db/startup_warnings_common.h" #include "mongo/db/storage/storage_options.h" @@ -137,8 +136,7 @@ StatusWith<std::string> StartupWarningsMongod::readTransparentHugePagesParameter } void logMongodStartupWarnings(const StorageGlobalParams& storageParams, - const ServerGlobalParams& serverParams, - ServiceContext* svcCtx) { + const ServerGlobalParams& serverParams) { logCommonStartupWarnings(serverParams); bool warned = false; @@ -379,18 +377,6 @@ void logMongodStartupWarnings(const StorageGlobalParams& storageParams, warned = true; } - // Check if in master-slave mode - auto replCoord = repl::ReplicationCoordinator::get(svcCtx); - if (replCoord->getReplicationMode() == repl::ReplicationCoordinator::modeMasterSlave) { - log() << startupWarningsLog; - log() << "** WARNING: This node was started in master-slave replication mode." - << startupWarningsLog; - log() << "** Master-slave replication is deprecated and subject to be removed " - << startupWarningsLog; - log() << "** in a future version." << startupWarningsLog; - warned = true; - } - if (warned) { log() << startupWarningsLog; } |