SERVER-23351 further refinements to resetting minvalid after rollback

(cherry picked from commit 481739f40314a85e989462f8e37044b449d1d6a6)

1 files changed, 3 insertions, 1 deletions

diff --git a/src/mongo/db/repl/sync_tail.cpp b/src/mongo/db/repl/sync_tail.cpp
index 57cbfadddc9..c0e73914df7 100644
--- a/src/mongo/db/repl/sync_tail.cpp
+++ b/src/mongo/db/repl/sync_tail.cpp
@@ -761,8 +761,10 @@ void SyncTail::oplogApplication() {
                 replCoord->signalDrainComplete(&txn);
             }
 
-            // Reset when triggered in case it was from a rollback, safe to do at any time.
+            // Reset some values when triggered in case it was from a rollback.
+            minValidBoundaries = getMinValid(&txn);
             lastWriteOpTime = replCoord->getMyLastAppliedOpTime();
+            originalEndOpTime = minValidBoundaries.end;
 
             continue;  // This wasn't a real op. Don't try to apply it.
         }