diff options
author | Mathias Stearn <mathias@10gen.com> | 2017-08-07 20:18:33 -0400 |
---|---|---|
committer | Mathias Stearn <mathias@10gen.com> | 2017-08-07 20:18:33 -0400 |
commit | fd62ac35e27f83155cbe3d60bf02c49f45298e54 (patch) | |
tree | 09368db6e56db643e06c0ee97c65b07dc753f9c0 /src/mongo/db/repl/replication_process.h | |
parent | 9255b0a684c6c9ca35da96493b91f04b832dc792 (diff) | |
download | mongo-fd62ac35e27f83155cbe3d60bf02c49f45298e54.tar.gz |
Revert "SERVER-29893 Rename recovery code and make it accessible to both startup and rollback"
This reverts commit 8fa770baf8fac6e71a45f84b48eeb3bae96a8dab.
Diffstat (limited to 'src/mongo/db/repl/replication_process.h')
-rw-r--r-- | src/mongo/db/repl/replication_process.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/mongo/db/repl/replication_process.h b/src/mongo/db/repl/replication_process.h index 5b6229ac6d0..da4a2886c6a 100644 --- a/src/mongo/db/repl/replication_process.h +++ b/src/mongo/db/repl/replication_process.h @@ -37,7 +37,6 @@ #include "mongo/db/namespace_string.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replication_consistency_markers.h" -#include "mongo/db/repl/replication_recovery.h" #include "mongo/stdx/mutex.h" namespace mongo { @@ -82,8 +81,7 @@ public: static void set(ServiceContext* service, std::unique_ptr<ReplicationProcess> process); ReplicationProcess(StorageInterface* storageInterface, - std::unique_ptr<ReplicationConsistencyMarkers> consistencyMarkers, - std::unique_ptr<ReplicationRecovery> recovery); + std::unique_ptr<ReplicationConsistencyMarkers> consistencyMarkers); virtual ~ReplicationProcess() = default; /** @@ -136,11 +134,6 @@ public: */ ReplicationConsistencyMarkers* getConsistencyMarkers(); - /** - * Returns an object used to recover from the oplog on startup or rollback. - */ - ReplicationRecovery* getReplicationRecovery(); - private: // All member variables are labeled with one of the following codes indicating the // synchronization rules for accessing them. @@ -158,8 +151,6 @@ private: // Used for operations on documents that maintain replication consistency. std::unique_ptr<ReplicationConsistencyMarkers> _consistencyMarkers; // (S) - std::unique_ptr<ReplicationRecovery> _recovery; // (S) - // Rollback ID. This is a cached copy of the persisted value in the local.system.rollback.id // collection. int _rbid; // (M) |