From 006e02410f9b2f1b7928cb69f064c1807c80644c Mon Sep 17 00:00:00 2001 From: Benny Halevy Date: Tue, 21 Mar 2023 18:15:29 +0200 Subject: [PATCH] topology: rename update_endpoint to add_or_update_endpoint To reflect what it does, Signed-off-by: Benny Halevy --- locator/token_metadata.cc | 2 +- locator/topology.cc | 6 +++--- locator/topology.hh | 2 +- test/boost/network_topology_strategy_test.cc | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/locator/token_metadata.cc b/locator/token_metadata.cc index b972fec93e..35a51b3f89 100644 --- a/locator/token_metadata.cc +++ b/locator/token_metadata.cc @@ -103,7 +103,7 @@ public: } void update_topology(inet_address ep, endpoint_dc_rack dr) { - _topology.update_endpoint(ep, std::move(dr)); + _topology.add_or_update_endpoint(ep, std::move(dr)); } /** diff --git a/locator/topology.cc b/locator/topology.cc index 8a76e068b8..ba8c0ab7e2 100644 --- a/locator/topology.cc +++ b/locator/topology.cc @@ -36,7 +36,7 @@ future<> topology::clear_gently() noexcept { topology::topology(config cfg) : _sort_by_proximity(!cfg.disable_proximity_sorting) { - update_endpoint(utils::fb_utilities::get_broadcast_address(), cfg.local_dc_rack); + add_or_update_endpoint(utils::fb_utilities::get_broadcast_address(), cfg.local_dc_rack); } future topology::clone_gently() const { @@ -64,7 +64,7 @@ future topology::clone_gently() const { co_return ret; } -void topology::update_endpoint(const inet_address& ep, endpoint_dc_rack dr) +void topology::add_or_update_endpoint(const inet_address& ep, endpoint_dc_rack dr) { auto current = _current_locations.find(ep); @@ -75,7 +75,7 @@ void topology::update_endpoint(const inet_address& ep, endpoint_dc_rack dr) remove_endpoint(ep); } - tlogger.debug("update_endpoint: {} {}/{}", ep, dr.dc, dr.rack); + tlogger.debug("add_or_update_endpoint: {} {}/{}", ep, dr.dc, dr.rack); _dc_endpoints[dr.dc].insert(ep); _dc_racks[dr.dc][dr.rack].insert(ep); _datacenters.insert(dr.dc); diff --git a/locator/topology.hh b/locator/topology.hh index e38adda02b..6ed8f8e5e5 100644 --- a/locator/topology.hh +++ b/locator/topology.hh @@ -43,7 +43,7 @@ public: /** * Stores current DC/rack assignment for ep */ - void update_endpoint(const inet_address& ep, endpoint_dc_rack dr); + void add_or_update_endpoint(const inet_address& ep, endpoint_dc_rack dr); /** * Removes current DC/rack assignment for ep diff --git a/test/boost/network_topology_strategy_test.cc b/test/boost/network_topology_strategy_test.cc index 4a3dec92bb..6f00964333 100644 --- a/test/boost/network_topology_strategy_test.cc +++ b/test/boost/network_topology_strategy_test.cc @@ -181,7 +181,7 @@ std::unique_ptr generate_topology(const std::vectorupdate_endpoint(p.host, { dc, rack }); + topo->add_or_update_endpoint(p.host, { dc, rack }); } return topo; @@ -565,7 +565,7 @@ std::unique_ptr generate_topology(const std::unordered_mapupdate_endpoint(node, { dc, to_sstring(r) }); + topo->add_or_update_endpoint(node, { dc, to_sstring(r) }); } return topo;