Skip to content

[tdd] update xredis-gtid: gaplog ring buffer interface + impl #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiongtubao merged 2 commits into from
Aug 6, 2026
+14 −5
Merged

[tdd] update xredis-gtid: gaplog ring buffer interface + impl #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
753b339
[tdd] update xredis-gtid: gaplog ring buffer interface + impl
Jul 20, 2026
bf5d367
[update] gtid-xsync-max-gap config default 10000->60000
Aug 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/xredis-gtid
Open in desktop
Submodule xredis-gtid updated 12 files
+1 −1 Makefile
+0 −173 gtid_skiplist.c
+0 −695 gtid_test.c
+0 −63 include/gtid.h
+14 −10 xredis/tests/gtid/gaplog.tcl
+81 −198 xredis/tests/gtid/gaplog_commands.tcl
+24 −16 xredis/tests/gtid/gaplog_write_commands.tcl
+2 −2 xredis/tests/gtid/xsync.tcl
+25 −15 xredis/tests/support/gtid.tcl
+56 −61 xredis/xredis_gtid.c
+25 −34 xredis/xredis_gtid.h
+212 −587 xredis/xredis_gtid_gap_log.c
2 changes: 1 addition & 1 deletion redis.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2063,4 +2063,4 @@ jemalloc-bg-thread yes
gtid-enabled no

# If master & slave gtid gap is less than max-gap, xsync will continue.
# gtid-xsync-max-gap 10000
# gtid-xsync-max-gap 60000
2 changes: 1 addition & 1 deletion ror.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2548,5 +2548,5 @@ rocksdb.ratelimiter.rate_per_sec 1024mb
gtid-enabled no

# If master & slave gtid gap is less than max-gap, xsync will continue.
# gtid-xsync-max-gap 10000
# gtid-xsync-max-gap 60000

11 changes: 10 additions & 1 deletion src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2470,6 +2470,15 @@ static int updateMaxmemory(long long val, long long prev, const char **err) {
}
return 1;
}

static int updateGtidXsyncMaxGap(long long val, long long prev, const char **err) {;
UNUSED(err);
if (val != prev) {
gtidGaplogResetDataSize(server.gtid_gap_log, val);
}
return 1;
}

#ifdef ENABLE_SWAP
static int updateSwapAbsentCacheCapacity(long long val, long long prev, const char **err) {
UNUSED(prev);
Expand Down Expand Up @@ -3166,7 +3175,7 @@ standardConfig configs[] = {
createULongLongConfig("swap-sst-age-limit-refresh-period", NULL, MODIFIABLE_CONFIG, 1, 3600*24, server.swap_sst_age_limit_refresh_period, 60, INTEGER_CONFIG, NULL, NULL),
createULongLongConfig("swap-swap-info-slave-period", NULL, MODIFIABLE_CONFIG, 1, 3600*24, server.swap_swap_info_slave_period, 60, INTEGER_CONFIG, NULL, NULL),
#endif
createULongLongConfig("gtid-xsync-max-gap", NULL, MODIFIABLE_CONFIG, 0, ULLONG_MAX, server.gtid_xsync_max_gap, 10000, INTEGER_CONFIG, NULL, NULL),
createULongLongConfig("gtid-xsync-max-gap", NULL, MODIFIABLE_CONFIG, 0, ULLONG_MAX, server.gtid_xsync_max_gap, 60000, INTEGER_CONFIG, NULL, updateGtidXsyncMaxGap),

/* Size_t configs */
createSizeTConfig("hash-max-ziplist-entries", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.hash_max_ziplist_entries, 512, INTEGER_CONFIG, NULL, NULL),
Expand Down
2 changes: 1 addition & 1 deletion src/server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3521,7 +3521,7 @@ void initServer(void) {
server.gtid_lost = gtidSetNew();
xsyncUuidInterestedInit();
gtidInitialInfoInit(server.gtid_initial);
server.gtid_gap_log = gtidGaplogNew();
server.gtid_gap_log = gtidGaplogNew(server.gtid_xsync_max_gap);
server.gtid_xsync_fullresync_indicator = 0;
server.gtid_executed_cmd_count = 0;
server.gtid_ignored_cmd_count = 0;
Expand Down
Loading