summaryrefslogtreecommitdiff
path: root/src/mongo/s
diff options
context:
space:
mode:
authorJudah Schvimer <judah@mongodb.com>2017-08-07 12:04:10 -0400
committerJudah Schvimer <judah@mongodb.com>2017-08-07 12:04:10 -0400
commit8fa770baf8fac6e71a45f84b48eeb3bae96a8dab (patch)
tree1aa8c05c67c299e2459153f152c69b17457d62af /src/mongo/s
parentb519114cb9bc72c17c60761cad369f2d8e18f472 (diff)
downloadmongo-8fa770baf8fac6e71a45f84b48eeb3bae96a8dab.tar.gz
SERVER-29893 Rename recovery code and make it accessible to both startup and rollback
Diffstat (limited to 'src/mongo/s')
-rw-r--r--src/mongo/s/sharding_mongod_test_fixture.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mongo/s/sharding_mongod_test_fixture.cpp b/src/mongo/s/sharding_mongod_test_fixture.cpp
index 3a9fa023b2a..453951a1735 100644
--- a/src/mongo/s/sharding_mongod_test_fixture.cpp
+++ b/src/mongo/s/sharding_mongod_test_fixture.cpp
@@ -51,6 +51,7 @@
#include "mongo/db/repl/replication_coordinator.h"
#include "mongo/db/repl/replication_coordinator_mock.h"
#include "mongo/db/repl/replication_process.h"
+#include "mongo/db/repl/replication_recovery_mock.h"
#include "mongo/db/repl/storage_interface_mock.h"
#include "mongo/db/service_context_noop.h"
#include "mongo/executor/network_interface_mock.h"
@@ -130,10 +131,11 @@ void ShardingMongodTestFixture::setUp() {
repl::DropPendingCollectionReaper::set(
service, stdx::make_unique<repl::DropPendingCollectionReaper>(storagePtr.get()));
- repl::ReplicationProcess::set(
- service,
- stdx::make_unique<repl::ReplicationProcess>(
- storagePtr.get(), stdx::make_unique<repl::ReplicationConsistencyMarkersMock>()));
+ repl::ReplicationProcess::set(service,
+ stdx::make_unique<repl::ReplicationProcess>(
+ storagePtr.get(),
+ stdx::make_unique<repl::ReplicationConsistencyMarkersMock>(),
+ stdx::make_unique<repl::ReplicationRecoveryMock>()));
repl::ReplicationProcess::get(_opCtx.get())
->initializeRollbackID(_opCtx.get())
.transitional_ignore();