mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-02 13:06:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

gossiper: is_enabled: consider also _abort_source

Browse Source 
Once abort is requested we should not process any more
gossip RPCs to prevent undesired side effects
of partially applied state changes.

Signed-off-by: Benny Halevy <bhalevy@scylladb.com>
This commit is contained in:
Benny Halevy
2023-08-24 11:03:32 +03:00
parent 93be4c0cb0
commit ae70afd099
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gms/gossiper.cc
View File

@@ -891,7 +891,7 @@ future<> gossiper::failure_detector_loop() {
co_return;
}
logger.info("failure_detector_loop: Started main loop");
while (is_enabled() && !_abort_source.abort_requested()) {
while (is_enabled()) {
try {
while (_live_endpoints.empty() && is_enabled()) {
logger.debug("failure_detector_loop: Wait until live_nodes={} is not empty", _live_endpoints);
@@ -2168,7 +2168,10 @@ future<> gossiper::add_local_application_state(std::list<std::pair<application_s
}
future<> gossiper::do_stop_gossiping() {
if (!is_enabled()) {
// Don't rely on is_enabled() since it
// also considers _abort_source and return false
// before _enabled is set to false down below.
if (!_enabled) {
logger.info("gossip is already stopped");
return make_ready_future<>();
}
@@ -2234,7 +2237,7 @@ future<> gossiper::stop() {
}
bool gossiper::is_enabled() const {
return _enabled;
return _enabled && !_abort_source.abort_requested();
}
void gossiper::goto_shadow_round() {