summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Nelson <lamont.nelson@mongodb.com>2020-02-27 19:06:08 -0500
committerLamont Nelson <lamont.nelson@mongodb.com>2020-02-27 19:06:08 -0500
commita3daefcdf47cf392260b5f89053e34b740151b2b (patch)
treea582686750390d790092f224d71fca5e5b09a29e
parent76cbe9ee07f9781ebd1f8cce3df1d0316fead143 (diff)
downloadmongo-a3daefcdf47cf392260b5f89053e34b740151b2b.tar.gz
format
-rw-r--r--jstests/sharding/repl_monitor_refresh.js1
-rw-r--r--src/mongo/client/sdam/server_description.h1
-rw-r--r--src/mongo/client/sdam/server_description_test.cpp4
-rw-r--r--src/mongo/client/server_is_master_monitor.cpp4
4 files changed, 4 insertions, 6 deletions
diff --git a/jstests/sharding/repl_monitor_refresh.js b/jstests/sharding/repl_monitor_refresh.js
index 152fa13a94a..31938b43044 100644
--- a/jstests/sharding/repl_monitor_refresh.js
+++ b/jstests/sharding/repl_monitor_refresh.js
@@ -24,7 +24,6 @@ var NODE_COUNT = 3;
var st = new ShardingTest({shards: {rs0: {nodes: NODE_COUNT, oplogSize: 10}}});
var replTest = st.rs0;
var mongos = st.s;
-//sleep(30 * 1000);
var shardDoc = mongos.getDB('config').shards.findOne();
assert.eq(NODE_COUNT, shardDoc.host.split(',').length); // seed list should contain all nodes
diff --git a/src/mongo/client/sdam/server_description.h b/src/mongo/client/sdam/server_description.h
index bcae48dc6c4..662890480c2 100644
--- a/src/mongo/client/sdam/server_description.h
+++ b/src/mongo/client/sdam/server_description.h
@@ -52,7 +52,6 @@ public:
*/
ServerDescription(ServerAddress address)
: _address(std::move(address)), _type(ServerType::kUnknown) {
- //boost::to_lower(_address);
}
/**
diff --git a/src/mongo/client/sdam/server_description_test.cpp b/src/mongo/client/sdam/server_description_test.cpp
index 3fb1925b7c7..1c9e1156707 100644
--- a/src/mongo/client/sdam/server_description_test.cpp
+++ b/src/mongo/client/sdam/server_description_test.cpp
@@ -42,7 +42,7 @@
namespace mongo::sdam {
// Disabling these tests since this causes jstest failures when
// running on a host with a mixed case hostname.
-//TEST(ServerDescriptionTest, ShouldNormalizeAddress) {
+// TEST(ServerDescriptionTest, ShouldNormalizeAddress) {
// ServerDescription a("foo:1234");
// ServerDescription b("FOo:1234");
// ASSERT_EQUALS(a.getAddress(), b.getAddress());
@@ -399,7 +399,7 @@ TEST_F(ServerDescriptionTestFixture, ShouldStoreLastUpdateTime) {
// Disabling these tests since this causes jstest failures when
// running on a host with a mixed case hostname.
-//TEST_F(ServerDescriptionTestFixture, ShouldStoreHostNamesAsLowercase) {
+// TEST_F(ServerDescriptionTestFixture, ShouldStoreHostNamesAsLowercase) {
// auto response = IsMasterOutcome("FOO:1234", kBsonHostNames, mongo::Milliseconds(40));
// auto description = ServerDescription(clockSource, response);
//
diff --git a/src/mongo/client/server_is_master_monitor.cpp b/src/mongo/client/server_is_master_monitor.cpp
index 6f68553ed79..2379881c20e 100644
--- a/src/mongo/client/server_is_master_monitor.cpp
+++ b/src/mongo/client/server_is_master_monitor.cpp
@@ -200,8 +200,8 @@ void SingleServerIsMasterMonitor::_doRemoteCommand() {
void SingleServerIsMasterMonitor::shutdown() {
stdx::lock_guard lock(_mutex);
- if (std::exchange(_isShutdown, true))
- return;
+ if (std::exchange(_isShutdown, true))
+ return;
LOG(kLogLevel.lessSevere()) << "Closing Replica Set SingleServerIsMasterMonitor for host "
<< _host;