diff --git a/src/c_api/coll_c_api.cc b/src/c_api/coll_c_api.cc index 2cace7930..095c4162a 100644 --- a/src/c_api/coll_c_api.cc +++ b/src/c_api/coll_c_api.cc @@ -183,7 +183,7 @@ XGB_DLL int XGTrackerFree(TrackerHandle handle) { // // - We don't have the first case since we never access the raw pointer. // - // - We don't hve the second case for most of the scenarios since tracker is an unique + // - We don't have the second case for most of the scenarios since tracker is an unique // object, if the free function is called before another function calls, it's likely // to be a bug in the user code. The use_count should only decrease in this function. while (ptr->first.use_count() != 1) { diff --git a/src/collective/socket.cc b/src/collective/socket.cc index 21f4abfcc..c8629069f 100644 --- a/src/collective/socket.cc +++ b/src/collective/socket.cc @@ -4,10 +4,9 @@ #include "xgboost/collective/socket.h" #include // for array -#include // std::size_t -#include // std::int32_t -#include // std::memcpy, std::memset -#include // for path +#include // for size_t +#include // for int32_t +#include // for memcpy, memset #include // for error_code, system_category #include // for sleep_for @@ -26,8 +25,7 @@ SockAddress MakeSockAddress(StringView host, in_port_t port) { struct addrinfo *res = nullptr; int sig = getaddrinfo(host.c_str(), nullptr, &hints, &res); if (sig != 0) { - LOG(FATAL) << "Failed to get addr info for: " << host - << ", error: " << gai_strerror(sig); + LOG(FATAL) << "Failed to get addr info for: " << host << ", error: " << gai_strerror(sig); return {}; } if (res->ai_family == static_cast(SockDomain::kV4)) { @@ -129,10 +127,9 @@ std::size_t TCPSocket::Send(StringView str) { } Result last_error; - auto log_failure = [&host, &last_error, port](Result err, char const *file, std::int32_t line) { + auto log_failure = [&host, &last_error, port](Result err) { last_error = std::move(err); - LOG(WARNING) << std::filesystem::path{file}.filename().string() << "(" << line - << "): Failed to connect to:" << host << ":" << port + LOG(WARNING) << "Failed to connect to:" << host << ":" << port << " Error:" << last_error.Report(); }; @@ -149,8 +146,7 @@ std::size_t TCPSocket::Send(StringView str) { auto errcode = system::LastError(); if (!system::ErrorWouldBlock(errcode)) { - log_failure(Fail("connect failed.", std::error_code{errcode, std::system_category()}), - __FILE__, __LINE__); + log_failure(Fail("connect failed.", std::error_code{errcode, std::system_category()})); continue; } @@ -160,21 +156,16 @@ std::size_t TCPSocket::Send(StringView str) { if (!result.OK()) { // poll would fail if there's a socket error, we log the root cause instead of the // poll failure. - auto sockerr = conn.GetSockError(); - if (!sockerr.OK()) { - result = std::move(sockerr); - } - log_failure(std::move(result), __FILE__, __LINE__); + log_failure(std::move(result) + conn.GetSockError()); continue; } if (!poll.CheckWrite(conn)) { - log_failure(Fail("poll failed.", std::error_code{errcode, std::system_category()}), __FILE__, - __LINE__); + log_failure(Fail("poll failed.", std::error_code{errcode, std::system_category()})); continue; } result = conn.GetSockError(); if (!result.OK()) { - log_failure(std::move(result), __FILE__, __LINE__); + log_failure(std::move(result)); continue; } diff --git a/src/collective/tracker.cc b/src/collective/tracker.cc index 9441ab449..56ec5d546 100644 --- a/src/collective/tracker.cc +++ b/src/collective/tracker.cc @@ -414,7 +414,7 @@ Result RabitTracker::Bootstrap(std::vector* p_workers) { addresses.emplace_back(SockAddrV6{*ipv6}); } } - // If not v4 address is found, we try v6 + // If no v4 address is found, we try v6 for (auto const& addr : addresses) { if (addr.IsV6()) { auto ip = addr.V6().Addr();