From eb59205caff259df316ad8917e0f7ad0a0da82b2 Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@scylladb.com>
Date: Mon, 10 Feb 2025 16:08:38 +0200
Subject: [PATCH] gossiper: drop deprecated unsafe_assassinate_endpoint
 operation

It was always deprecated.
---
 api/api-doc/gossiper.json | 8 --------
 api/gossiper.cc           | 7 +------
 gms/gossiper.cc           | 5 -----
 gms/gossiper.hh           | 2 --
 4 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/api/api-doc/gossiper.json b/api/api-doc/gossiper.json
index 49a73ff17b..54eab08e9b 100644
--- a/api/api-doc/gossiper.json
+++ b/api/api-doc/gossiper.json
@@ -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"
                   }
                ]
             }
diff --git a/api/gossiper.cc b/api/gossiper.cc
index e5fcd2e107..2df0e05cf4 100644
--- a/api/gossiper.cc
+++ b/api/gossiper.cc
@@ -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());
         });
     });
diff --git a/gms/gossiper.cc b/gms/gossiper.cc
index 4ec7f80c3b..2a0e96b6e8 100644
--- a/gms/gossiper.cc
+++ b/gms/gossiper.cc
@@ -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);
diff --git a/gms/gossiper.hh b/gms/gossiper.hh
index 433a4e3f0f..62097f735a 100644
--- a/gms/gossiper.hh
+++ b/gms/gossiper.hh
@@ -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,