diff options
author | Judah Schvimer <judah@mongodb.com> | 2017-10-09 15:39:21 -0400 |
---|---|---|
committer | Judah Schvimer <judah@mongodb.com> | 2017-10-09 15:39:21 -0400 |
commit | 50c5cd2052411c145df68e73d17980d40e9d4a31 (patch) | |
tree | 73285dd5914789724177f85d39b8c0e4bca5b208 | |
parent | eb25a8afdba7f0e8909075bab62b1509b697296c (diff) | |
download | mongo-50c5cd2052411c145df68e73d17980d40e9d4a31.tar.gz |
SERVER-31415 Disable flag that allows rollback to use recover to a timestamp
-rw-r--r-- | src/mongo/db/repl/bgsync.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mongo/db/repl/bgsync.cpp b/src/mongo/db/repl/bgsync.cpp index 447d0949d7a..2c83abd3488 100644 --- a/src/mongo/db/repl/bgsync.cpp +++ b/src/mongo/db/repl/bgsync.cpp @@ -87,16 +87,15 @@ MONGO_EXPORT_STARTUP_SERVER_PARAMETER(rollbackMethod, std::string, kRollbackViaR // Checks that only the valid strings above can be used as a rollbackMethod // parameter. Throws an error if an invalid string is passed to the server parameter. MONGO_INITIALIZER(rollbackMethod)(InitializerContext*) { - std::set<StringData> supportedRollbackMethods = { - kRollbackViaRefetchNoUUID, kRollbackViaRefetch, kRollbackToCheckpoint}; + std::set<StringData> supportedRollbackMethods = {kRollbackViaRefetchNoUUID, + kRollbackViaRefetch}; // Unsupported rollback method. if (supportedRollbackMethods.count(rollbackMethod) == 0) { std::string errMsg = str::stream() << "Unsupported rollback method: '" + rollbackMethod + "'. " << "Supported rollback methods: " - << "'" << kRollbackViaRefetchNoUUID << "' | '" << kRollbackViaRefetch << "' | '" - << kRollbackToCheckpoint << "'"; + << "'" << kRollbackViaRefetchNoUUID << "' | '" << kRollbackViaRefetch << "'"; return Status(ErrorCodes::BadValue, errMsg); } return Status::OK(); @@ -736,6 +735,8 @@ void BackgroundSync::_runRollbackViaRecoverToCheckpoint( } } + fassertFailedNoTrace(40651); + _rollback = stdx::make_unique<RollbackImpl>( localOplog, &remoteOplog, storageInterface, _replicationProcess, _replCoord); |