mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gms: gossiper: coroutinize mark_as_shutdown and convict

Browse Source 
Since these two functions call each other, convert
to coroutines and eliminate the dependency on `seastar::async`
for both of them at the same time.

Signed-off-by: Pavel Solodovnikov <pa.solodovnikov@scylladb.com>
This commit is contained in:
Pavel Solodovnikov
2022-01-16 14:27:00 +03:00
parent c584a9cc1f
commit 9ce0e2efa3
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gms/gossiper.cc
View File

@@ -425,7 +425,7 @@ future<> gossiper::handle_shutdown_msg(inet_address from, std::optional<int64_t>
return;
}
}
this->mark_as_shutdown(from);
this->mark_as_shutdown(from).get();
});
}
@@ -755,7 +755,7 @@ future<> gossiper::failure_detector_loop_for_node(gms::inet_address node, int64_
logger.info("failure_detector_loop: Mark node {} as DOWN", node);
co_await container().invoke_on(0, [node] (gms::gossiper& g) {
return seastar::async([node, &g] {
g.convict(node);
g.convict(node).get();
});
});
co_return;
@@ -814,7 +814,7 @@ future<> gossiper::failure_detector_loop() {
nodes, _live_endpoints, nodes_down);
co_await seastar::async([this, &nodes_down] {
for (const auto& node : nodes_down) {
convict(node);
convict(node).get();
}
});
}
@@ -1046,17 +1046,15 @@ int64_t gossiper::get_endpoint_downtime(inet_address ep) const noexcept {
// Depends on
// - on_dead callbacks
// It is called from failure_detector
//
// Runs inside seastar::async context
void gossiper::convict(inet_address endpoint) {
future<> gossiper::convict(inet_address endpoint) {
auto* state = get_endpoint_state_for_endpoint_ptr(endpoint);
if (!state || !state->is_alive()) {
return;
co_return;
}
if (is_shutdown(endpoint)) {
mark_as_shutdown(endpoint);
co_await mark_as_shutdown(endpoint);
} else {
mark_dead(endpoint, *state).get();
co_await mark_dead(endpoint, *state);
}
}
@@ -1615,7 +1613,7 @@ void gossiper::handle_major_state_change(inet_address ep, const endpoint_state&
}
// check this at the end so nodes will learn about the endpoint
if (is_shutdown(ep)) {
mark_as_shutdown(ep);
mark_as_shutdown(ep).get();
}
}
@@ -2251,16 +2249,15 @@ sstring gossiper::get_application_state_value(inet_address endpoint, application
* This method is used to mark a node as shutdown; that is it gracefully exited on its own and told us about it
* @param endpoint endpoint that has shut itself down
*/
// Runs inside seastar::async context
void gossiper::mark_as_shutdown(const inet_address& endpoint) {
future<> gossiper::mark_as_shutdown(const inet_address& endpoint) {
auto es = get_endpoint_state_for_endpoint_ptr(endpoint);
if (es) {
auto& ep_state = *es;
ep_state.add_application_state(application_state::STATUS, versioned_value::shutdown(true));
ep_state.get_heart_beat_state().force_highest_possible_version_unsafe();
replicate(endpoint, ep_state).get();
mark_dead(endpoint, ep_state).get();
convict(endpoint);
co_await replicate(endpoint, ep_state);
co_await mark_dead(endpoint, ep_state);
co_await convict(endpoint);
}
}

4
gms/gossiper.hh
View File

@@ -260,7 +260,7 @@ public:
/**
* @param endpoint end point that is convicted.
*/
void convict(inet_address endpoint);
future<> convict(inet_address endpoint);
/**
* Return either: the greatest heartbeat or application state
@@ -554,7 +554,7 @@ public:
bool is_normal_ring_member(const inet_address& endpoint) const;
bool is_cql_ready(const inet_address& endpoint) const;
bool is_silent_shutdown_state(const endpoint_state& ep_state) const;
void mark_as_shutdown(const inet_address& endpoint);
future<> mark_as_shutdown(const inet_address& endpoint);
void force_newer_generation();
public:
std::string_view get_gossip_status(const endpoint_state& ep_state) const noexcept;