Skip to content
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

Jump to bottom

feat: Integrate the bugfixes of Redis 7.2.5 #567

Closed
wants to merge 7 commits into from
Closed

feat: Integrate the bugfixes of Redis 7.2.5 #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2de3a42
When one shard, sole primary node marks potentially failed replica as…
bentotten Jan 11, 2024
9fdf32c
Prevent LSET command from causing quicklist plain node size to exceed…
sundb Feb 6, 2024
181c1c8
Fix blocking commands timeout is reset due to re-processing command (…
enjoy-binbin Jan 30, 2024
913e3fb
Fix conversion of numbers in lua args to redis args (#13115)
mdouglass Mar 10, 2024
87be9b4
Fix redis-cli --count (for --scan, --bigkeys, etc) was ignored unless…
LiiNen Feb 28, 2024
a462fe1
Fix redis-check-aof incorrectly considering data in manifest format a…
enjoy-binbin Mar 12, 2024
f7d0c13
fix: redis check aof -> valkey check aof
SoulPancake May 29, 2024
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
4 changes: 3 additions & 1 deletion src/aof.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ aofInfo *aofInfoDup(aofInfo *orig) {
return ai;
}

/* Format aofInfo as a string and it will be a line in the manifest. */
/* Format aofInfo as a string and it will be a line in the manifest.
*
* When update this format, make sure to update redis-check-aof as well. */
sds aofInfoFormat(sds buf, aofInfo *ai) {
sds filename_repr = NULL;

Expand Down
8 changes: 6 additions & 2 deletions src/blocked.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,12 @@ void blockForKeys(client *c, int btype, robj **keys, int numkeys, mstime_t timeo
list *l;
int j;

c->bstate.timeout = timeout;
if (!(c->flags & CLIENT_REPROCESSING_COMMAND)) {
/* If the client is re-processing the command, we do not set the timeout
* because we need to retain the client's original timeout. */
c->bstate.timeout = timeout;
}

for (j = 0; j < numkeys; j++) {
/* If the key already exists in the dictionary ignore it. */
if (!(client_blocked_entry = dictAddRaw(c->bstate.keys,keys[j],NULL))) {
Expand All @@ -392,7 +397,6 @@ void blockForKeys(client *c, int btype, robj **keys, int numkeys, mstime_t timeo
listAddNodeTail(l,c);
dictSetVal(c->bstate.keys,client_blocked_entry,listLast(l));


/* We need to add the key to blocking_keys_unblock_on_nokey, if the client
* wants to be awakened if key is deleted (like XREADGROUP) */
if (unblock_on_nokey) {
Expand Down
Loading
Loading