diff options
author | Siyuan Zhou <siyuan.zhou@mongodb.com> | 2016-11-06 01:33:50 -0400 |
---|---|---|
committer | Siyuan Zhou <siyuan.zhou@mongodb.com> | 2016-11-06 01:33:50 -0400 |
commit | d23e79eb9e69bd746416d9f674dfaee59457c887 (patch) | |
tree | 7ae8940e36d5ae51bb4eadd1318860ca212e8c3f /src/mongo/s/sharding_mongod_test_fixture.cpp | |
parent | 0ac04999faae1d2fc0e10972aaf21082a2e48c8f (diff) | |
download | mongo-d23e79eb9e69bd746416d9f674dfaee59457c887.tar.gz |
Revert "SERVER-26202 Relax index constraints in oplog application"
This reverts commit f00448255bbb24c07e2f55e7e229f19e316350a6.
Diffstat (limited to 'src/mongo/s/sharding_mongod_test_fixture.cpp')
-rw-r--r-- | src/mongo/s/sharding_mongod_test_fixture.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mongo/s/sharding_mongod_test_fixture.cpp b/src/mongo/s/sharding_mongod_test_fixture.cpp index 3e8c9f013d7..ae91dc4ed5e 100644 --- a/src/mongo/s/sharding_mongod_test_fixture.cpp +++ b/src/mongo/s/sharding_mongod_test_fixture.cpp @@ -120,7 +120,9 @@ void ShardingMongodTestFixture::setUp() { replSetConfig.initialize(BSON("_id" << _setName << "protocolVersion" << 1 << "version" << 3 << "members" << serversBob.arr())); - replCoordPtr->setGetConfigReturnValue(replSetConfig); + auto replCoordMockPtr = dynamic_cast<ReplicationCoordinatorMock*>(replicationCoordinator()); + invariant(replCoordMockPtr); + replCoordMockPtr->setGetConfigReturnValue(replSetConfig); repl::ReplicationCoordinator::set(serviceContext, std::move(replCoordPtr)); @@ -129,7 +131,7 @@ void ShardingMongodTestFixture::setUp() { repl::createOplog(_opCtx.get()); } -std::unique_ptr<ReplicationCoordinatorMock> ShardingMongodTestFixture::makeReplicationCoordinator( +std::unique_ptr<ReplicationCoordinator> ShardingMongodTestFixture::makeReplicationCoordinator( ReplSettings replSettings) { return stdx::make_unique<repl::ReplicationCoordinatorMock>(replSettings); } @@ -370,7 +372,7 @@ executor::TaskExecutor* ShardingMongodTestFixture::executor() const { return Grid::get(operationContext())->getExecutorPool()->getFixedExecutor(); } -repl::ReplicationCoordinatorMock* ShardingMongodTestFixture::replicationCoordinator() const { +repl::ReplicationCoordinator* ShardingMongodTestFixture::replicationCoordinator() const { invariant(_replCoord); return _replCoord; } |