mirror of
http://github.com/valkey-io/valkey
synced 2024-11-22 18:54:58 +00:00
cf61ad14cc
When redis-cli received ASK, it used string matching wrong and didn't handle it. When we access a slot which is in migrating state, it maybe return ASK. After redirect to the new node, we need send ASKING command before retry the command. In this PR after redis-cli receives ASK, we send a ASKING command before send the origin command after reconnecting. Other changes: * Make redis-cli -u and -c (unix socket and cluster mode) incompatible with one another. * When send command fails, we avoid the 2nd reconnect retry and just print the error info. Users will decide how to do next. See #9277. * Add a test faking two redis nodes in TCL to just send ASK and OK in redis protocol to test ASK behavior. Co-authored-by: Viktor Söderqvist <viktor.soderqvist@est.tech> Co-authored-by: Oran Agra <oran@redislabs.com>
59 lines
1.6 KiB
Tcl
59 lines
1.6 KiB
Tcl
# A fake Redis node for replaying predefined/expected traffic with a client.
|
|
#
|
|
# Usage: tclsh fake_redis_node.tcl PORT COMMAND REPLY [ COMMAND REPLY [ ... ] ]
|
|
#
|
|
# Commands are given as space-separated strings, e.g. "GET foo", and replies as
|
|
# RESP-encoded replies minus the trailing \r\n, e.g. "+OK".
|
|
|
|
set port [lindex $argv 0];
|
|
set expected_traffic [lrange $argv 1 end];
|
|
|
|
# Reads and parses a command from a socket and returns it as a space-separated
|
|
# string, e.g. "set foo bar".
|
|
proc read_command {sock} {
|
|
set char [read $sock 1]
|
|
switch $char {
|
|
* {
|
|
set numargs [gets $sock]
|
|
set result {}
|
|
for {set i 0} {$i<$numargs} {incr i} {
|
|
read $sock 1; # dollar sign
|
|
set len [gets $sock]
|
|
set str [read $sock $len]
|
|
gets $sock; # trailing \r\n
|
|
lappend result $str
|
|
}
|
|
return $result
|
|
}
|
|
{} {
|
|
# EOF
|
|
return {}
|
|
}
|
|
default {
|
|
# Non-RESP command
|
|
set rest [gets $sock]
|
|
return "$char$rest"
|
|
}
|
|
}
|
|
}
|
|
|
|
proc accept {sock host port} {
|
|
global expected_traffic
|
|
foreach {expect_cmd reply} $expected_traffic {
|
|
if {[eof $sock]} {break}
|
|
set cmd [read_command $sock]
|
|
if {[string equal -nocase $cmd $expect_cmd]} {
|
|
puts $sock $reply
|
|
flush $sock
|
|
} else {
|
|
puts $sock "-ERR unexpected command $cmd"
|
|
break
|
|
}
|
|
}
|
|
close $sock
|
|
}
|
|
|
|
socket -server accept $port
|
|
after 5000 set done timeout
|
|
vwait done
|