Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 2 insertions, 15 deletions

diff --git a/src/mongo/db/repl/oplog_fetcher.cpp b/src/mongo/db/repl/oplog_fetcher.cpp
index 4747e392542..816b5f19fa6 100644
--- a/src/mongo/db/repl/oplog_fetcher.cpp
+++ b/src/mongo/db/repl/oplog_fetcher.cpp
@@ -719,21 +719,8 @@ StatusWith<OplogFetcher::Documents> OplogFetcher::_getNextBatch() {
             auto lastCommittedWithCurrentTerm =
                 _dataReplicatorExternalState->getCurrentTermAndLastCommittedOpTime();
             if (lastCommittedWithCurrentTerm.value != OpTime::kUninitializedTerm) {
-                if (!_cursor->isExhaust() && lastCommittedWithCurrentTerm.opTime.isNull()) {
-                    // For non-exhaust cursors, only set the lastKnownCommittedOpTime when it is not
-                    // a null opTime. This is to avoid sending null opTime again and again and
-                    // triggering oplog empty batches every single time in case we can't advance our
-                    // commit point (e.g. during initial sync).
-                    _cursor->setCurrentTermAndLastCommittedOpTime(
-                        lastCommittedWithCurrentTerm.value, boost::none);
-                } else {
-                    // For exhaust cursors, it is safe to set a null lastKnownCommittedOpTime in the
-                    // initial getMore because the sync source will update the exhaust cursor's
-                    // lastKnownCommittedOpTime to the commit point sent in the last response after
-                    // each oplog batch.
-                    _cursor->setCurrentTermAndLastCommittedOpTime(
-                        lastCommittedWithCurrentTerm.value, lastCommittedWithCurrentTerm.opTime);
-                }
+                _cursor->setCurrentTermAndLastCommittedOpTime(lastCommittedWithCurrentTerm.value,
+                                                              lastCommittedWithCurrentTerm.opTime);
             }
             _cursor->more();
         }