SERVER-46120 Make OplogQueryMetadata non-optional

1 files changed, 11 insertions, 25 deletions

diff --git a/src/mongo/db/repl/data_replicator_external_state_impl.cpp b/src/mongo/db/repl/data_replicator_external_state_impl.cpp
index 4596bddc980..443cb43adbe 100644
--- a/src/mongo/db/repl/data_replicator_external_state_impl.cpp
+++ b/src/mongo/db/repl/data_replicator_external_state_impl.cpp
@@ -95,33 +95,19 @@ void DataReplicatorExternalStateImpl::processMetadata(const rpc::ReplSetMetadata
 bool DataReplicatorExternalStateImpl::shouldStopFetching(
     const HostAndPort& source,
     const rpc::ReplSetMetadata& replMetadata,
-    boost::optional<rpc::OplogQueryMetadata> oqMetadata) {
+    const rpc::OplogQueryMetadata& oqMetadata) {
     // Re-evaluate quality of sync target.
     if (_replicationCoordinator->shouldChangeSyncSource(source, replMetadata, oqMetadata)) {
-        // If OplogQueryMetadata was provided, its values were used to determine if we should
-        // change sync sources.
-        if (oqMetadata) {
-            LOGV2(21150,
-                  "Canceling oplog query due to OplogQueryMetadata. We have to choose a new "
-                  "sync source. Current source: {syncSource}, OpTime {lastAppliedOpTime}, "
-                  "its sync source index:{syncSourceIndex}",
-                  "Canceling oplog query due to OplogQueryMetadata. We have to choose a new "
-                  "sync source",
-                  "syncSource"_attr = source,
-                  "lastAppliedOpTime"_attr = oqMetadata->getLastOpApplied(),
-                  "syncSourceIndex"_attr = oqMetadata->getSyncSourceIndex());
-
-        } else {
-            LOGV2(21151,
-                  "Canceling oplog query due to ReplSetMetadata. We have to choose a new sync "
-                  "source. Current source: {syncSource}, OpTime {lastVisibleOpTime}, its "
-                  "sync source index:{syncSourceIndex}",
-                  "Canceling oplog query due to ReplSetMetadata. We have to choose a new sync "
-                  "source",
-                  "syncSource"_attr = source,
-                  "lastVisibleOpTime"_attr = replMetadata.getLastOpVisible(),
-                  "syncSourceIndex"_attr = replMetadata.getSyncSourceIndex());
-        }
+        LOGV2(21150,
+              "Canceling oplog query due to OplogQueryMetadata. We have to choose a new "
+              "sync source. Current source: {syncSource}, OpTime {lastAppliedOpTime}, "
+              "its sync source index:{syncSourceIndex}",
+              "Canceling oplog query due to OplogQueryMetadata. We have to choose a new "
+              "sync source",
+              "syncSource"_attr = source,
+              "lastAppliedOpTime"_attr = oqMetadata.getLastOpApplied(),
+              "syncSourceIndex"_attr = oqMetadata.getSyncSourceIndex());
+
         return true;
     }
     return false;