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

raft topology: Move get_excluded_nodes() to topology

Browse Source 
Will be accessed outside topology coordinator from tablet rebuild handler.
This commit is contained in:
Tomasz Grabiec
2024-01-19 20:17:19 +01:00
parent 92f01674f2
commit d053c5ef1e
3 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
service/storage_service.cc
View File

@@ -1351,12 +1351,7 @@ class topology_coordinator : public endpoint_lifecycle_subscriber {
}
std::optional<request_param> get_request_param(raft::server_id id) {
std::optional<request_param> req_param;
auto rit = _topo_sm._topology.req_param.find(id);
if (rit != _topo_sm._topology.req_param.end()) {
req_param = rit->second;
}
return req_param;
return _topo_sm._topology.get_request_param(id);
};
// Returns:
@@ -1482,27 +1477,11 @@ class topology_coordinator : public endpoint_lifecycle_subscriber {
};
raft::server_id parse_replaced_node(const std::optional<request_param>& req_param) {
if (req_param) {
auto *param = std::get_if<replace_param>(&*req_param);
if (param) {
return param->replaced_id;
}
}
return {};
return service::topology::parse_replaced_node(req_param);
}
std::unordered_set<raft::server_id> parse_ignore_nodes(const std::optional<request_param>& req_param) {
if (req_param) {
auto* remove_param = std::get_if<removenode_param>(&*req_param);
if (remove_param) {
return remove_param->ignored_ids;
}
auto* rep_param = std::get_if<replace_param>(&*req_param);
if (rep_param) {
return rep_param->ignored_ids;
}
}
return {};
return service::topology::parse_ignore_nodes(req_param);
}
inet_address id2ip(locator::host_id id) {
@@ -1577,14 +1556,7 @@ class topology_coordinator : public endpoint_lifecycle_subscriber {
}
std::unordered_set<raft::server_id> get_excluded_nodes(raft::server_id id, const std::optional<topology_request>& req, const std::optional<request_param>& req_param) {
auto exclude_nodes = parse_ignore_nodes(req_param);
if (auto replaced_node = parse_replaced_node(req_param)) {
exclude_nodes.insert(replaced_node);
}
if (req && *req == topology_request::remove) {
exclude_nodes.insert(id);
}
return exclude_nodes;
return service::topology::get_excluded_nodes(id, req, req_param);
}
std::unordered_set<raft::server_id> get_excluded_nodes(const node_to_work_on& node) {

45
service/topology_state_machine.cc
View File

@@ -43,6 +43,51 @@ bool topology::is_busy() const {
return tstate.has_value();
}
raft::server_id topology::parse_replaced_node(const std::optional<request_param>& req_param) {
if (req_param) {
auto *param = std::get_if<replace_param>(&*req_param);
if (param) {
return param->replaced_id;
}
}
return {};
}
std::unordered_set<raft::server_id> topology::parse_ignore_nodes(const std::optional<request_param>& req_param) {
if (req_param) {
auto* remove_param = std::get_if<removenode_param>(&*req_param);
if (remove_param) {
return remove_param->ignored_ids;
}
auto* rep_param = std::get_if<replace_param>(&*req_param);
if (rep_param) {
return rep_param->ignored_ids;
}
}
return {};
}
std::unordered_set<raft::server_id> topology::get_excluded_nodes(raft::server_id id,
const std::optional<topology_request>& req,
const std::optional<request_param>& req_param) {
auto exclude_nodes = parse_ignore_nodes(req_param);
if (auto replaced_node = parse_replaced_node(req_param)) {
exclude_nodes.insert(replaced_node);
}
if (req && *req == topology_request::remove) {
exclude_nodes.insert(id);
}
return exclude_nodes;
}
std::optional<request_param> topology::get_request_param(raft::server_id id) const {
auto rit = req_param.find(id);
if (rit != req_param.end()) {
return rit->second;
}
return std::nullopt;
};
std::set<sstring> calculate_not_yet_enabled_features(const std::set<sstring>& enabled_features, const auto& supported_features) {
std::set<sstring> to_enable;
bool first = true;

5
service/topology_state_machine.hh
View File

@@ -177,6 +177,11 @@ struct topology {
// Returns false iff we can safely start a new topology change.
bool is_busy() const;
std::optional<request_param> get_request_param(raft::server_id) const;
static raft::server_id parse_replaced_node(const std::optional<request_param>&);
static std::unordered_set<raft::server_id> parse_ignore_nodes(const std::optional<request_param>&);
static std::unordered_set<raft::server_id> get_excluded_nodes(raft::server_id id, const std::optional<topology_request>& req, const std::optional<request_param>& req_param);
// Calculates a set of features that are supported by all normal nodes but not yet enabled.
std::set<sstring> calculate_not_yet_enabled_features() const;
};