From 3e79fc21acbcc88a2627e6f267bef28445ac39c8 Mon Sep 17 00:00:00 2001 From: "gd.zhou" Date: Thu, 29 Jan 2026 14:42:58 +0800 Subject: [PATCH 1/2] [gtid][hotfix] xsync continue error when xsync continue point adjust to psync from (server.repl_mode->from < server.repl_backlog_off) --- deps/xredis-gtid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/xredis-gtid b/deps/xredis-gtid index c450ba710b5..52841a2297b 160000 --- a/deps/xredis-gtid +++ b/deps/xredis-gtid @@ -1 +1 @@ -Subproject commit c450ba710b56145e14c9952f28ad436049a93738 +Subproject commit 52841a2297b0efae5f0175a4dbd7c4b9539d3801 From b5687e77c02decd6bc9589fb19b4aa9112dde633 Mon Sep 17 00:00:00 2001 From: "gd.zhou" Date: Tue, 10 Feb 2026 18:29:19 +0800 Subject: [PATCH 2/2] [feature] set rocksdb db log dir --- src/ctrip_swap_rocks.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ctrip_swap_rocks.c b/src/ctrip_swap_rocks.c index f3237bacece..89637aecb3b 100644 --- a/src/ctrip_swap_rocks.c +++ b/src/ctrip_swap_rocks.c @@ -86,7 +86,7 @@ void serverRocksUnlock(rocks *rocks) { } static int rocksOpen(rocks *rocks) { - char *errs[3] = {NULL}, dir[ROCKS_DIR_MAX_LEN], *err = NULL, longlong_str[20]; + char *errs[3] = {NULL}, dir[ROCKS_DIR_MAX_LEN], log_dir[ROCKS_DIR_MAX_LEN], *err = NULL, longlong_str[20]; rocksdb_block_based_table_options_t *block_opts = NULL; serverAssert(rocks->db_opts == NULL); @@ -255,6 +255,8 @@ static int rocksOpen(rocks *rocks) { rocksdb_options_set_compaction_filter_factory(rocks->cf_opts[META_CF], NULL); snprintf(dir, ROCKS_DIR_MAX_LEN, "%s/%d", ROCKS_DATA, rocks->rocksdb_epoch); + snprintf(log_dir, ROCKS_DIR_MAX_LEN, "%s/logs", ROCKS_DATA); + rocksdb_options_set_db_log_dir(rocks->db_opts, log_dir); rocks->db = rocksdb_open_column_families(rocks->db_opts, dir, CF_COUNT, swap_cf_names, (const rocksdb_options_t *const *)rocks->cf_opts, rocks->cf_handles, errs);