bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

token_metadata: Rename is_member to is_normal_token_owner

Browse Source 
The name is_normal_token_owner is more clear than is_member.
The is_normal_token_owner reflects what it really checks.
This commit is contained in:
Asias He
2022-11-18 09:01:57 +08:00
parent 965097cde5
commit 4571fcf9e7
9 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/hints/manager.cc
View File

@@ -558,7 +558,7 @@ bool manager::end_point_hints_manager::sender::can_send() noexcept {
return true;
} else {
if (!_state.contains(state::ep_state_left_the_ring)) {
_state.set_if<state::ep_state_left_the_ring>(!_shard_manager.local_db().get_token_metadata().is_member(end_point_key()));
_state.set_if<state::ep_state_left_the_ring>(!_shard_manager.local_db().get_token_metadata().is_normal_token_owner(end_point_key()));
}
// send the hints out if the destination Node is part of the ring - we will send to all new replicas in this case
return _state.contains(state::ep_state_left_the_ring);

2
db/system_keyspace.cc
View File

@@ -1872,7 +1872,7 @@ public:
set_cell(cr, "host_id", hostid->uuid());
}
if (tm.is_member(endpoint)) {
if (tm.is_normal_token_owner(endpoint)) {
sstring dc = tm.get_topology().get_location(endpoint).dc;
set_cell(cr, "dc", dc);
}

4
gms/gossiper.cc
View File

@@ -726,7 +726,7 @@ future<> gossiper::do_status_check() {
// check for dead state removal
auto expire_time = get_expire_time_for_endpoint(endpoint);
if (!is_alive && (now > expire_time)
&& (!get_token_metadata_ptr()->is_member(endpoint))) {
&& (!get_token_metadata_ptr()->is_normal_token_owner(endpoint))) {
logger.debug("time is expiring for endpoint : {} ({})", endpoint, expire_time.time_since_epoch().count());
co_await evict_from_membership(endpoint);
}
@@ -1300,7 +1300,7 @@ bool gossiper::is_gossip_only_member(inet_address endpoint) {
if (!es) {
return false;
}
return !is_dead_state(*es) && !get_token_metadata_ptr()->is_member(endpoint);
return !is_dead_state(*es) && !get_token_metadata_ptr()->is_normal_token_owner(endpoint);
}
clk::time_point gossiper::get_expire_time_for_endpoint(inet_address endpoint) const noexcept {

2
locator/abstract_replication_strategy.cc
View File

@@ -229,7 +229,7 @@ abstract_replication_strategy::get_address_ranges(const token_metadata& tm) cons
future<std::unordered_multimap<inet_address, dht::token_range>>
abstract_replication_strategy::get_address_ranges(const token_metadata& tm, inet_address endpoint) const {
std::unordered_multimap<inet_address, dht::token_range> ret;
if (!tm.is_member(endpoint)) {
if (!tm.is_normal_token_owner(endpoint)) {
co_return ret;
}
bool is_everywhere_topology = get_type() == replication_strategy_type::everywhere_topology;

8
locator/token_metadata.cc
View File

@@ -160,7 +160,7 @@ public:
public:
void remove_endpoint(inet_address endpoint);
bool is_member(inet_address endpoint) const;
bool is_normal_token_owner(inet_address endpoint) const;
bool is_leaving(inet_address endpoint) const;
@@ -554,7 +554,7 @@ const std::unordered_map<inet_address, host_id>& token_metadata_impl::get_endpoi
return _endpoint_to_host_id_map;
}
bool token_metadata_impl::is_member(inet_address endpoint) const {
bool token_metadata_impl::is_normal_token_owner(inet_address endpoint) const {
return _normal_token_owners.contains(endpoint);
}
@@ -1123,8 +1123,8 @@ token_metadata::remove_endpoint(inet_address endpoint) {
}
bool
token_metadata::is_member(inet_address endpoint) const {
return _impl->is_member(endpoint);
token_metadata::is_normal_token_owner(inet_address endpoint) const {
return _impl->is_normal_token_owner(endpoint);
}
bool

2
locator/token_metadata.hh
View File

@@ -171,7 +171,7 @@ public:
// Checks if the node is part of the token ring. If yes, the node is one of
// the nodes that owns the tokens and inside the set _normal_token_owners.
bool is_member(inet_address endpoint) const;
bool is_normal_token_owner(inet_address endpoint) const;
bool is_leaving(inet_address endpoint) const;

2
repair/repair.cc
View File

@@ -1558,7 +1558,7 @@ future<> repair_service::do_decommission_removenode_with_repair(locator::token_m
auto temp = tmptr->clone_after_all_left().get0();
// leaving_node might or might not be 'leaving'. If it was not leaving (that is, removenode
// command was used), it is still present in temp and must be removed.
if (temp.is_member(leaving_node)) {
if (temp.is_normal_token_owner(leaving_node)) {
temp.remove_endpoint(leaving_node);
}
std::unordered_map<dht::token_range, repair_neighbors> range_sources;

2
service/migration_manager.cc
View File

@@ -1141,7 +1141,7 @@ future<> migration_manager::on_change(gms::inet_address endpoint, gms::applicati
mlogger.debug("Ignoring state change for dead or unknown endpoint: {}", endpoint);
return make_ready_future();
}
if (_storage_proxy.get_token_metadata_ptr()->is_member(endpoint)) {
if (_storage_proxy.get_token_metadata_ptr()->is_normal_token_owner(endpoint)) {
schedule_schema_pull(endpoint, *ep_state);
}
}

30
service/storage_service.cc
View File

@@ -472,7 +472,7 @@ future<> storage_service::join_token_ring(cdc::generation_service& cdc_gen_servi
if (!is_replacing()) {
auto tmptr = get_token_metadata_ptr();
if (tmptr->is_member(get_broadcast_address())) {
if (tmptr->is_normal_token_owner(get_broadcast_address())) {
throw std::runtime_error("This node is already a member of the token ring; bootstrap aborted. (If replacing a dead node, remove the old one from the ring first.)");
}
slogger.info("getting bootstrap token");
@@ -862,7 +862,7 @@ future<> storage_service::handle_state_bootstrap(inet_address endpoint) {
// continue.
auto tmlock = co_await get_token_metadata_lock();
auto tmptr = co_await get_mutable_token_metadata_ptr();
if (tmptr->is_member(endpoint)) {
if (tmptr->is_normal_token_owner(endpoint)) {
// If isLeaving is false, we have missed both LEAVING and LEFT. However, if
// isLeaving is true, we have only missed LEFT. Waiting time between completing
// leave operation and rebootstrapping is relatively short, so the latter is quite
@@ -891,7 +891,7 @@ future<> storage_service::handle_state_normal(inet_address endpoint) {
auto tmlock = std::make_unique<token_metadata_lock>(co_await get_token_metadata_lock());
auto tmptr = co_await get_mutable_token_metadata_ptr();
if (tmptr->is_member(endpoint)) {
if (tmptr->is_normal_token_owner(endpoint)) {
slogger.info("Node {} state jump to normal", endpoint);
}
std::unordered_set<inet_address> endpoints_to_remove;
@@ -969,7 +969,7 @@ future<> storage_service::handle_state_normal(inet_address endpoint) {
}
}
bool is_member = tmptr->is_member(endpoint);
bool is_normal_token_owner = tmptr->is_normal_token_owner(endpoint);
bool do_notify_joined = false;
if (endpoints_to_remove.contains(endpoint)) [[unlikely]] {
@@ -984,7 +984,7 @@ future<> storage_service::handle_state_normal(inet_address endpoint) {
// Update pending ranges after update of normal tokens immediately to avoid
// a race where natural endpoint was updated to contain node A, but A was
// not yet removed from pending endpoints
if (!is_member) {
if (!is_normal_token_owner) {
auto dc_rack = get_dc_rack_for(endpoint);
slogger.debug("handle_state_normal: update_topology: endpoint={} dc={} rack={}", endpoint, dc_rack.dc, dc_rack.rack);
tmptr->update_topology(endpoint, std::move(dc_rack));
@@ -1000,7 +1000,7 @@ future<> storage_service::handle_state_normal(inet_address endpoint) {
for (auto ep : endpoints_to_remove) {
co_await remove_endpoint(ep);
}
slogger.debug("handle_state_normal: endpoint={} is_member={} endpoint_to_remove={} owned_tokens={}", endpoint, is_member, endpoints_to_remove.contains(endpoint), owned_tokens);
slogger.debug("handle_state_normal: endpoint={} is_normal_token_owner={} endpoint_to_remove={} owned_tokens={}", endpoint, is_normal_token_owner, endpoints_to_remove.contains(endpoint), owned_tokens);
if (!owned_tokens.empty() && !endpoints_to_remove.count(endpoint)) {
co_await update_peer_info(endpoint);
try {
@@ -1036,7 +1036,7 @@ future<> storage_service::handle_state_leaving(inet_address endpoint) {
// leave). This way we'll get pending ranges right.
auto tmlock = co_await get_token_metadata_lock();
auto tmptr = co_await get_mutable_token_metadata_ptr();
if (!tmptr->is_member(endpoint)) {
if (!tmptr->is_normal_token_owner(endpoint)) {
// FIXME: this code should probably resolve token collisions too, like handle_state_normal
slogger.info("Node {} state jump to leaving", endpoint);
@@ -1103,7 +1103,7 @@ future<> storage_service::handle_state_removing(inet_address endpoint, std::vect
}
co_return;
}
if (get_token_metadata().is_member(endpoint)) {
if (get_token_metadata().is_normal_token_owner(endpoint)) {
auto state = pieces[0];
auto remove_tokens = get_token_metadata().get_tokens(endpoint);
if (sstring(gms::versioned_value::REMOVED_TOKEN) == state) {
@@ -1168,8 +1168,8 @@ future<> storage_service::on_join(gms::inet_address endpoint, gms::endpoint_stat
future<> storage_service::on_alive(gms::inet_address endpoint, gms::endpoint_state state) {
slogger.debug("endpoint={} on_alive", endpoint);
bool is_member = get_token_metadata().is_member(endpoint);
if (is_member) {
bool is_normal_token_owner = get_token_metadata().is_normal_token_owner(endpoint);
if (is_normal_token_owner) {
co_await notify_up(endpoint);
}
bool replacing_pending_ranges = _replacing_nodes_pending_ranges_updater.contains(endpoint);
@@ -1177,14 +1177,14 @@ future<> storage_service::on_alive(gms::inet_address endpoint, gms::endpoint_sta
_replacing_nodes_pending_ranges_updater.erase(endpoint);
}
if (!is_member || replacing_pending_ranges) {
if (!is_normal_token_owner || replacing_pending_ranges) {
auto tmlock = co_await get_token_metadata_lock();
auto tmptr = co_await get_mutable_token_metadata_ptr();
if (replacing_pending_ranges) {
slogger.info("Trigger pending ranges updater for replacing node {}", endpoint);
co_await handle_state_replacing_update_pending_ranges(tmptr, endpoint);
}
if (!is_member) {
if (!is_normal_token_owner) {
tmptr->update_topology(endpoint, get_dc_rack_for(endpoint), locator::topology::pending::yes);
}
co_await replicate_to_all_cores(std::move(tmptr));
@@ -1231,7 +1231,7 @@ future<> storage_service::on_change(inet_address endpoint, application_state sta
slogger.debug("Ignoring state change for dead or unknown endpoint: {}", endpoint);
co_return;
}
if (get_token_metadata().is_member(endpoint)) {
if (get_token_metadata().is_normal_token_owner(endpoint)) {
slogger.debug("endpoint={} on_change: updating system.peers table", endpoint);
co_await do_update_system_peers_table(endpoint, state, value);
if (state == application_state::RPC_READY) {
@@ -1955,7 +1955,7 @@ future<> storage_service::decommission() {
auto tmptr = ss.get_token_metadata_ptr();
auto& db = ss._db.local();
auto endpoint = ss.get_broadcast_address();
if (!tmptr->is_member(endpoint)) {
if (!tmptr->is_normal_token_owner(endpoint)) {
throw std::runtime_error("local node is not a member of the token ring yet");
}
@@ -2816,7 +2816,7 @@ future<std::unordered_multimap<dht::token_range, inet_address>> storage_service:
// endpoint might or might not be 'leaving'. If it was not leaving (that is, removenode
// command was used), it is still present in temp and must be removed.
if (temp.is_member(endpoint)) {
if (temp.is_normal_token_owner(endpoint)) {
temp.remove_endpoint(endpoint);
}