diff options
| author | Mathias Stearn <mathias@10gen.com> | 2016-08-26 16:08:57 -0400 |
|---|---|---|
| committer | Mathias Stearn <mathias@10gen.com> | 2016-08-26 18:32:35 -0400 |
| commit | 6f96fbe7008283d458e7f72063e954c0fac2cc1c (patch) | |
| tree | 197c697e13cf32d23c5af44d16cff639d2b72a2d | |
| parent | f2a613a41d6ad7b5a1b66087e386380d38e50599 (diff) | |
| download | mongo-6f96fbe7008283d458e7f72063e954c0fac2cc1c.tar.gz | |
SERVER-25546 Fix InitialSync::_applyOplogTo for behavior change of tryPopAndWaitForMore
It now returns true for empty batches to have the caller start a new batch.
Changed in abcff3a9188bbd2f355a329a04789f41e936ba2d.
| -rw-r--r-- | src/mongo/db/repl/initial_sync.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/repl/initial_sync.cpp b/src/mongo/db/repl/initial_sync.cpp index 0eef3e34558..5f73d77eda8 100644 --- a/src/mongo/db/repl/initial_sync.cpp +++ b/src/mongo/db/repl/initial_sync.cpp @@ -96,8 +96,8 @@ void InitialSync::_applyOplogUntil(OperationContext* txn, const OpTime& endOpTim }; if (ops.empty()) { - severe() << "got no ops for batch..."; - fassertFailedNoTrace(18692); + // nothing came back last time, so go again + continue; } const BSONObj lastOp = ops.back().raw.getOwned(); |