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

group0_state_id_handler: remove unused group0_server_accessor

Browse Source 
It became unused in the previous commit.

(cherry picked from commit 6b2e003994)
This commit is contained in:
Patryk Jędrzejczak
2025-10-16 18:38:07 +02:00
committed by GitHub Action
parent d727a086c5
commit 8a11535a12
5 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
service/raft/group0_state_id_handler.cc
View File

@@ -18,10 +18,6 @@ namespace service {
static logging::logger slogger("group0_tombstone_gc_handler");
raft::server* group0_server_accessor::get_server() const {
return _raft_gr.find_server(_group0_id);
}
lowres_clock::duration group0_state_id_handler::get_refresh_interval(const replica::database& db) {
return std::chrono::milliseconds{db.get_config().group0_tombstone_gc_refresh_interval_in_ms()};
}
@@ -101,11 +97,10 @@ void group0_state_id_handler::refresh() {
gc_state.update_group0_refresh_time(tombstone_gc_time);
}
group0_state_id_handler::group0_state_id_handler(topology_state_machine& topo_sm, replica::database& local_db, gms::gossiper& gossiper, group0_server_accessor server_accessor)
group0_state_id_handler::group0_state_id_handler(topology_state_machine& topo_sm, replica::database& local_db, gms::gossiper& gossiper)
: _topo_sm(topo_sm)
, _local_db(local_db)
, _gossiper(gossiper)
, _server_accessor(server_accessor)
, _refresh_interval(get_refresh_interval(local_db)) {
}

17
service/raft/group0_state_id_handler.hh
View File

@@ -30,26 +30,11 @@ namespace service {
class raft_group_registry;
class group0_server_accessor {
raft_group_registry& _raft_gr;
raft::group_id _group0_id;
public:
group0_server_accessor(raft_group_registry& raft_gr, raft::group_id group0_id)
: _raft_gr(raft_gr)
, _group0_id(group0_id) {
}
[[nodiscard]] raft::server* get_server() const;
};
class group0_state_id_handler {
topology_state_machine& _topo_sm;
replica::database& _local_db;
gms::gossiper& _gossiper;
group0_server_accessor _server_accessor;
lowres_clock::duration _refresh_interval;
timer<> _timer;
@@ -62,7 +47,7 @@ class group0_state_id_handler {
void refresh();
public:
group0_state_id_handler(topology_state_machine& topo_sm, replica::database& local_db, gms::gossiper& gossiper, group0_server_accessor server_accessor);
group0_state_id_handler(topology_state_machine& topo_sm, replica::database& local_db, gms::gossiper& gossiper);
void run();

4
service/raft/group0_state_machine.cc
View File

@@ -54,12 +54,12 @@ namespace service {
static logging::logger slogger("group0_raft_sm");
group0_state_machine::group0_state_machine(raft_group0_client& client, migration_manager& mm, storage_proxy& sp, storage_service& ss,
group0_server_accessor server_accessor, gms::gossiper& gossiper, gms::feature_service& feat,
gms::gossiper& gossiper, gms::feature_service& feat,
bool topology_change_enabled)
: _client(client), _mm(mm), _sp(sp), _ss(ss)
, _gate("group0_state_machine")
, _topology_change_enabled(topology_change_enabled)
, _state_id_handler(ss._topology_state_machine, sp.local_db(), gossiper, server_accessor)
, _state_id_handler(ss._topology_state_machine, sp.local_db(), gossiper)
, _feature_service(feat)
, _topology_on_raft_support_listener(feat.supports_consistent_topology_changes.when_enabled([this] () noexcept {
// Using features to decide whether to start fetching topology snapshots

2
service/raft/group0_state_machine.hh
View File

@@ -118,7 +118,7 @@ class group0_state_machine : public raft_state_machine {
future<> merge_and_apply(group0_state_machine_merger& merger);
public:
group0_state_machine(raft_group0_client& client, migration_manager& mm, storage_proxy& sp, storage_service& ss,
group0_server_accessor server_accessor, gms::gossiper& gossiper, gms::feature_service& feat, bool topology_change_enabled);
gms::gossiper& gossiper, gms::feature_service& feat, bool topology_change_enabled);
future<> apply(std::vector<raft::command_cref> command) override;
future<raft::snapshot_id> take_snapshot() override;
void drop_snapshot(raft::snapshot_id id) override;

2
service/raft/raft_group0.cc
View File

@@ -243,7 +243,7 @@ const raft::server_id& raft_group0::load_my_id() {
raft_server_for_group raft_group0::create_server_for_group0(raft::group_id gid, raft::server_id my_id, service::storage_service& ss, cql3::query_processor& qp,
service::migration_manager& mm, bool topology_change_enabled) {
auto state_machine = std::make_unique<group0_state_machine>(
_client, mm, qp.proxy(), ss, group0_server_accessor{_raft_gr, gid}, _gossiper, _feat, topology_change_enabled);
_client, mm, qp.proxy(), ss, _gossiper, _feat, topology_change_enabled);
auto rpc = std::make_unique<group0_rpc>(_raft_gr.direct_fd(), *state_machine, _ms.local(), _raft_gr.failure_detector(), gid, my_id);
// Keep a reference to a specific RPC class.
auto& rpc_ref = *rpc;