SERVER-58988 Avoid sync source selection cycle during primary catchup.

8 files changed, 199 insertions, 29 deletions

diff --git a/src/mongo/db/repl/initial_syncer_test.cpp b/src/mongo/db/repl/initial_syncer_test.cpp
index 9661a12cdef..ba220838ef5 100644
--- a/src/mongo/db/repl/initial_syncer_test.cpp
+++ b/src/mongo/db/repl/initial_syncer_test.cpp
@@ -576,7 +576,8 @@ RemoteCommandResponse makeCursorResponse(CursorId cursorId,
                                          int rbid) {
     OpTime futureOpTime(Timestamp(1000, 1000), 1000);
     Date_t futureWallTime = Date_t() + Seconds(futureOpTime.getSecs());
-    rpc::OplogQueryMetadata oqMetadata({futureOpTime, futureWallTime}, futureOpTime, rbid, 0, 0);
+    rpc::OplogQueryMetadata oqMetadata(
+        {futureOpTime, futureWallTime}, futureOpTime, rbid, 0, 0, "");
 
     BSONObjBuilder bob;
     {
diff --git a/src/mongo/db/repl/oplog_fetcher_test.cpp b/src/mongo/db/repl/oplog_fetcher_test.cpp
index 1e3b9c3813a..8899fb20fb9 100644
--- a/src/mongo/db/repl/oplog_fetcher_test.cpp
+++ b/src/mongo/db/repl/oplog_fetcher_test.cpp
@@ -306,6 +306,7 @@ protected:
     static const int remoteRBID = 2;
     static const int primaryIndex = 2;
     static const int syncSourceIndex = 2;
+    static const std::string syncSourceHost;
     static const rpc::OplogQueryMetadata oqMetadata;
     static const rpc::OplogQueryMetadata staleOqMetadata;
     static const rpc::ReplSetMetadata replSetMetadata;
@@ -374,13 +375,24 @@ private:
 
 const int OplogFetcherTest::remoteRBID;
 const OpTime OplogFetcherTest::remoteNewerOpTime = OpTime(Timestamp(1000, 1), 2);
-const rpc::OplogQueryMetadata OplogFetcherTest::oqMetadata = rpc::OplogQueryMetadata(
-    {staleOpTime, staleWallTime}, remoteNewerOpTime, remoteRBID, primaryIndex, syncSourceIndex);
+const std::string OplogFetcherTest::syncSourceHost = "";
+const rpc::OplogQueryMetadata OplogFetcherTest::oqMetadata =
+    rpc::OplogQueryMetadata({staleOpTime, staleWallTime},
+                            remoteNewerOpTime,
+                            remoteRBID,
+                            primaryIndex,
+                            syncSourceIndex,
+                            syncSourceHost);
 
 const OpTime OplogFetcherTest::staleOpTime = OpTime(Timestamp(1, 1), 0);
 const Date_t OplogFetcherTest::staleWallTime = Date_t() + Seconds(staleOpTime.getSecs());
-const rpc::OplogQueryMetadata OplogFetcherTest::staleOqMetadata = rpc::OplogQueryMetadata(
-    {staleOpTime, staleWallTime}, staleOpTime, remoteRBID, primaryIndex, syncSourceIndex);
+const rpc::OplogQueryMetadata OplogFetcherTest::staleOqMetadata =
+    rpc::OplogQueryMetadata({staleOpTime, staleWallTime},
+                            staleOpTime,
+                            remoteRBID,
+                            primaryIndex,
+                            syncSourceIndex,
+                            syncSourceHost);
 
 const rpc::ReplSetMetadata OplogFetcherTest::replSetMetadata =
     rpc::ReplSetMetadata(1, OpTimeAndWallTime(), OpTime(), 1, 0, OID(), syncSourceIndex, false);
@@ -935,7 +947,8 @@ TEST_F(OplogFetcherTest, MetadataAndBatchAreNotProcessedWhenSyncSourceRollsBack)
                                                remoteNewerOpTime,
                                                remoteRBID + 1,
                                                primaryIndex,
-                                               syncSourceIndex);
+                                               syncSourceIndex,
+                                               syncSourceHost);
     auto metadataObj = makeOplogBatchMetadata(replSetMetadata, oplogQueryMetadata);
 
     auto shutdownState = processSingleBatch(makeFirstBatch(cursorId, {entry}, metadataObj),
@@ -967,8 +980,12 @@ TEST_F(OplogFetcherTest, MetadataAndBatchAreNotProcessedWhenSyncSourceIsNotAhead
     CursorId cursorId = 22LL;
     auto entry = makeNoopOplogEntry(lastFetched);
 
-    rpc::OplogQueryMetadata oplogQueryMetadata(
-        {staleOpTime, staleWallTime}, lastFetched, remoteRBID, primaryIndex, syncSourceIndex);
+    rpc::OplogQueryMetadata oplogQueryMetadata({staleOpTime, staleWallTime},
+                                               lastFetched,
+                                               remoteRBID,
+                                               primaryIndex,
+                                               syncSourceIndex,
+                                               syncSourceHost);
     auto metadataObj = makeOplogBatchMetadata(replSetMetadata, oplogQueryMetadata);
 
     ASSERT_EQUALS(ErrorCodes::InvalidSyncSource,
@@ -1013,8 +1030,12 @@ TEST_F(OplogFetcherTest, MetadataAndBatchAreProcessedWhenSyncSourceIsCurrentButM
 TEST_F(OplogFetcherTest,
        MetadataAndBatchAreProcessedWhenSyncSourceIsNotAheadWithoutRequiringFresherSyncSource) {
     CursorId cursorId = 0LL;
-    rpc::OplogQueryMetadata oplogQueryMetadata(
-        {staleOpTime, staleWallTime}, lastFetched, remoteRBID, 2, 2);
+    rpc::OplogQueryMetadata oplogQueryMetadata({staleOpTime, staleWallTime},
+                                               lastFetched,
+                                               remoteRBID,
+                                               primaryIndex,
+                                               syncSourceIndex,
+                                               syncSourceHost);
     auto metadataObj = makeOplogBatchMetadata(replSetMetadata, oplogQueryMetadata);
     auto entry = makeNoopOplogEntry(lastFetched);
 
@@ -1969,8 +1990,12 @@ TEST_F(OplogFetcherTest, FailedSyncSourceCheckWithBothMetadatasStopsTheOplogFetc
 
 TEST_F(OplogFetcherTest,
        FailedSyncSourceCheckWithSyncSourceHavingNoSyncSourceStopsTheOplogFetcher) {
-    rpc::OplogQueryMetadata oplogQueryMetadata(
-        {staleOpTime, staleWallTime}, remoteNewerOpTime, remoteRBID, primaryIndex, -1);
+    rpc::OplogQueryMetadata oplogQueryMetadata({staleOpTime, staleWallTime},
+                                               remoteNewerOpTime,
+                                               remoteRBID,
+                                               primaryIndex,
+                                               -1,
+                                               syncSourceHost);
     testSyncSourceChecking(replSetMetadata, oplogQueryMetadata);
 
     // Sync source "hasSyncSource" is derived from metadata.
diff --git a/src/mongo/db/repl/replication_coordinator_impl_test.cpp b/src/mongo/db/repl/replication_coordinator_impl_test.cpp
index 512bc420508..ffbd17f7c82 100644
--- a/src/mongo/db/repl/replication_coordinator_impl_test.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl_test.cpp
@@ -2349,14 +2349,14 @@ TEST_F(ReplCoordTest, CancelElectionTimeoutIfSyncSourceKnowsThePrimary) {
     // If currentPrimaryIndex is -1, don't reschedule.
     state.processMetadata(
         rsMeta,
-        OplogQueryMetadata(OpTimeAndWallTime(), OpTime(), 1, -1 /* currentPrimaryIndex */, 1));
+        OplogQueryMetadata(OpTimeAndWallTime(), OpTime(), 1, -1 /* currentPrimaryIndex */, 1, ""));
 
     ASSERT_EQUALS(getReplCoord()->getElectionTimeout_forTest(), electionTimeout);
 
     // If currentPrimaryIndex is NOT -1, reschedule.
     state.processMetadata(
         rsMeta,
-        OplogQueryMetadata(OpTimeAndWallTime(), OpTime(), 1, 1 /* currentPrimaryIndex */, 1));
+        OplogQueryMetadata(OpTimeAndWallTime(), OpTime(), 1, 1 /* currentPrimaryIndex */, 1, ""));
 
     // Since we advanced the clock, the new election timeout is after the old one.
     ASSERT_GREATER_THAN(getReplCoord()->getElectionTimeout_forTest(), electionTimeout);
diff --git a/src/mongo/db/repl/topology_coordinator.cpp b/src/mongo/db/repl/topology_coordinator.cpp
index b9b11e78a02..57a0f4a5457 100644
--- a/src/mongo/db/repl/topology_coordinator.cpp
+++ b/src/mongo/db/repl/topology_coordinator.cpp
@@ -3046,6 +3046,7 @@ bool TopologyCoordinator::shouldChangeSyncSource(const HostAndPort& currentSourc
     fassert(4612000, !currentSourceOpTime.isNull());
 
     int syncSourceIndex = oqMetadata.getSyncSourceIndex();
+    std::string syncSourceHost = oqMetadata.getSyncSourceHost();
 
     // Change sync source if chaining is disabled (without overrides), we are not syncing from the
     // primary, and we know who the new primary is. We do not consider chaining disabled if we are
@@ -3077,6 +3078,29 @@ bool TopologyCoordinator::shouldChangeSyncSource(const HostAndPort& currentSourc
         return true;
     }
 
+    // Change sync source if our sync source is also syncing from us when we are in primary
+    // catchup mode, forming a sync source selection cycle, and the sync source is not ahead
+    // of us. This is to prevent a deadlock situation. See SERVER-58988 for details.
+    // When checking the sync source, we use syncSourceHost if it is set, otherwise fall back
+    // to use syncSourceIndex. The difference is that syncSourceIndex might not point to the
+    // node that we think of because it was inferred from the sender node, which could have
+    // a different config. This is acceptable since we are just choosing a different sync
+    // source if that happens and reconfigs are rare.
+    bool isSyncingFromMe = !syncSourceHost.empty()
+        ? syncSourceHost == _selfMemberData().getHostAndPort().toString()
+        : syncSourceIndex == _selfIndex;
+
+    if (isSyncingFromMe && _currentPrimaryIndex == _selfIndex &&
+        currentSourceOpTime <= lastOpTimeFetched) {
+        LOGV2(5898800,
+              "Choosing new sync source because we are in primary catchup but our current sync "
+              "source is also syncing from us but is not ahead of us",
+              "syncSource"_attr = currentSource,
+              "lastOpTimeFetched"_attr = lastOpTimeFetched,
+              "syncSourceLatestOplogOpTime"_attr = currentSourceOpTime);
+        return true;
+    }
+
     if (MONGO_unlikely(disableMaxSyncSourceLagSecs.shouldFail())) {
         LOGV2(
             21833,
@@ -3237,7 +3261,8 @@ rpc::OplogQueryMetadata TopologyCoordinator::prepareOplogQueryMetadata(int rbid)
                                    getMyLastAppliedOpTime(),
                                    rbid,
                                    _currentPrimaryIndex,
-                                   _rsConfig.findMemberIndexByHostAndPort(getSyncSourceAddress()));
+                                   _rsConfig.findMemberIndexByHostAndPort(getSyncSourceAddress()),
+                                   getSyncSourceAddress().toString());
 }
 
 void TopologyCoordinator::processReplSetRequestVotes(const ReplSetRequestVotesArgs& args,
diff --git a/src/mongo/db/repl/topology_coordinator_v1_test.cpp b/src/mongo/db/repl/topology_coordinator_v1_test.cpp
index 756dc06307e..a80c45e6108 100644
--- a/src/mongo/db/repl/topology_coordinator_v1_test.cpp
+++ b/src/mongo/db/repl/topology_coordinator_v1_test.cpp
@@ -240,9 +240,14 @@ protected:
     OplogQueryMetadata makeOplogQueryMetadata(OpTime lastAppliedOpTime = OpTime(),
                                               int primaryIndex = -1,
                                               int syncSourceIndex = -1,
+                                              std::string syncSourceHost = "",
                                               Date_t lastCommittedWall = Date_t()) {
-        return OplogQueryMetadata(
-            {OpTime(), lastCommittedWall}, lastAppliedOpTime, -1, primaryIndex, syncSourceIndex);
+        return OplogQueryMetadata({OpTime(), lastCommittedWall},
+                                  lastAppliedOpTime,
+                                  -1,
+                                  primaryIndex,
+                                  syncSourceIndex,
+                                  syncSourceHost);
     }
 
     HeartbeatResponseAction receiveUpHeartbeat(const HostAndPort& member,
@@ -3799,6 +3804,94 @@ TEST_F(HeartbeatResponseTestV1,
                                                        now()));
 }
 
+TEST_F(HeartbeatResponseTestV1, ShouldChangeSyncSourceWhenSyncSourceFormsCycleAndWeArePrimary) {
+    // In this test, the TopologyCoordinator will tell us change our sync source away from "host2"
+    // when it is not ahead of us and it selects us to be its sync source, forming a sync source
+    // cycle and we are currently in primary catchup.
+    setSelfMemberState(MemberState::RS_PRIMARY);
+    OpTime election = OpTime();
+    OpTime syncSourceOpTime = OpTime(Timestamp(400, 0), 0);
+
+    // Set lastOpTimeFetched to be same as the sync source's OpTime.
+    OpTime lastOpTimeFetched = OpTime(Timestamp(400, 0), 0);
+
+    // Show we like host2 while it is not syncing from us.
+    HeartbeatResponseAction nextAction = receiveUpHeartbeat(
+        HostAndPort("host2"), "rs0", MemberState::RS_SECONDARY, election, syncSourceOpTime);
+    ASSERT_NO_ACTION(nextAction.getAction());
+    ASSERT_FALSE(getTopoCoord().shouldChangeSyncSource(
+        HostAndPort("host2"),
+        makeReplSetMetadata(OpTime() /* visibleOpTime */, false /* isPrimary */),
+        makeOplogQueryMetadata(syncSourceOpTime,
+                               -1 /* primaryIndex */,
+                               2 /* syncSourceIndex */,
+                               "host3:27017" /* syncSourceHost */),
+        lastOpTimeFetched,
+        now()));
+
+    // Show that we also like host2 while we are not primary.
+    nextAction = receiveUpHeartbeat(
+        HostAndPort("host2"), "rs0", MemberState::RS_SECONDARY, election, syncSourceOpTime);
+    ASSERT_NO_ACTION(nextAction.getAction());
+    getTopoCoord().setPrimaryIndex(2);
+    ASSERT_FALSE(getTopoCoord().shouldChangeSyncSource(
+        HostAndPort("host2"),
+        makeReplSetMetadata(OpTime() /* visibleOpTime */, false /* isPrimary */),
+        // Sync source is also syncing from us.
+        makeOplogQueryMetadata(syncSourceOpTime,
+                               -1 /* primaryIndex */,
+                               0 /* syncSourceIndex */,
+                               "host1:27017" /* syncSourceHost */),
+        lastOpTimeFetched,
+        now()));
+
+    // Show that we also like host2 while it has some progress beyond our own.
+    getTopoCoord().setPrimaryIndex(0);
+    OpTime olderThanSyncSourceOpTime = OpTime(Timestamp(300, 0), 0);
+    nextAction = receiveUpHeartbeat(
+        HostAndPort("host2"), "rs0", MemberState::RS_SECONDARY, election, syncSourceOpTime);
+    ASSERT_NO_ACTION(nextAction.getAction());
+    ASSERT_FALSE(getTopoCoord().shouldChangeSyncSource(
+        HostAndPort("host2"),
+        makeReplSetMetadata(OpTime() /* visibleOpTime */, false /* isPrimary */),
+        // Sync source is also syncing from us.
+        makeOplogQueryMetadata(syncSourceOpTime,
+                               -1 /* primaryIndex */,
+                               0 /* syncSourceIndex */,
+                               "host1:27017" /* syncSourceHost */),
+        olderThanSyncSourceOpTime,
+        now()));
+
+    // Show that we do not like host2 it forms a sync source selection cycle with us and we
+    // are primary and it lacks progress beyond our own.
+    nextAction = receiveUpHeartbeat(
+        HostAndPort("host2"), "rs0", MemberState::RS_SECONDARY, election, syncSourceOpTime);
+    ASSERT_NO_ACTION(nextAction.getAction());
+    ASSERT_TRUE(getTopoCoord().shouldChangeSyncSource(
+        HostAndPort("host2"),
+        makeReplSetMetadata(OpTime() /* visibleOpTime */, false /* isPrimary */),
+        // Sync source is also syncing from us.
+        makeOplogQueryMetadata(syncSourceOpTime,
+                               -1 /* primaryIndex */,
+                               0 /* syncSourceIndex */,
+                               "host1:27017" /* syncSourceHost */),
+        lastOpTimeFetched,
+        now()));
+
+    // Show that we still do not like it when syncSourceHost is not set, but we can rely on
+    // syncSourceIndex to decide if a sync source selection cycle has been formed.
+    nextAction = receiveUpHeartbeat(
+        HostAndPort("host2"), "rs0", MemberState::RS_SECONDARY, election, syncSourceOpTime);
+    ASSERT_NO_ACTION(nextAction.getAction());
+    ASSERT_TRUE(getTopoCoord().shouldChangeSyncSource(
+        HostAndPort("host2"),
+        makeReplSetMetadata(OpTime() /* visibleOpTime */, false /* isPrimary */),
+        // Sync source is also syncing from us.
+        makeOplogQueryMetadata(syncSourceOpTime, -1 /* primaryIndex */, 0 /* syncSourceIndex */),
+        lastOpTimeFetched,
+        now()));
+}
+
 TEST_F(HeartbeatResponseTestV1, ShouldNotChangeSyncSourceWhenFresherMemberIsDown) {
     // In this test, the TopologyCoordinator should not tell us to change sync sources away from
     // "host2" and to "host3" despite "host2" being more than maxSyncSourceLagSecs(30) behind
diff --git a/src/mongo/rpc/metadata/oplog_query_metadata.cpp b/src/mongo/rpc/metadata/oplog_query_metadata.cpp
index 65d600dab00..f810662ded7 100644
--- a/src/mongo/rpc/metadata/oplog_query_metadata.cpp
+++ b/src/mongo/rpc/metadata/oplog_query_metadata.cpp
@@ -50,6 +50,7 @@ const char kLastCommittedWallFieldName[] = "lastCommittedWall";
 const char kLastOpAppliedFieldName[] = "lastOpApplied";
 const char kPrimaryIndexFieldName[] = "primaryIndex";
 const char kSyncSourceIndexFieldName[] = "syncSourceIndex";
+const char kSyncSourceHostFieldName[] = "syncSourceHost";
 const char kRBIDFieldName[] = "rbid";
 
 }  // unnamed namespace
@@ -60,12 +61,14 @@ OplogQueryMetadata::OplogQueryMetadata(OpTimeAndWallTime lastOpCommitted,
                                        OpTime lastOpApplied,
                                        int rbid,
                                        int currentPrimaryIndex,
-                                       int currentSyncSourceIndex)
+                                       int currentSyncSourceIndex,
+                                       std::string currentSyncSourceHost)
     : _lastOpCommitted(std::move(lastOpCommitted)),
       _lastOpApplied(std::move(lastOpApplied)),
       _rbid(rbid),
       _currentPrimaryIndex(currentPrimaryIndex),
-      _currentSyncSourceIndex(currentSyncSourceIndex) {}
+      _currentSyncSourceIndex(currentSyncSourceIndex),
+      _currentSyncSourceHost(currentSyncSourceHost) {}
 
 StatusWith<OplogQueryMetadata> OplogQueryMetadata::readFromMetadata(const BSONObj& metadataObj) {
     BSONElement oqMetadataElement;
@@ -86,6 +89,14 @@ StatusWith<OplogQueryMetadata> OplogQueryMetadata::readFromMetadata(const BSONOb
     if (!status.isOK())
         return status;
 
+    std::string syncSourceHost;
+    status = bsonExtractStringField(oqMetadataObj, kSyncSourceHostFieldName, &syncSourceHost);
+    // SyncSourceHost might not be set in older versions, checking NoSuchKey error
+    // for backward compatibility.
+    // TODO SERVER-59732: Remove the compatibility check once 6.0 is released.
+    if (!status.isOK() && status.code() != ErrorCodes::NoSuchKey)
+        return status;
+
     long long rbid;
     status = bsonExtractIntegerField(oqMetadataObj, kRBIDFieldName, &rbid);
     if (!status.isOK())
@@ -110,7 +121,8 @@ StatusWith<OplogQueryMetadata> OplogQueryMetadata::readFromMetadata(const BSONOb
     if (!status.isOK())
         return status;
 
-    return OplogQueryMetadata(lastOpCommitted, lastOpApplied, rbid, primaryIndex, syncSourceIndex);
+    return OplogQueryMetadata(
+        lastOpCommitted, lastOpApplied, rbid, primaryIndex, syncSourceIndex, syncSourceHost);
 }
 
 Status OplogQueryMetadata::writeToMetadata(BSONObjBuilder* builder) const {
@@ -121,6 +133,7 @@ Status OplogQueryMetadata::writeToMetadata(BSONObjBuilder* builder) const {
     oqMetadataBuilder.append(kRBIDFieldName, _rbid);
     oqMetadataBuilder.append(kPrimaryIndexFieldName, _currentPrimaryIndex);
     oqMetadataBuilder.append(kSyncSourceIndexFieldName, _currentSyncSourceIndex);
+    oqMetadataBuilder.append(kSyncSourceHostFieldName, _currentSyncSourceHost);
     oqMetadataBuilder.doneFast();
 
     return Status::OK();
@@ -131,6 +144,7 @@ std::string OplogQueryMetadata::toString() const {
     output << "OplogQueryMetadata";
     output << " Primary Index: " << _currentPrimaryIndex;
     output << " Sync Source Index: " << _currentSyncSourceIndex;
+    output << " Sync Source Host: " << _currentSyncSourceHost;
     output << " RBID: " << _rbid;
     output << " Last Op Committed: " << _lastOpCommitted.toString();
     output << " Last Op Applied: " << _lastOpApplied.toString();
diff --git a/src/mongo/rpc/metadata/oplog_query_metadata.h b/src/mongo/rpc/metadata/oplog_query_metadata.h
index 205569a4f31..bd08f6a8b39 100644
--- a/src/mongo/rpc/metadata/oplog_query_metadata.h
+++ b/src/mongo/rpc/metadata/oplog_query_metadata.h
@@ -57,7 +57,8 @@ public:
                        repl::OpTime lastOpApplied,
                        int rbid,
                        int currentPrimaryIndex,
-                       int currentSyncSourceIndex);
+                       int currentSyncSourceIndex,
+                       std::string currentSyncSourceHost);
 
     /**
      * format:
@@ -106,6 +107,14 @@ public:
     }
 
     /**
+     * Returns the host of the sync source of the sender.
+     * Returns empty string if it has no sync source.
+     */
+    std::string getSyncSourceHost() const {
+        return _currentSyncSourceHost;
+    }
+
+    /**
      * Returns the current rbid of the sender.
      */
     int getRBID() const {
@@ -123,6 +132,7 @@ private:
     int _rbid = -1;
     int _currentPrimaryIndex = kNoPrimary;
     int _currentSyncSourceIndex = -1;
+    std::string _currentSyncSourceHost;
 };
 
 }  // namespace rpc
diff --git a/src/mongo/rpc/metadata/oplog_query_metadata_test.cpp b/src/mongo/rpc/metadata/oplog_query_metadata_test.cpp
index 6d7218e83fc..f0515ac100f 100644
--- a/src/mongo/rpc/metadata/oplog_query_metadata_test.cpp
+++ b/src/mongo/rpc/metadata/oplog_query_metadata_test.cpp
@@ -43,7 +43,7 @@ TEST(ReplResponseMetadataTest, OplogQueryMetadataRoundtrip) {
     OpTime opTime1(Timestamp(1234, 100), 5);
     Date_t committedWall = Date_t() + Seconds(opTime1.getSecs());
     OpTime opTime2(Timestamp(7777, 101), 6);
-    OplogQueryMetadata metadata({opTime1, committedWall}, opTime2, 6, 12, -1);
+    OplogQueryMetadata metadata({opTime1, committedWall}, opTime2, 6, 12, -1, "");
 
     ASSERT_EQ(opTime1, metadata.getLastOpCommitted().opTime);
     ASSERT_EQ(committedWall, metadata.getLastOpCommitted().wallTime);
@@ -53,12 +53,14 @@ TEST(ReplResponseMetadataTest, OplogQueryMetadataRoundtrip) {
     BSONObjBuilder builder;
     metadata.writeToMetadata(&builder).transitional_ignore();
 
-    BSONObj expectedObj(BSON(
-        kOplogQueryMetadataFieldName << BSON(
-            "lastOpCommitted" << BSON("ts" << opTime1.getTimestamp() << "t" << opTime1.getTerm())
-                              << "lastCommittedWall" << committedWall << "lastOpApplied"
-                              << BSON("ts" << opTime2.getTimestamp() << "t" << opTime2.getTerm())
-                              << "rbid" << 6 << "primaryIndex" << 12 << "syncSourceIndex" << -1)));
+    BSONObj expectedObj(
+        BSON(kOplogQueryMetadataFieldName
+             << BSON("lastOpCommitted"
+                     << BSON("ts" << opTime1.getTimestamp() << "t" << opTime1.getTerm())
+                     << "lastCommittedWall" << committedWall << "lastOpApplied"
+                     << BSON("ts" << opTime2.getTimestamp() << "t" << opTime2.getTerm()) << "rbid"
+                     << 6 << "primaryIndex" << 12 << "syncSourceIndex" << -1 << "syncSourceHost"
+                     << "")));
 
     BSONObj serializedObj = builder.obj();
     ASSERT_BSONOBJ_EQ(expectedObj, serializedObj);
@@ -89,7 +91,7 @@ TEST(ReplResponseMetadataTest, OplogQueryMetadataRoundtrip) {
 TEST(ReplResponseMetadataTest, OplogQueryMetadataHasPrimaryIndex) {
     for (auto [currentPrimaryIndex, hasPrimaryIndex] :
          std::vector<std::pair<int, bool>>{{-1, false}, {0, true}, {1, true}}) {
-        OplogQueryMetadata oqm({OpTime(), Date_t()}, OpTime(), 1, currentPrimaryIndex, -1);
+        OplogQueryMetadata oqm({OpTime(), Date_t()}, OpTime(), 1, currentPrimaryIndex, -1, "");
         ASSERT_EQUALS(hasPrimaryIndex, oqm.hasPrimaryIndex());
     }
 }