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

system_keyspace: De-static get_cdc_generation_id()

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2022-09-15 18:43:31 +03:00
parent 4f67898e7b
commit e221bb0112
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/system_keyspace.cc
View File

@@ -1766,7 +1766,7 @@ future<> system_keyspace::update_cdc_generation_id(cdc::generation_id gen_id) {
}
future<std::optional<cdc::generation_id>> system_keyspace::get_cdc_generation_id() {
auto msg = co_await qctx->execute_cql(
auto msg = co_await execute_cql(
format("SELECT streams_timestamp, uuid FROM system.{} WHERE key = ?", v3::CDC_LOCAL),
sstring(v3::CDC_LOCAL));

2
db/system_keyspace.hh
View File

@@ -416,7 +416,7 @@ public:
* Read the CDC generation ID announced by this node from persistent storage.
* Used to initialize a restarting node.
*/
static future<std::optional<cdc::generation_id>> get_cdc_generation_id();
future<std::optional<cdc::generation_id>> get_cdc_generation_id();
future<bool> cdc_is_rewritten();
future<> cdc_set_rewritten(std::optional<cdc::generation_id_v1>);

4
service/storage_service.cc
View File

@@ -366,7 +366,7 @@ future<> storage_service::join_token_ring(cdc::generation_service& cdc_gen_servi
tmptr->update_topology(get_broadcast_address(), _sys_ks.local().local_dc_rack());
co_await tmptr->update_normal_tokens(my_tokens, get_broadcast_address());
cdc_gen_id = co_await db::system_keyspace::get_cdc_generation_id();
cdc_gen_id = co_await _sys_ks.local().get_cdc_generation_id();
if (!cdc_gen_id) {
// We could not have completed joining if we didn't generate and persist a CDC streams timestamp,
// unless we are restarting after upgrading from non-CDC supported version.
@@ -1842,7 +1842,7 @@ future<> storage_service::start_gossiping() {
co_await ss._gossiper.container().invoke_on_all(&gms::gossiper::start);
bool should_stop_gossiper = false; // undo action
try {
auto cdc_gen_ts = co_await db::system_keyspace::get_cdc_generation_id();
auto cdc_gen_ts = co_await ss._sys_ks.local().get_cdc_generation_id();
if (!cdc_gen_ts) {
cdc_log.warn("CDC generation timestamp missing when starting gossip");
}