summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Nelson <lamont.nelson@mongodb.com>2020-02-27 16:32:11 -0500
committerLamont Nelson <lamont.nelson@mongodb.com>2020-02-27 16:32:11 -0500
commit4f71bda6928b925c9136f38ec672a74c752bcc79 (patch)
treed353bf0ecc1675519e38a5f3c51353968d18df25
parent0514dd5e06fade374c872b17cd5a5322fc952a30 (diff)
downloadmongo-4f71bda6928b925c9136f38ec672a74c752bcc79.tar.gz
patch
-rw-r--r--src/mongo/client/sdam/server_description.cpp4
-rw-r--r--src/mongo/client/sdam/server_description.h2
-rw-r--r--src/mongo/client/sdam/server_description_builder.cpp2
-rw-r--r--src/mongo/client/sdam/topology_manager.cpp4
-rw-r--r--src/mongo/shell/shardingtest.js2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/mongo/client/sdam/server_description.cpp b/src/mongo/client/sdam/server_description.cpp
index 42dd37d0cdc..be5ddb67d25 100644
--- a/src/mongo/client/sdam/server_description.cpp
+++ b/src/mongo/client/sdam/server_description.cpp
@@ -115,14 +115,14 @@ void ServerDescription::storeHostListIfPresent(const std::string key,
std::transform(hostsBsonArray.begin(),
hostsBsonArray.end(),
std::inserter(destination, destination.begin()),
- [](const BSONElement e) { return boost::to_lower_copy(e.String()); });
+ [](const BSONElement e) { return e.String(); });
}
}
void ServerDescription::saveHosts(const BSONObj response) {
if (response.hasField("me")) {
auto me = response.getField("me");
- _me = boost::to_lower_copy(me.str());
+ _me = me.str();
}
storeHostListIfPresent("hosts", response, _hosts);
diff --git a/src/mongo/client/sdam/server_description.h b/src/mongo/client/sdam/server_description.h
index 7d95331fa0e..bcae48dc6c4 100644
--- a/src/mongo/client/sdam/server_description.h
+++ b/src/mongo/client/sdam/server_description.h
@@ -52,7 +52,7 @@ public:
*/
ServerDescription(ServerAddress address)
: _address(std::move(address)), _type(ServerType::kUnknown) {
- boost::to_lower(_address);
+ //boost::to_lower(_address);
}
/**
diff --git a/src/mongo/client/sdam/server_description_builder.cpp b/src/mongo/client/sdam/server_description_builder.cpp
index a82853ef3c7..534a3ea8454 100644
--- a/src/mongo/client/sdam/server_description_builder.cpp
+++ b/src/mongo/client/sdam/server_description_builder.cpp
@@ -73,7 +73,7 @@ ServerDescriptionBuilder& ServerDescriptionBuilder::withMaxWireVersion(int maxVe
}
ServerDescriptionBuilder& ServerDescriptionBuilder::withMe(const ServerAddress& me) {
- _instance->_me = boost::to_lower_copy(me);
+ _instance->_me = std::string(me);
return *this;
}
diff --git a/src/mongo/client/sdam/topology_manager.cpp b/src/mongo/client/sdam/topology_manager.cpp
index 81de9cf16f6..a4847391cf6 100644
--- a/src/mongo/client/sdam/topology_manager.cpp
+++ b/src/mongo/client/sdam/topology_manager.cpp
@@ -67,7 +67,7 @@ TopologyManager::TopologyManager(SdamConfiguration config,
TopologyEventsPublisherPtr eventsPublisher)
: _config(std::move(config)),
_clockSource(clockSource),
- _topologyDescription(std::make_unique<TopologyDescription>(_config)),
+ _topologyDescription(std::make_shared<TopologyDescription>(_config)),
_topologyStateMachine(std::make_unique<TopologyStateMachine>(_config)),
_topologyEventsPublisher(eventsPublisher) {}
@@ -107,7 +107,7 @@ bool TopologyManager::onServerDescription(const IsMasterOutcome& isMasterOutcome
_clockSource, isMasterOutcome, lastRTT, newTopologyVersion, poolResetCounter);
auto oldTopologyDescription = _topologyDescription;
- _topologyDescription = std::make_shared<TopologyDescription>(*_topologyDescription);
+ _topologyDescription = std::make_shared<TopologyDescription>(*oldTopologyDescription);
// if we are equal to the old description, just install the new description without
// performing any actions on the state machine.
diff --git a/src/mongo/shell/shardingtest.js b/src/mongo/shell/shardingtest.js
index 42c5a6590ff..6560fb8fa9c 100644
--- a/src/mongo/shell/shardingtest.js
+++ b/src/mongo/shell/shardingtest.js
@@ -1499,7 +1499,7 @@ var ShardingTest = function(params) {
}
rs.awaitSecondaryNodes();
-
+ print("HERE: " + rs.getURL());
var rsConn = new Mongo(rs.getURL());
rsConn.name = rs.getURL();