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

system_keyspace: De-static get_raft_group0_id()

Browse Source 
The callers are in group0 code that have sys_ks local variable/argument

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2023-07-28 13:04:04 +03:00
parent 26dd7985a8
commit 7837bc7d5a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/system_keyspace.hh
View File

@@ -444,7 +444,7 @@ public:
future<> cdc_set_rewritten(std::optional<cdc::generation_id_v1>);
// Load Raft Group 0 id from scylla.local
static future<utils::UUID> get_raft_group0_id();
future<utils::UUID> get_raft_group0_id();
// Persist Raft Group 0 id. Should be a TIMEUUID.
static future<> set_raft_group0_id(utils::UUID id);

4
service/raft/raft_group0.cc
View File

@@ -394,7 +394,7 @@ future<> raft_group0::join_group0(std::vector<gms::inet_address> 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.");