This is an automated email from the ASF dual-hosted git repository. abukor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kudu.git
commit aee98702cb8131f92ae18f9d6862ddc618145bdb Author: Alexey Serbin <[email protected]> AuthorDate: Mon Nov 6 15:11:18 2023 -0800 [master] fix typo in MasterAddrsToCsv() I saw a funny log message, and it turned to be a typo: Unable to fetch master addresses: OK This patch addresses the issue. Change-Id: I210bdc87148e9578677f0c9b10e10e036467fef7 Reviewed-on: http://gerrit.cloudera.org:8080/20670 Tested-by: Alexey Serbin <[email protected]> Reviewed-by: Mahesh Reddy <[email protected]> Reviewed-by: Abhishek Chennaka <[email protected]> --- src/kudu/master/master_path_handlers.cc | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/kudu/master/master_path_handlers.cc b/src/kudu/master/master_path_handlers.cc index f7ba11eec..92cdc223d 100644 --- a/src/kudu/master/master_path_handlers.cc +++ b/src/kudu/master/master_path_handlers.cc @@ -945,26 +945,25 @@ pair<string, string> MasterPathHandlers::TSDescToLinkPair(const TSDescriptor& de string MasterPathHandlers::MasterAddrsToCsv() const { vector<HostPort> master_addresses; - Status s = master_->GetMasterHostPorts(&master_addresses); - LOG(WARNING) << "Unable to fetch master addresses: " << s.ToString(); - if (!s.ok()) { + if (auto s = master_->GetMasterHostPorts(&master_addresses); !s.ok()) { + LOG(WARNING) << "unable to fetch master addresses: " << s.ToString(); return string(); } if (!master_addresses.empty()) { - vector<string> all_addresses; - all_addresses.reserve(master_addresses.size()); - for (const HostPort& hp : master_addresses) { - all_addresses.push_back(hp.ToString()); - } - return JoinElements(all_addresses, ","); + return JoinMapped(master_addresses, + [] (const HostPort& hp) { return hp.ToString(); }, + ","); } vector<HostPort> hps; - s = master_->rpc_server()->GetBoundHostPorts(&hps); - if (PREDICT_FALSE(!s.ok())) { - LOG(WARNING) << "Unable to determine proper local hostname: " << s.ToString(); + if (auto s = master_->rpc_server()->GetBoundHostPorts(&hps); !s.ok()) { + LOG(WARNING) << "unable to get bound host:ports pairs: " << s.ToString(); + return string(); + } + if (hps.empty()) { + LOG(WARNING) << "empty list of bound host:port pairs"; return string(); } - return hps[0].ToString(); + return hps.front().ToString(); } Status MasterPathHandlers::GetLeaderMasterHttpAddr(string* leader_http_addr) const {
