mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash due to unblock client during slot migration (#13311) 

In #13224, we found a crash during cluster slot migration but don't know
why. So i check all the return C_OK in processCommand to see if we are
missing some duration reset and see this.

This fix is like #12247, when we reject the command, we should reset the
duration. I test it and verify it can fix #13224.

So the reason may because we are using stream block and then during the
slot migration, it got a redirect and then crash the server.

---------

Co-authored-by: debing.sun <debing.sun@redis.com>
This commit is contained in:
gms 2024-06-04 20:16:36 +08:00 committed by GitHub
parent 293a68afdf
commit f36b5a8586
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/server.c
View File

@ -4008,6 +4008,7 @@ int processCommand(client *c) {
flagTransaction(c); flagTransaction(c);
} }
clusterRedirectClient(c,n,c->slot,error_code); clusterRedirectClient(c,n,c->slot,error_code);
c->duration = 0;
c->cmd->rejected_calls++; c->cmd->rejected_calls++;
return C_OK; return C_OK;
} }

27
tests/cluster/tests/15-cluster-slots.tcl
View File

@ -60,6 +60,33 @@ test "slot migration is valid from primary to another primary" {
assert_equal {OK} [$nodeto(link) cluster setslot $slot node $nodeto(id)] assert_equal {OK} [$nodeto(link) cluster setslot $slot node $nodeto(id)]
} }
test "Client unblocks after slot migration from one primary to another" {
set cluster [redis_cluster 127.0.0.1:[get_instance_attrib redis 0 port]]
set key mystream
set slot [$cluster cluster keyslot $key]
array set nodefrom [$cluster masternode_for_slot $slot]
array set nodeto [$cluster masternode_notfor_slot $slot]
# Create a stream group on the source node
$nodefrom(link) XGROUP CREATE $key mygroup $ MKSTREAM
# block another client on xreadgroup
set rd [redis_deferring_client_by_addr $nodefrom(host) $nodefrom(port)]
$rd XREADGROUP GROUP mygroup Alice BLOCK 0 STREAMS $key ">"
wait_for_condition 1000 50 {
[getInfoProperty [$nodefrom(link) info clients] blocked_clients] eq {1}
} else {
fail "client wasn't blocked"
}
# Start slot migration from the source node to the target node.
# Because the `unblock_on_nokey` option of xreadgroup is set to 1, the client
# will be unblocked when the key `mystream` is migrated.
assert_equal {OK} [$nodefrom(link) CLUSTER SETSLOT $slot MIGRATING $nodeto(id)]
assert_equal {OK} [$nodeto(link) CLUSTER SETSLOT $slot IMPORTING $nodefrom(id)]
$nodefrom(link) MIGRATE $nodeto(host) $nodeto(port) $key 0 5000
}
test "slot migration is invalid from primary to replica" { test "slot migration is invalid from primary to replica" {
set cluster [redis_cluster 127.0.0.1:[get_instance_attrib redis 0 port]] set cluster [redis_cluster 127.0.0.1:[get_instance_attrib redis 0 port]]
set key order1 set key order1