SERVER-68342 Modify ServerParameter to take tenantId

4 files changed, 10 insertions, 8 deletions

diff --git a/src/mongo/client/read_preference.cpp b/src/mongo/client/read_preference.cpp
index 5fd56d8b2ce..900375df114 100644
--- a/src/mongo/client/read_preference.cpp
+++ b/src/mongo/client/read_preference.cpp
@@ -65,7 +65,7 @@ TagSet defaultTagSetForMode(ReadPreference mode) {
 
 }  // namespace
 
-Status validateReadPreferenceMode(const std::string& prefStr) {
+Status validateReadPreferenceMode(const std::string& prefStr, const boost::optional<TenantId>&) {
     try {
         ReadPreference_parse(IDLParserContext(kModeFieldName), prefStr);
     } catch (DBException& e) {
diff --git a/src/mongo/client/read_preference.h b/src/mongo/client/read_preference.h
index 837d7391f41..368117d91b5 100644
--- a/src/mongo/client/read_preference.h
+++ b/src/mongo/client/read_preference.h
@@ -46,7 +46,7 @@ using ReadPreference = ReadPreferenceEnum;
 /**
  * Validate a ReadPreference string. This is intended for use as an IDL validator callback.
  */
-Status validateReadPreferenceMode(const std::string& prefStr);
+Status validateReadPreferenceMode(const std::string& prefStr, const boost::optional<TenantId>&);
 
 /**
  * A simple object for representing the list of tags requested by a $readPreference.
diff --git a/src/mongo/client/replica_set_monitor_protocol_test_util.cpp b/src/mongo/client/replica_set_monitor_protocol_test_util.cpp
index 9456e4a8ba9..cb78bbaf097 100644
--- a/src/mongo/client/replica_set_monitor_protocol_test_util.cpp
+++ b/src/mongo/client/replica_set_monitor_protocol_test_util.cpp
@@ -38,14 +38,14 @@ void ReplicaSetMonitorProtocolTestUtil::setRSMProtocol(ReplicaSetMonitorProtocol
     BSONElement newParameter = parameterIterator.next();
     const auto foundParameter = findRSMProtocolServerParameter();
 
-    uassertStatusOK(foundParameter->second->set(newParameter));
+    uassertStatusOK(foundParameter->second->set(newParameter, boost::none));
 }
 
 void ReplicaSetMonitorProtocolTestUtil::resetRSMProtocol() {
     const auto defaultParameter = kDefaultParameter[kRSMProtocolFieldName];
     const auto foundParameter = findRSMProtocolServerParameter();
 
-    uassertStatusOK(foundParameter->second->set(defaultParameter));
+    uassertStatusOK(foundParameter->second->set(defaultParameter, boost::none));
 }
 
 ServerParameter::Map::const_iterator
diff --git a/src/mongo/client/replica_set_monitor_server_parameters.cpp b/src/mongo/client/replica_set_monitor_server_parameters.cpp
index 4d0c1dd4e0e..9b831d768c4 100644
--- a/src/mongo/client/replica_set_monitor_server_parameters.cpp
+++ b/src/mongo/client/replica_set_monitor_server_parameters.cpp
@@ -46,12 +46,14 @@ std::string toString(ReplicaSetMonitorProtocol protocol) {
 }
 
 void RSMProtocolServerParameter::append(OperationContext*,
-                                        BSONObjBuilder& builder,
-                                        const std::string& name) {
-    builder.append(name, toString(gReplicaSetMonitorProtocol));
+                                        BSONObjBuilder* builder,
+                                        StringData name,
+                                        const boost::optional<TenantId>&) {
+    builder->append(name, toString(gReplicaSetMonitorProtocol));
 }
 
-Status RSMProtocolServerParameter::setFromString(const std::string& protocolStr) {
+Status RSMProtocolServerParameter::setFromString(StringData protocolStr,
+                                                 const boost::optional<TenantId>&) {
     if (protocolStr == toString(ReplicaSetMonitorProtocol::kStreamable)) {
         gReplicaSetMonitorProtocol = ReplicaSetMonitorProtocol::kStreamable;
     } else if (protocolStr == toString(ReplicaSetMonitorProtocol::kSdam)) {