diff options
| author | Andrew Shuvalov <andrew.shuvalov@mongodb.com> | 2022-03-12 01:06:53 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-03-14 14:38:57 +0000 |
| commit | 15ab1b0cd98bd40165c2b3e8b0f5db030b81876a (patch) | |
| tree | c183998a83451cbf8d96f67f1dbc996237abf06e | |
| parent | 8fe804f3b383594441788ac995b6e50c9c340928 (diff) | |
| download | mongo-15ab1b0cd98bd40165c2b3e8b0f5db030b81876a.tar.gz | |
SERVER-64182 reconsile minor differences during 5.0 backport
| -rw-r--r-- | src/mongo/db/process_health/fault_manager_test_suite.h | 3 | ||||
| -rw-r--r-- | src/mongo/db/process_health/fault_state_machine_test.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/util/net/hostname_canonicalization.cpp | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/mongo/db/process_health/fault_manager_test_suite.h b/src/mongo/db/process_health/fault_manager_test_suite.h index 67e9f2d506c..d76141b380c 100644 --- a/src/mongo/db/process_health/fault_manager_test_suite.h +++ b/src/mongo/db/process_health/fault_manager_test_suite.h @@ -32,7 +32,6 @@ #include "mongo/db/process_health/fault_manager.h" -#include "mongo/db/concurrency/locker_noop_client_observer.h" #include "mongo/db/process_health/health_observer_mock.h" #include "mongo/db/process_health/health_observer_registration.h" #include "mongo/executor/network_interface_factory.h" @@ -141,8 +140,6 @@ public: _svcCtx->setFastClockSource(std::make_unique<ClockSourceMock>()); _svcCtx->setPreciseClockSource(std::make_unique<ClockSourceMock>()); _svcCtx->setTickSource(std::make_unique<TickSourceMock<Milliseconds>>()); - _svcCtx->registerClientObserver( - std::make_unique<LockerNoopClientObserverWithReplacementPolicy>()); advanceTime(Seconds(100)); } } diff --git a/src/mongo/db/process_health/fault_state_machine_test.cpp b/src/mongo/db/process_health/fault_state_machine_test.cpp index 913fb168d69..631a0b797be 100644 --- a/src/mongo/db/process_health/fault_state_machine_test.cpp +++ b/src/mongo/db/process_health/fault_state_machine_test.cpp @@ -369,7 +369,7 @@ TEST_F(FaultManagerTest, DNSHealthCheckWithBadHostNameFailsAndGoodHostNameSucces resetManager(std::move(config)); auto serverParam = - ServerParameterSet::getNodeParameterSet()->get<PeriodicHealthCheckIntervalsServerParameter>( + ServerParameterSet::getGlobal()->get<PeriodicHealthCheckIntervalsServerParameter>( "healthMonitoringIntervals"); auto bsonOBj = BSON("values" << BSON_ARRAY(BSON("type" << "dns" diff --git a/src/mongo/util/net/hostname_canonicalization.cpp b/src/mongo/util/net/hostname_canonicalization.cpp index f11ee345480..2db58719781 100644 --- a/src/mongo/util/net/hostname_canonicalization.cpp +++ b/src/mongo/util/net/hostname_canonicalization.cpp @@ -102,7 +102,7 @@ StatusWith<std::vector<std::string>> getHostFQDNs(std::string hostName, return Status(ErrorCodes::BadValue, errorStr); } - const ScopeGuard guard(shim_freeaddrinfo); + const auto guard = makeGuard(shim_freeaddrinfo); if (mode == HostnameCanonicalizationMode::kForward) { results.emplace_back(shim_fromNativeString(info->ai_canonname)); |