summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hernandez <scotthernandez@gmail.com>2015-12-22 18:12:32 -0500
committerScott Hernandez <scotthernandez@gmail.com>2015-12-22 18:12:32 -0500
commit3905aa7b425fee814d67dd9ea8fb1ec13f3ecd2f (patch)
tree31aeefb6675cc232471dcec7719dda75ecab9474
parent48bd5a400d140b00336a7b8f5f58cf4108fc4b50 (diff)
downloadmongo-3905aa7b425fee814d67dd9ea8fb1ec13f3ecd2f.tar.gz
SERVER-21988: do not fassert when re-applying same oplog entry till we fix the buffering issue
-rw-r--r--src/mongo/db/repl/sync_tail.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/repl/sync_tail.cpp b/src/mongo/db/repl/sync_tail.cpp
index 1f8ed3a875a..2e5d0182bcc 100644
--- a/src/mongo/db/repl/sync_tail.cpp
+++ b/src/mongo/db/repl/sync_tail.cpp
@@ -751,7 +751,8 @@ void SyncTail::oplogApplication() {
}
const auto lastOpTime = fassertStatusOK(28773, OpTime::parseFromOplogEntry(lastOp));
- if (lastWriteOpTime >= lastOpTime) {
+ // TODO: Make ">=" once SERVER-21988 is fixed.
+ if (lastWriteOpTime > lastOpTime) {
// Error for the oplog to go back in time.
fassert(34361,
Status(ErrorCodes::OplogOutOfOrder,