diff options
author | A. Jesse Jiryu Davis <jesse@mongodb.com> | 2019-04-24 22:24:56 -0400 |
---|---|---|
committer | A. Jesse Jiryu Davis <jesse@mongodb.com> | 2019-04-24 22:24:56 -0400 |
commit | a996036e453ef6c2719889d32f2d90817431529e (patch) | |
tree | 6898cf924e4bbcf18b01efb757bbf251b9271023 /src/mongo/db | |
parent | 5e346eb4b9bb3ec678d4eac36b3f0a18c1c10939 (diff) | |
download | mongo-a996036e453ef6c2719889d32f2d90817431529e.tar.gz |
Revert "SERVER-4999 Normalize all hostnames to lowercase"
This reverts commit 5e346eb4b9bb3ec678d4eac36b3f0a18c1c10939.
Diffstat (limited to 'src/mongo/db')
5 files changed, 6 insertions, 29 deletions
diff --git a/src/mongo/db/repl/isself_test.cpp b/src/mongo/db/repl/isself_test.cpp index bbb03d0b26c..511ef122ecf 100644 --- a/src/mongo/db/repl/isself_test.cpp +++ b/src/mongo/db/repl/isself_test.cpp @@ -79,10 +79,6 @@ TEST_F(ServiceContextTest, DetectsSameHostIPv6) { #endif } -TEST_F(ServiceContextTest, DetectsSameHostDifferentCapitalization) { - ASSERT(isSelf(HostAndPort("LoCalHOST", serverGlobalParams.port), getGlobalServiceContext())); -} - } // namespace } // namespace repl diff --git a/src/mongo/db/repl/repl_set_config_test.cpp b/src/mongo/db/repl/repl_set_config_test.cpp index 14295fc86fd..7f3af1345bb 100644 --- a/src/mongo/db/repl/repl_set_config_test.cpp +++ b/src/mongo/db/repl/repl_set_config_test.cpp @@ -975,25 +975,6 @@ TEST(ReplSetConfig, ValidateFailsWithDuplicateMemberId) { ASSERT_EQUALS(ErrorCodes::BadValue, status); } -TEST(ReplSetConfig, ValidateFailsWithDuplicateHostnameCaseInsensitive) { - ReplSetConfig config; - Status status = config.initialize(BSON("_id" - << "rs0" - << "version" - << 1 - << "protocolVersion" - << 1 - << "members" - << BSON_ARRAY(BSON("_id" << 0 << "host" - << "localhost:12345") - << BSON("_id" << 1 << "host" - << "LOCALHOST:12345")))); - ASSERT_OK(status); - - status = config.validate(); - ASSERT_EQUALS(ErrorCodes::BadValue, status); -} - TEST(ReplSetConfig, ValidateFailsWithInvalidMember) { ReplSetConfig config; Status status = config.initialize(BSON("_id" diff --git a/src/mongo/db/repl/repl_set_heartbeat_response_test.cpp b/src/mongo/db/repl/repl_set_heartbeat_response_test.cpp index cd9c331dcd3..72c7d31190a 100644 --- a/src/mongo/db/repl/repl_set_heartbeat_response_test.cpp +++ b/src/mongo/db/repl/repl_set_heartbeat_response_test.cpp @@ -118,7 +118,7 @@ TEST(ReplSetHeartbeatResponse, DefaultConstructThenSlowlyBuildToFullObj) { ASSERT_EQUALS(Timestamp(0, 10), hbResponseObj["durableOpTime"]["ts"].timestamp()); ASSERT_EQUALS(config.toBSON().toString(), hbResponseObj["config"].Obj().toString()); ASSERT_EQUALS(2, hbResponseObj["state"].numberLong()); - ASSERT_EQUALS_CI("syncTarget:27017", hbResponseObj["syncingTo"].String()); + ASSERT_EQUALS("syncTarget:27017", hbResponseObj["syncingTo"].String()); initializeResult = hbResponseObjRoundTripChecker.initialize(hbResponseObj, 0, /*requireWallTime*/ true); diff --git a/src/mongo/db/s/config/sharding_catalog_manager_add_shard_test.cpp b/src/mongo/db/s/config/sharding_catalog_manager_add_shard_test.cpp index 23a107a43b5..ce9460cf3e6 100644 --- a/src/mongo/db/s/config/sharding_catalog_manager_add_shard_test.cpp +++ b/src/mongo/db/s/config/sharding_catalog_manager_add_shard_test.cpp @@ -287,7 +287,7 @@ protected: auto foundShard = assertGet(getShardDoc(operationContext(), expectedShard.getName())); ASSERT_EQUALS(expectedShard.getName(), foundShard.getName()); - ASSERT_EQUALS_CI(expectedShard.getHost(), foundShard.getHost()); + ASSERT_EQUALS(expectedShard.getHost(), foundShard.getHost()); ASSERT_EQUALS(expectedShard.getMaxSizeMB(), foundShard.getMaxSizeMB()); ASSERT_EQUALS(expectedShard.getDraining(), foundShard.getDraining()); ASSERT_EQUALS((int)expectedShard.getState(), (int)foundShard.getState()); @@ -332,7 +332,7 @@ protected: auto logEntry = assertGet(ChangeLogType::fromBSON(logEntryBSON)); ASSERT_EQUALS(addedShard.getName(), logEntry.getDetails()["name"].String()); - ASSERT_EQUALS_CI(addedShard.getHost(), logEntry.getDetails()["host"].String()); + ASSERT_EQUALS(addedShard.getHost(), logEntry.getDetails()["host"].String()); } void forwardAddShardNetwork(Date_t when) { diff --git a/src/mongo/db/s/config/sharding_catalog_manager_create_database_test.cpp b/src/mongo/db/s/config/sharding_catalog_manager_create_database_test.cpp index 895783e6254..59fe4af9e98 100644 --- a/src/mongo/db/s/config/sharding_catalog_manager_create_database_test.cpp +++ b/src/mongo/db/s/config/sharding_catalog_manager_create_database_test.cpp @@ -106,7 +106,7 @@ TEST_F(CreateDatabaseTest, createDatabaseSuccess) { // Return size information about first shard onCommand([&](const RemoteCommandRequest& request) { - ASSERT_EQUALS(HostAndPort(s0.getHost()), request.target); + ASSERT_EQUALS(s0.getHost(), request.target.toString()); ASSERT_EQUALS("admin", request.dbname); std::string cmdName = request.cmdObj.firstElement().fieldName(); ASSERT_EQUALS("listDatabases", cmdName); @@ -121,7 +121,7 @@ TEST_F(CreateDatabaseTest, createDatabaseSuccess) { // Return size information about second shard onCommand([&](const RemoteCommandRequest& request) { - ASSERT_EQUALS(HostAndPort(s1.getHost()), request.target); + ASSERT_EQUALS(s1.getHost(), request.target.toString()); ASSERT_EQUALS("admin", request.dbname); std::string cmdName = request.cmdObj.firstElement().fieldName(); ASSERT_EQUALS("listDatabases", cmdName); @@ -136,7 +136,7 @@ TEST_F(CreateDatabaseTest, createDatabaseSuccess) { // Return size information about third shard onCommand([&](const RemoteCommandRequest& request) { - ASSERT_EQUALS(HostAndPort(s2.getHost()), request.target); + ASSERT_EQUALS(s2.getHost(), request.target.toString()); ASSERT_EQUALS("admin", request.dbname); std::string cmdName = request.cmdObj.firstElement().fieldName(); ASSERT_EQUALS("listDatabases", cmdName); |