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: raft topology: drop unused include_local and do_retake parameters from exec_global_command which are always true

Browse Source
This commit is contained in:
Gleb Natapov
2023-09-05 15:37:18 +03:00
parent 7f1aa41e86
commit 897a7e599a
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
service/storage_service.cc
View File

@@ -1090,15 +1090,10 @@ class topology_coordinator {
co_return guard;
}
future<node_to_work_on> exec_global_command(
node_to_work_on&& node, const raft_topology_cmd& cmd, bool include_local,
drop_guard_and_retake do_retake = drop_guard_and_retake::yes) {
future<node_to_work_on> exec_global_command(node_to_work_on&& node, const raft_topology_cmd& cmd) {
std::unordered_set<raft::server_id> exclude_nodes = parse_ignore_nodes(node);
exclude_nodes.insert(parse_replaced_node(node));
if (!include_local) {
exclude_nodes.insert(_raft.id());
}
auto guard = co_await exec_global_command(std::move(node.guard), cmd, exclude_nodes, do_retake);
auto guard = co_await exec_global_command(std::move(node.guard), cmd, exclude_nodes, drop_guard_and_retake::yes);
co_return retake_node(std::move(guard), node.id);
};
@@ -1449,11 +1444,9 @@ class topology_coordinator {
future<node_to_work_on> global_token_metadata_barrier(node_to_work_on&& node) {
node = co_await exec_global_command(std::move(node),
raft_topology_cmd::command::barrier_and_drain,
true);
raft_topology_cmd::command::barrier_and_drain);
node = co_await exec_global_command(std::move(node),
raft_topology_cmd::command::fence,
true);
raft_topology_cmd::command::fence);
co_return std::move(node);
}
@@ -1968,7 +1961,7 @@ class topology_coordinator {
try {
if (node.rs->state == node_state::removing) {
// tell all nodes to stream data of the removed node to new range owners
node = co_await exec_global_command(std::move(node), cmd, true);
node = co_await exec_global_command(std::move(node), cmd);
} else {
// Tell joining/leaving/replacing node to stream its ranges
node = co_await exec_direct_command(std::move(node), cmd);