diff options
| author | Nick Zolnierz <nicholas.zolnierz@mongodb.com> | 2018-03-02 10:44:20 -0500 |
|---|---|---|
| committer | Nick Zolnierz <nicholas.zolnierz@mongodb.com> | 2018-03-02 10:44:20 -0500 |
| commit | a8fddd07a740e959646995ef93139887b3b3eb5c (patch) | |
| tree | a2365652bb2b6933c3f0d6cd56c6105bd0060b20 /src/mongo/db/ftdc | |
| parent | 1037536d24d1dc6449fe91c8be0023dc91bdf3ec (diff) | |
| download | mongo-a8fddd07a740e959646995ef93139887b3b3eb5c.tar.gz | |
Revert "SERVER-29519 Remove getGlobalReplicationCoordinator. Replace when getting decoration through service context (global if needed)."
This reverts commit 7d37a75df3f6035a7afcb51123b88f0e99308fc8.
Diffstat (limited to 'src/mongo/db/ftdc')
| -rw-r--r-- | src/mongo/db/ftdc/SConscript | 2 | ||||
| -rw-r--r-- | src/mongo/db/ftdc/ftdc_mongod.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mongo/db/ftdc/SConscript b/src/mongo/db/ftdc/SConscript index 68ff033a2d2..5e78036c3e5 100644 --- a/src/mongo/db/ftdc/SConscript +++ b/src/mongo/db/ftdc/SConscript @@ -64,7 +64,7 @@ env.Library( 'ftdc_mongod.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', + '$BUILD_DIR/mongo/db/repl/repl_coordinator_global', '$BUILD_DIR/mongo/db/storage/storage_options', 'ftdc_server' ], diff --git a/src/mongo/db/ftdc/ftdc_mongod.cpp b/src/mongo/db/ftdc/ftdc_mongod.cpp index d3c1c703dbd..1f53ec345ea 100644 --- a/src/mongo/db/ftdc/ftdc_mongod.cpp +++ b/src/mongo/db/ftdc/ftdc_mongod.cpp @@ -36,6 +36,7 @@ #include "mongo/db/ftdc/controller.h" #include "mongo/db/ftdc/ftdc_server.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/repl/replication_coordinator_global.h" #include "mongo/db/storage/storage_options.h" namespace mongo { @@ -43,7 +44,7 @@ namespace mongo { namespace { void registerMongoDCollectors(FTDCController* controller) { // These metrics are only collected if replication is enabled - if (repl::ReplicationCoordinator::get(getGlobalServiceContext())->getReplicationMode() != + if (repl::getGlobalReplicationCoordinator()->getReplicationMode() != repl::ReplicationCoordinator::modeNone) { // CmdReplSetGetStatus controller->addPeriodicCollector(stdx::make_unique<FTDCSimpleInternalCommandCollector>( |