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

gossiper: mark_alive: use deferred_action to unmark pending

Browse Source 
Make sure _pending_mark_alive_endpoints is unmarked in
any case, including exceptions.

Fixes #14839

Signed-off-by: Benny Halevy <bhalevy@scylladb.com>

Closes #14840
This commit is contained in:
Benny Halevy
2023-07-11 11:40:41 +03:00
committed by Avi Kivity
parent 056d04954c
commit 1e7e2eeaee
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gms/gossiper.cc
View File

@@ -1470,10 +1470,7 @@ void gossiper::update_timestamp_for_nodes(const std::map<inet_address, endpoint_
}
void gossiper::mark_alive(inet_address addr, endpoint_state& local_state) {
// if (MessagingService.instance().getVersion(addr) < MessagingService.VERSION_20) {
// real_mark_alive(addr, local_state);
// return;
// }
// Enter the _background_msg gate so stop() would wait on it
auto inserted = _pending_mark_alive_endpoints.insert(addr).second;
if (inserted) {
// The node is not in the _pending_mark_alive_endpoints
@@ -1484,6 +1481,11 @@ void gossiper::mark_alive(inet_address addr, endpoint_state& local_state) {
return;
}
// unmark addr as pending on exception or after background continuation completes
auto unmark_pending = deferred_action([this, addr, g = shared_from_this()] () noexcept {
_pending_mark_alive_endpoints.erase(addr);
});
local_state.mark_dead();
msg_addr id = get_msg_addr(addr);
auto generation = _endpoint_state_map[get_broadcast_address()].get_heart_beat_state().get_generation();
@@ -1504,9 +1506,7 @@ void gossiper::mark_alive(inet_address addr, endpoint_state& local_state) {
return real_mark_alive(addr, state);
}
return make_ready_future();
}).finally([this, addr] {
_pending_mark_alive_endpoints.erase(addr);
}).handle_exception([addr, gh = std::move(gh)] (auto ep) {
}).handle_exception([addr, gh = std::move(gh), unmark_pending = std::move(unmark_pending)] (auto ep) {
logger.warn("Fail to send EchoMessage to {}: {}", addr, ep);
});
}