mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-29 11:10:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage_service: Remove _removing_node

Browse Source 
This optional is always disengaged

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2022-07-29 09:36:51 +03:00
parent 4d08554a92
commit c8f9d1237f
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
service/storage_service.cc
View File

@@ -2929,8 +2929,7 @@ future<> storage_service::send_replication_notification(inet_address remote) {
future<> storage_service::confirm_replication(inet_address node) {
return run_with_no_api_lock([node] (storage_service& ss) {
auto removing_node = bool(ss._removing_node) ? format("{}", *ss._removing_node) : "NONE";
slogger.info("Got confirm_replication from {}, removing_node {}", node, removing_node);
slogger.info("Got confirm_replication from {}", node);
});
}
@@ -3242,15 +3241,7 @@ future<> storage_service::isolate() {
future<sstring> storage_service::get_removal_status() {
return run_with_no_api_lock([] (storage_service& ss) {
if (!ss._removing_node) {
return make_ready_future<sstring>(sstring("No token removals in process."));
}
auto tokens = ss.get_token_metadata().get_tokens(*ss._removing_node);
if (tokens.empty()) {
return make_ready_future<sstring>(sstring("Node has no token"));
}
auto status = format("Removing token ({}).", tokens.front());
return make_ready_future<sstring>(status);
return make_ready_future<sstring>(sstring("No token removals in process."));
});
}
@@ -3290,7 +3281,6 @@ future<> storage_service::force_remove_completion() {
assert(ss._group0);
co_await ss._group0->remove_from_group0(endpoint);
}
ss._removing_node = std::nullopt;
} else {
slogger.warn("No tokens to force removal on, call 'removenode' first");
}

5
service/storage_service.hh
View File

@@ -261,11 +261,6 @@ private:
public:
std::chrono::milliseconds get_ring_delay();
private:
std::optional<inet_address> _removing_node;
public:
enum class mode { NONE, STARTING, JOINING, BOOTSTRAP, NORMAL, LEAVING, DECOMMISSIONED, MOVING, DRAINING, DRAINED };
private:
mode _operation_mode = mode::NONE;