diff options
-rw-r--r-- | src/mongo/db/SConscript | 1 | ||||
-rw-r--r-- | src/mongo/db/db.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/startup_warnings_mongod.cpp | 16 | ||||
-rw-r--r-- | src/mongo/db/startup_warnings_mongod.h | 4 |
4 files changed, 20 insertions, 3 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index e63c3b20742..70151071778 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -167,6 +167,7 @@ env.Library( ], LIBDEPS=[ 'startup_warnings_common', + '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/util/processinfo', ] ) diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp index 7bef30a8593..d4e86fd2a30 100644 --- a/src/mongo/db/db.cpp +++ b/src/mongo/db/db.cpp @@ -590,7 +590,7 @@ ExitCode _initAndListen(int listenPort) { } } - logMongodStartupWarnings(storageGlobalParams, serverGlobalParams); + logMongodStartupWarnings(storageGlobalParams, serverGlobalParams, globalServiceContext); { stringstream ss; diff --git a/src/mongo/db/startup_warnings_mongod.cpp b/src/mongo/db/startup_warnings_mongod.cpp index abfc763739f..4d6b9ab906c 100644 --- a/src/mongo/db/startup_warnings_mongod.cpp +++ b/src/mongo/db/startup_warnings_mongod.cpp @@ -38,6 +38,7 @@ #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" @@ -136,7 +137,8 @@ StatusWith<std::string> StartupWarningsMongod::readTransparentHugePagesParameter } void logMongodStartupWarnings(const StorageGlobalParams& storageParams, - const ServerGlobalParams& serverParams) { + const ServerGlobalParams& serverParams, + ServiceContext* svcCtx) { logCommonStartupWarnings(serverParams); bool warned = false; @@ -377,6 +379,18 @@ 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; } diff --git a/src/mongo/db/startup_warnings_mongod.h b/src/mongo/db/startup_warnings_mongod.h index b6f4048237d..eaec23282f6 100644 --- a/src/mongo/db/startup_warnings_mongod.h +++ b/src/mongo/db/startup_warnings_mongod.h @@ -28,6 +28,7 @@ #include "mongo/base/status.h" #include "mongo/base/status_with.h" +#include "mongo/db/service_context.h" namespace mongo { @@ -56,5 +57,6 @@ public: // Checks various startup conditions and logs any necessary warnings that // are specific to the mongod process. void logMongodStartupWarnings(const StorageGlobalParams& storageParams, - const ServerGlobalParams& serverParams); + const ServerGlobalParams& serverParams, + ServiceContext* svcCtx); } // namespace mongo |