diff options
Diffstat (limited to 'src/mongo/db/repl/rs_rollback.cpp')
-rw-r--r-- | src/mongo/db/repl/rs_rollback.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/mongo/db/repl/rs_rollback.cpp b/src/mongo/db/repl/rs_rollback.cpp index 6b11660a44b..be9bf0e1d1c 100644 --- a/src/mongo/db/repl/rs_rollback.cpp +++ b/src/mongo/db/repl/rs_rollback.cpp @@ -878,7 +878,6 @@ Status _syncRollback(OperationContext* txn, } // namespace Status syncRollback(OperationContext* txn, - const OpTime& lastOpTimeApplied, const OplogInterface& localOplog, const RollbackSource& rollbackSource, ReplicationCoordinator* replCoord, @@ -886,20 +885,6 @@ Status syncRollback(OperationContext* txn, invariant(txn); invariant(replCoord); - // check that we are at minvalid, otherwise we cannot rollback as we may be in an - // inconsistent state - { - BatchBoundaries boundaries = getMinValid(txn); - if (!boundaries.start.isNull() || boundaries.end > lastOpTimeApplied) { - severe() << "need to rollback, but in inconsistent state" << endl; - return Status(ErrorCodes::UnrecoverableRollbackError, - str::stream() << "need to rollback, but in inconsistent state. " - << "minvalid: " << boundaries.end.toString() - << " > our last optime: " << lastOpTimeApplied.toString(), - 18750); - } - } - log() << "beginning rollback" << rsLog; DisableDocumentValidation validationDisabler(txn); @@ -911,12 +896,10 @@ Status syncRollback(OperationContext* txn, } Status syncRollback(OperationContext* txn, - const OpTime& lastOpTimeWritten, const OplogInterface& localOplog, const RollbackSource& rollbackSource, ReplicationCoordinator* replCoord) { return syncRollback(txn, - lastOpTimeWritten, localOplog, rollbackSource, replCoord, |