From 605725ecdb59272e989210d066a5e88b091906e7 Mon Sep 17 00:00:00 2001 From: Adi Zaimi Date: Mon, 23 Jan 2023 15:53:18 +0000 Subject: SERVER-73176: Only print actual error message in getHostFQDNs --- src/mongo/util/net/hostname_canonicalization.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mongo/util/net/hostname_canonicalization.cpp b/src/mongo/util/net/hostname_canonicalization.cpp index b329d0f6149..6ceb543f027 100644 --- a/src/mongo/util/net/hostname_canonicalization.cpp +++ b/src/mongo/util/net/hostname_canonicalization.cpp @@ -107,7 +107,6 @@ std::vector getHostFQDNs(std::string hostName, HostnameCanonicaliza std::vector getNameInfoErrors; for (shim_addrinfo* p = info; p; p = p->ai_next) { - std::stringstream getNameInfoError; shim_char host[NI_MAXHOST] = {}; if ((err = shim_getnameinfo( p->ai_addr, p->ai_addrlen, host, sizeof(host), nullptr, 0, NI_NAMEREQD)) == 0) { @@ -126,6 +125,7 @@ std::vector getHostFQDNs(std::string hostName, HostnameCanonicaliza sin_addr = reinterpret_cast(&addr_in6->sin6_addr); } + std::stringstream getNameInfoError; if (sin_addr) { invariant(inet_ntop(p->ai_family, sin_addr, ip_str, sizeof(ip_str)) != nullptr); getNameInfoError << ip_str; @@ -134,8 +134,8 @@ std::vector getHostFQDNs(std::string hostName, HostnameCanonicaliza } getNameInfoError << ": \"" << getAddrInfoStrError(err); + getNameInfoErrors.push_back(getNameInfoError.str()); } - getNameInfoErrors.push_back(getNameInfoError.str()); } if (!getNameInfoErrors.empty()) { @@ -146,6 +146,8 @@ std::vector getHostFQDNs(std::string hostName, HostnameCanonicaliza "errors"_attr = getNameInfoErrors); } + LOGV2_DEBUG(7317600, 4, "Name info: {results}", "Name info", "results"_attr = results); + // Deduplicate the results list std::sort(results.begin(), results.end()); results.erase(std::unique(results.begin(), results.end()), results.end()); -- cgit v1.2.1