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/s/client/shard_local_test.cpp | |
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/s/client/shard_local_test.cpp')
-rw-r--r-- | src/mongo/s/client/shard_local_test.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mongo/s/client/shard_local_test.cpp b/src/mongo/s/client/shard_local_test.cpp index 2eaabd74703..a4760feff40 100644 --- a/src/mongo/s/client/shard_local_test.cpp +++ b/src/mongo/s/client/shard_local_test.cpp @@ -35,7 +35,7 @@ #include "mongo/db/client.h" #include "mongo/db/query/cursor_response.h" #include "mongo/db/query/find_and_modify_request.h" -#include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/repl/replication_coordinator_global.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/db/write_concern_options.h" @@ -85,18 +85,16 @@ void ShardLocalTest::setUp() { serverGlobalParams.clusterRole = ClusterRole::ConfigServer; _shardLocal = stdx::make_unique<ShardLocal>(ShardRegistry::kConfigServerShardId); const repl::ReplSettings replSettings = {}; - repl::ReplicationCoordinator::set( - getGlobalServiceContext(), - std::unique_ptr<repl::ReplicationCoordinator>( - new repl::ReplicationCoordinatorMock(_opCtx->getServiceContext(), replSettings))); - ASSERT_OK(repl::ReplicationCoordinator::get(getGlobalServiceContext()) - ->setFollowerMode(repl::MemberState::RS_PRIMARY)); + repl::setGlobalReplicationCoordinator( + new repl::ReplicationCoordinatorMock(_opCtx->getServiceContext(), replSettings)); + ASSERT_OK( + repl::getGlobalReplicationCoordinator()->setFollowerMode(repl::MemberState::RS_PRIMARY)); } void ShardLocalTest::tearDown() { _opCtx.reset(); ServiceContextMongoDTest::tearDown(); - repl::ReplicationCoordinator::set(getGlobalServiceContext(), nullptr); + repl::setGlobalReplicationCoordinator(nullptr); } StatusWith<Shard::CommandResponse> ShardLocalTest::runFindAndModifyRunCommand(NamespaceString nss, |