SERVER-40788 Improve logging around replication catchup

(cherry picked from commit 18181d9825ddc62351a6ba94325a38353086248c)

1 files changed, 8 insertions, 4 deletions

diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp
index d12d057db48..6d9ed949552 100644
--- a/src/mongo/db/repl/replication_coordinator_impl.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl.cpp
@@ -2935,8 +2935,10 @@ void ReplicationCoordinatorImpl::CatchupState::signalHeartbeatUpdate_inlock() {
     }
 
     // We've caught up.
-    if (*targetOpTime <= _repl->_getMyLastAppliedOpTime_inlock()) {
-        log() << "Caught up to the latest optime known via heartbeats after becoming primary.";
+    const auto myLastApplied = _repl->_getMyLastAppliedOpTime_inlock();
+    if (*targetOpTime <= myLastApplied) {
+        log() << "Caught up to the latest optime known via heartbeats after becoming primary. "
+              << "Target optime: " << *targetOpTime << ". My Last Applied: " << myLastApplied;
         abort_inlock();
         return;
     }
@@ -2952,8 +2954,10 @@ void ReplicationCoordinatorImpl::CatchupState::signalHeartbeatUpdate_inlock() {
     }
     auto targetOpTimeCB = [this, targetOpTime]() {
         // Double check the target time since stepdown may signal us too.
-        if (*targetOpTime <= _repl->_getMyLastAppliedOpTime_inlock()) {
-            log() << "Caught up to the latest known optime successfully after becoming primary.";
+        const auto myLastApplied = _repl->_getMyLastAppliedOpTime_inlock();
+        if (*targetOpTime <= myLastApplied) {
+            log() << "Caught up to the latest known optime successfully after becoming primary. "
+                  << "Target optime: " << *targetOpTime << ". My Last Applied: " << myLastApplied;
             abort_inlock();
         }
     };