mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-31 03:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage_service: Enable commented out code in handle_state_normal

Browse Source 
Add current_owner to endpoints_to_remove if endpoint and current_owner
have the same token and endpoint is newer than current_owner.
This commit is contained in:
Asias He
2015-12-09 11:03:30 +08:00
parent 3793bb7be1
commit d26c7e671d
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
service/storage_service.cc
View File

@@ -532,16 +532,20 @@ void storage_service::handle_state_normal(inet_address endpoint) {
logger.debug("handle_state_normal: endpoint={} > current_owner={}, token {}", endpoint, *current_owner, t);
tokens_to_update_in_metadata.insert(t);
tokens_to_update_in_system_keyspace.insert(t);
#if 0
// currentOwner is no longer current, endpoint is. Keep track of these moves, because when
// a host no longer has any tokens, we'll want to remove it.
Multimap<InetAddress, Token> epToTokenCopy = getTokenMetadata().getEndpointToTokenMapForReading();
epToTokenCopy.get(currentOwner).remove(token);
if (epToTokenCopy.get(currentOwner).size() < 1)
endpointsToRemove.add(currentOwner);
#endif
std::multimap<inet_address, token> ep_to_token_copy = get_token_metadata().get_endpoint_to_token_map_for_reading();
auto rg = ep_to_token_copy.equal_range(*current_owner);
for (auto it = rg.first; it != rg.second; it++) {
if (it->second == t) {
logger.info("handle_state_normal: remove endpoint={} token={}", *current_owner, t);
ep_to_token_copy.erase(it);
}
}
if (ep_to_token_copy.count(*current_owner) < 1) {
logger.info("handle_state_normal: endpoints_to_remove endpoint={}", *current_owner);
endpoints_to_remove.insert(*current_owner);
}
logger.info("handle_state_normal: Nodes {} and {} have the same token {}. {} is the new owner", endpoint, *current_owner, t, endpoint);
} else {
logger.info("handle_state_normal: Nodes {} and {} have the same token {}. Ignoring {}", endpoint, *current_owner, t, endpoint);