From 7837bc7d5a00a3f521fd9b7078f0d8707736e1a6 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 28 Jul 2023 13:04:04 +0300 Subject: [PATCH] system_keyspace: De-static get_raft_group0_id() The callers are in group0 code that have sys_ks local variable/argument Signed-off-by: Pavel Emelyanov --- db/system_keyspace.hh | 2 +- service/raft/raft_group0.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/system_keyspace.hh b/db/system_keyspace.hh index 69c22bbd4c..7dbb518cfd 100644 --- a/db/system_keyspace.hh +++ b/db/system_keyspace.hh @@ -444,7 +444,7 @@ public: future<> cdc_set_rewritten(std::optional); // Load Raft Group 0 id from scylla.local - static future get_raft_group0_id(); + future get_raft_group0_id(); // Persist Raft Group 0 id. Should be a TIMEUUID. static future<> set_raft_group0_id(utils::UUID id); diff --git a/service/raft/raft_group0.cc b/service/raft/raft_group0.cc index 448f6e42b0..f476eb3d60 100644 --- a/service/raft/raft_group0.cc +++ b/service/raft/raft_group0.cc @@ -394,7 +394,7 @@ future<> raft_group0::join_group0(std::vector seeds, bool as_ assert(this_shard_id() == 0); assert(!joined_group0()); - auto group0_id = raft::group_id{co_await db::system_keyspace::get_raft_group0_id()}; + auto group0_id = raft::group_id{co_await sys_ks.get_raft_group0_id()}; if (group0_id) { // Group 0 ID present means we've already joined group 0 before. co_return co_await start_server_for_group0(group0_id, ss, qp, mm, cdc_gen_service); @@ -560,7 +560,7 @@ future<> raft_group0::setup_group0_if_exist(db::system_keyspace& sys_ks, service co_return; } - auto group0_id = raft::group_id{co_await db::system_keyspace::get_raft_group0_id()}; + auto group0_id = raft::group_id{co_await sys_ks.get_raft_group0_id()}; if (group0_id) { // Group 0 ID is present => we've already joined group 0 earlier. group0_log.info("setup_group0: group 0 ID present. Starting existing Raft server.");