diff --git a/SWAP-RELEASENOTES b/SWAP-RELEASENOTES index faa40a3254a..843e9a8a75a 100644 --- a/SWAP-RELEASENOTES +++ b/SWAP-RELEASENOTES @@ -1,3 +1,9 @@ +================================================================================ +ror-1.4.12 Released Thu Jul 9 00:00:00 CST 2026 +================================================================================ +* [fix] open RocksDB checkpoint column families in read-only mode to avoid child hang from background compaction. +* [fix] move initStatsSwap after swapThreadsInit so per-thread CPU monitoring starts after the threads are up. + ================================================================================ ror-1.4.11 Released Tue Jun 2 00:00:00 CST 2026 ================================================================================ diff --git a/XREDIS-RELEASENOTES b/XREDIS-RELEASENOTES index 5e7758f5f34..feab7d474d6 100644 --- a/XREDIS-RELEASENOTES +++ b/XREDIS-RELEASENOTES @@ -1,3 +1,8 @@ +================================================================================ +xredis-2.2.5 Released Thu Jul 9 00:00:00 CST 2026 +================================================================================ +* [feat] add GTID gap log to track and replay transactions missed during master-replica disconnects. + ================================================================================ xredis-2.2.4 Released Thu Apr 9 00:00:00 CST 2026 ================================================================================ diff --git a/deps/xredis-gtid b/deps/xredis-gtid index 9b562529d9c..d3d3fe6669a 160000 --- a/deps/xredis-gtid +++ b/deps/xredis-gtid @@ -1 +1 @@ -Subproject commit 9b562529d9cdda5c10b17cda7e7335ac430af09e +Subproject commit d3d3fe6669a21c5b1613b41e5d054de64f55d0b6 diff --git a/redis.conf b/redis.conf index 3d03fd4de2e..2fdef8c912f 100644 --- a/redis.conf +++ b/redis.conf @@ -650,7 +650,7 @@ repl-disable-tcp-nodelay no # # A value of 0 means to never release the backlog. # -# repl-backlog-ttl 3600 +# repl-backlog-ttl 10800 # The replica priority is an integer number published by Redis in the INFO # output. It is used by Redis Sentinel in order to select a replica to promote diff --git a/ror.conf b/ror.conf index 754bc9ef75a..210a0e5caf5 100644 --- a/ror.conf +++ b/ror.conf @@ -654,7 +654,7 @@ repl-disable-tcp-nodelay no # # A value of 0 means to never release the backlog. # -# repl-backlog-ttl 3600 +# repl-backlog-ttl 10800 # The replica priority is an integer number published by Redis in the INFO # output. It is used by Redis Sentinel in order to select a replica to promote diff --git a/src/config.c b/src/config.c index 4cd79e15641..d72b31e7bfc 100644 --- a/src/config.c +++ b/src/config.c @@ -3185,7 +3185,7 @@ standardConfig configs[] = { #endif /* Other configs */ - createTimeTConfig("repl-backlog-ttl", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.repl_backlog_time_limit, 60*60, INTEGER_CONFIG, NULL, NULL), /* Default: 1 hour */ + createTimeTConfig("repl-backlog-ttl", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.repl_backlog_time_limit, 60*60*3, INTEGER_CONFIG, NULL, NULL), /* Default: 1 hour */ createOffTConfig("auto-aof-rewrite-min-size", NULL, MODIFIABLE_CONFIG, 0, LLONG_MAX, server.aof_rewrite_min_size, 64*1024*1024, MEMORY_CONFIG, NULL, NULL), /* ctrip configs */ diff --git a/src/ctrip.h b/src/ctrip.h index 56a5b478f7f..74e398774cb 100644 --- a/src/ctrip.h +++ b/src/ctrip.h @@ -8,7 +8,7 @@ #ifndef SRC_CTRIP_H_ #define SRC_CTRIP_H_ -#define XREDIS_VERSION "2.2.4" +#define XREDIS_VERSION "2.2.5" #define CONFIG_DEFAULT_SLAVE_REPLICATE_ALL 0 void xslaveofCommand(client *c); diff --git a/src/version.h b/src/version.h index 5758c356adb..aabd4d66358 100644 --- a/src/version.h +++ b/src/version.h @@ -1,3 +1,3 @@ #define REDIS_VERSION "6.2.6" #define REDIS_VERSION_NUM 0x00060206 -#define SWAP_VERSION "1.4.11" +#define SWAP_VERSION "1.4.12"