diff options
author | Siyuan Zhou <siyuan.zhou@mongodb.com> | 2016-11-07 14:57:51 -0500 |
---|---|---|
committer | Siyuan Zhou <siyuan.zhou@mongodb.com> | 2016-11-08 14:41:48 -0500 |
commit | 17c37d0e626a61aeae8f4f149da98df2496740fa (patch) | |
tree | 9b82e98ffde8067f2314a5fde713c03fc0e7b38a /src/mongo/s/sharding_mongod_test_fixture.h | |
parent | a79c8b6455ba50d40f42bead5ce24a6093734dc3 (diff) | |
download | mongo-17c37d0e626a61aeae8f4f149da98df2496740fa.tar.gz |
SERVER-26202 Relax index constraints in oplog application
This reverts commit d23e79eb9e69bd746416d9f674dfaee59457c887.
Diffstat (limited to 'src/mongo/s/sharding_mongod_test_fixture.h')
-rw-r--r-- | src/mongo/s/sharding_mongod_test_fixture.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/s/sharding_mongod_test_fixture.h b/src/mongo/s/sharding_mongod_test_fixture.h index e3ffa13d582..62435c97e79 100644 --- a/src/mongo/s/sharding_mongod_test_fixture.h +++ b/src/mongo/s/sharding_mongod_test_fixture.h @@ -58,7 +58,7 @@ class TaskExecutorPool; } // namespace executor namespace repl { -class ReplicationCoordinator; +class ReplicationCoordinatorMock; class ReplSettings; } // namespace repl @@ -117,7 +117,7 @@ public: executor::TaskExecutor* executor() const; executor::NetworkInterfaceMock* network() const; - repl::ReplicationCoordinator* replicationCoordinator() const; + repl::ReplicationCoordinatorMock* replicationCoordinator() const; /** * Returns the stored raw pointer to the DistLockCatalog, if it has been initialized. @@ -182,7 +182,7 @@ protected: /** * Base class returns ReplicationCoordinatorMock. */ - virtual std::unique_ptr<repl::ReplicationCoordinator> makeReplicationCoordinator( + virtual std::unique_ptr<repl::ReplicationCoordinatorMock> makeReplicationCoordinator( repl::ReplSettings replSettings); /** @@ -264,7 +264,7 @@ private: // store a raw pointer to it here. DistLockManager* _distLockManager = nullptr; - repl::ReplicationCoordinator* _replCoord = nullptr; + repl::ReplicationCoordinatorMock* _replCoord = nullptr; // Allows for processing tasks through the NetworkInterfaceMock/ThreadPoolMock subsystem. std::unique_ptr<executor::NetworkTestEnv> _networkTestEnv; |