mirror of
https://github.com/scylladb/scylladb.git
synced 2026-05-12 19:02:12 +00:00
gossiper: drop deprecated unsafe_assassinate_endpoint operation
It was always deprecated.
This commit is contained in:
@@ -136,14 +136,6 @@
|
||||
"allowMultiple":false,
|
||||
"type":"string",
|
||||
"paramType":"path"
|
||||
},
|
||||
{
|
||||
"name":"unsafe",
|
||||
"description":"Set to True to perform an unsafe assassination",
|
||||
"required":false,
|
||||
"allowMultiple":false,
|
||||
"type":"boolean",
|
||||
"paramType":"query"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -53,12 +53,7 @@ void set_gossiper(http_context& ctx, routes& r, gms::gossiper& g) {
|
||||
});
|
||||
|
||||
httpd::gossiper_json::assassinate_endpoint.set(r, [&g](std::unique_ptr<http::request> req) {
|
||||
if (req->get_query_param("unsafe") != "True") {
|
||||
return g.assassinate_endpoint(req->get_path_param("addr")).then([] {
|
||||
return make_ready_future<json::json_return_type>(json_void());
|
||||
});
|
||||
}
|
||||
return g.unsafe_assassinate_endpoint(req->get_path_param("addr")).then([] {
|
||||
return g.assassinate_endpoint(req->get_path_param("addr")).then([] {
|
||||
return make_ready_future<json::json_return_type>(json_void());
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1369,11 +1369,6 @@ future<> gossiper::advertise_token_removed(inet_address endpoint, locator::host_
|
||||
co_await sleep_abortable(INTERVAL * 2, _abort_source);
|
||||
}
|
||||
|
||||
future<> gossiper::unsafe_assassinate_endpoint(sstring address) {
|
||||
logger.warn("Gossiper.unsafeAssassinateEndpoint is deprecated and will be removed in the next release; use assassinate_endpoint instead");
|
||||
return assassinate_endpoint(address);
|
||||
}
|
||||
|
||||
future<> gossiper::assassinate_endpoint(sstring address) {
|
||||
co_await container().invoke_on(0, [&] (auto&& gossiper) -> future<> {
|
||||
inet_address endpoint(address);
|
||||
|
||||
@@ -382,8 +382,6 @@ public:
|
||||
*/
|
||||
future<> advertise_token_removed(inet_address endpoint, locator::host_id host_id, permit_id);
|
||||
|
||||
future<> unsafe_assassinate_endpoint(sstring address);
|
||||
|
||||
/**
|
||||
* Do not call this method unless you know what you are doing.
|
||||
* It will try extremely hard to obliterate any endpoint from the ring,
|
||||
|
||||
Reference in New Issue
Block a user