upstream/redis
1
0
Fork 0
mirror of https://github.com/redis/redis.git synced 2026-06-09 00:33:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Address review feedback: use pre-computed hash tags and simplify test

Browse source 
- Use pre-computed hash tags instead of key:$s:a which doesn't guarantee
  slot mapping, selecting tag by verifying target slot in master0's range
- Reduce key count from 100 to 5 (rebalance default pipeline is 10)
- Remove redundant assert_no_match "*CROSS*SLOT*"

Co-Authored-By: Claude Opus 4.7 <noreply@owtffssent.com>
This commit is contained in:
2030XiaoGe 2026-05-28 12:31:39 +08:00 committed by liuxiao12
parent 3f47ba2dd4
commit 267330392f
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
tests/unit/cluster/cli.tcl
View file

@ -16,19 +16,31 @@ proc write_keys_to_master0 {} {
break
}
}
set count 0
# Build a list of slots owned by master0
set valid_slots {}
foreach range $slot_ranges {
set parts [split $range "-"]
set start [lindex $parts 0]
set end [lindex $parts 1]
if {$end eq ""} {set end $start}
for {set s $start} {$s <= $end} {incr s} {
exec src/redis-cli -c -p [srv 0 port] SET "key:$s:a" "value:$s"
exec src/redis-cli -c -p [srv 0 port] SET "key:$s:b" "value:$s"
incr count 2
if {$count >= 100} break
set s [lindex $parts 0]
set e [lindex $parts 1]
if {$s eq ""} continue
if {$e eq ""} {set e $s}
for {set i $s} {$i <= $e} {incr i} {
lappend valid_slots $i
}
if {$count >= 100} break
}
# Pre-computed hash tags and their target slots
# {Qi}->1, {450}->5462, {YY}->16379, {wu}->16380,
# {0TG}->16381, {4oi}->16382, {6ZJ}->16383
set tag ""
foreach {t slt} {{Qi} 1 {450} 5462 {YY} 16379 {wu} 16380 {0TG} 16381 {4oi} 16382 {6ZJ} 16383} {
if {[lsearch -exact $valid_slots $slt] >= 0} {
set tag $t
break
}
}
if {$tag eq ""} {error "Cannot find a suitable hash tag for master0's slots"}
for {set i 0} {$i < 5} {incr i} {
exec src/redis-cli -c -p [srv 0 port] SET "$tag:key:$i" "value:$i"
}
}
@ -396,7 +408,6 @@ start_multiple_servers 6 [list overrides $base_conf] {
--cluster-timeout 10000
} e
assert_no_match "*CROSSSLOT*" $e
assert_no_match "*CROSS*SLOT*" $e
}
} ;# stop servers
@ -451,7 +462,6 @@ start_multiple_servers 6 [list overrides $base_conf] {
--cluster-timeout 10000
} e
assert_no_match "*CROSSSLOT*" $e
assert_no_match "*CROSS*SLOT*" $e
}
} ;# stop servers
@ -506,7 +516,6 @@ start_multiple_servers 6 [list overrides $base_conf] {
--cluster-timeout 10000
} e
assert_no_match "*CROSSSLOT*" $e
assert_no_match "*CROSS*SLOT*" $e
}
} ;# stop servers