diff options
author | Dianna Hohensee <dianna.hohensee@10gen.com> | 2016-07-12 13:01:53 -0400 |
---|---|---|
committer | Dianna Hohensee <dianna.hohensee@10gen.com> | 2016-07-12 13:01:53 -0400 |
commit | 0e9da86226846bd5838af7be9aa60188c180e209 (patch) | |
tree | 5983990c392ef8e89d9c0c4673dab46e74e40892 /src/mongo/db/repl | |
parent | 84139e7e34958c3a292f9d08658e994e742d9a41 (diff) | |
download | mongo-0e9da86226846bd5838af7be9aa60188c180e209.tar.gz |
Revert "SERVER-24532 adding MigrationManager to manage parallel migrations"
This reverts commit 2155b293eaf4264dee1bdf68022b66e636a20a63.
Diffstat (limited to 'src/mongo/db/repl')
-rw-r--r-- | src/mongo/db/repl/replication_coordinator_mock.cpp | 7 | ||||
-rw-r--r-- | src/mongo/db/repl/replication_coordinator_mock.h | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/mongo/db/repl/replication_coordinator_mock.cpp b/src/mongo/db/repl/replication_coordinator_mock.cpp index 4a0bb7c8ea8..0d95c9f3f0e 100644 --- a/src/mongo/db/repl/replication_coordinator_mock.cpp +++ b/src/mongo/db/repl/replication_coordinator_mock.cpp @@ -33,6 +33,7 @@ #include "mongo/base/status.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/repl/replica_set_config.h" #include "mongo/db/repl/sync_source_resolver.h" #include "mongo/db/storage/snapshot_name.h" #include "mongo/db/write_concern_options.h" @@ -225,11 +226,7 @@ StatusWith<BSONObj> ReplicationCoordinatorMock::prepareReplSetUpdatePositionComm } ReplicaSetConfig ReplicationCoordinatorMock::getConfig() const { - return _getConfigReturnValue; -} - -void ReplicationCoordinatorMock::setGetConfigReturnValue(ReplicaSetConfig returnValue) { - _getConfigReturnValue = std::move(returnValue); + return ReplicaSetConfig(); } void ReplicationCoordinatorMock::processReplSetGetConfig(BSONObjBuilder* result) { diff --git a/src/mongo/db/repl/replication_coordinator_mock.h b/src/mongo/db/repl/replication_coordinator_mock.h index 4dd04f8fb3f..58e213ed6ee 100644 --- a/src/mongo/db/repl/replication_coordinator_mock.h +++ b/src/mongo/db/repl/replication_coordinator_mock.h @@ -30,7 +30,6 @@ #include "mongo/base/status.h" #include "mongo/db/repl/optime.h" -#include "mongo/db/repl/replica_set_config.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/platform/atomic_word.h" @@ -259,18 +258,12 @@ public: virtual Status stepUpIfEligible() override; - /** - * Sets the return value for calls to getConfig. - */ - void setGetConfigReturnValue(ReplicaSetConfig returnValue); - private: AtomicUInt64 _snapshotNameGenerator; const ReplSettings _settings; MemberState _memberState; OpTime _myLastDurableOpTime; OpTime _myLastAppliedOpTime; - ReplicaSetConfig _getConfigReturnValue; }; } // namespace repl |