mirror of
https://github.com/hanzoai/kv.git
synced 2026-11-09 16:05:35 +00:00
Same shape as MSETEX: the `-X ours` upstream merge took new files and discarded edits to existing ones, so `clusterscan.json` and the whole 459-line test file landed while `clusterscanCommand` never did. The tests have been in the tree failing since; the spec was parked because it generated a reference to a symbol nobody had written. Recovered the chain in order, because the first commit alone is not correct:b70dbec66CLUSTERSCAN Command (#2934)e64150914MATCH pattern maps to a specific slot (#3380)f63e2ce07range bounded scanning across contiguous slots (#3391) #2934 parses SLOT itself and defers COUNT/MATCH/TYPE to scanGenericCommand — which the cursor-"0" path returns before ever reaching, so `CLUSTERSCAN 0 COUNT 0` answered instead of erroring. #3380 replaces that with parseScanOptionsOrReply up front. Landing only the base would have shipped a known-red test. Held back deliberately:3a7fe2ec7fingerprint from configurable_hash_seed (#3679) It needs getConfigurableHashSeed() from #3366, which this tree does not carry either. clusterscanFingerprint() therefore reads the per-process random hashtableGetHashFunctionSeed(), exactly as upstream did before #3679. Bounded, cluster-only consequence: a cursor restarts at 0 after failover rather than surviving it. The two tests that assert otherwise are removed with a comment naming the dependency, so whoever lands #3366 knows to bring them back in the same change. Also repaired four test files the rebrand missed — they called `valkey_cluster` / `valkey_deferring_client{,_by_addr}` when the procs are defined as `kv_*`, so unit/cluster/resharding and two moduleapi suites died with `invalid command name` before running a single test. And `clusterscan` was missing from cluster.tcl's routable-command list, which is a different error with the same cause. Tests: unit/cluster/clusterscan 19/19. Regression over scan, expire, keyspace, hash, set, zset, incr, list — 238 ok, 0 failures (#3391 rewrites scanGenericCommand's cursor handling, so those are the suites that matter). Co-authored-by: Hanzo Dev <[email protected]>
180 lines
6.8 KiB
Tcl
180 lines
6.8 KiB
Tcl
# Resharding test.
|
|
# In this test a live resharding is performed and the test checks
|
|
# that certain properties are preserved across the operation.
|
|
tags {"slow valgrind:skip"} {
|
|
run_solo {cluster-resharding} {
|
|
start_cluster 5 5 {tags {external:skip cluster}} {
|
|
test "Enable AOF in all the instances" {
|
|
for {set id 0} {$id < [llength $::servers]} {incr id} {
|
|
R $id config set appendonly yes
|
|
# We use "appendfsync no" because it's fast but also guarantees that
|
|
# write(2) is performed before replying to client.
|
|
R $id config set appendfsync no
|
|
}
|
|
|
|
for {set id 0} {$id < [llength $::servers]} {incr id} {
|
|
wait_for_condition 1000 500 {
|
|
[s [expr -1*$id] aof_rewrite_in_progress] == 0 &&
|
|
[s [expr -1*$id] aof_enabled] == 1
|
|
} else {
|
|
fail "Failed to enable AOF on instance #$id"
|
|
}
|
|
}
|
|
}
|
|
|
|
# Our resharding test performs the following actions:
|
|
#
|
|
# - N commands are sent to the cluster in the course of the test.
|
|
# - Every command selects a random key from key:0 to key:MAX-1.
|
|
# - The operation RPUSH key <randomvalue> is performed.
|
|
# - Tcl remembers into an array all the values pushed to each list.
|
|
# - After N/2 commands, the resharding process is started in background.
|
|
# - The test continues while the resharding is in progress.
|
|
# - At the end of the test, we wait for the resharding process to stop.
|
|
# - Finally the keys are checked to see if they contain the value they should.
|
|
|
|
set numkeys 50000
|
|
set numops 200000
|
|
set start_node_port [srv 0 port]
|
|
set cluster [kv_cluster 127.0.0.1:$start_node_port]
|
|
if {$::tls} {
|
|
# setup a non-TLS cluster client to the TLS cluster
|
|
set plaintext_port [srv 0 pport]
|
|
set cluster_plaintext [kv_cluster 127.0.0.1:$plaintext_port 0]
|
|
puts "Testing TLS cluster on start node 127.0.0.1:$start_node_port, plaintext port $plaintext_port"
|
|
} else {
|
|
set cluster_plaintext $cluster
|
|
puts "Testing using non-TLS cluster"
|
|
}
|
|
catch {unset content}
|
|
array set content {}
|
|
set tribpid {}
|
|
|
|
test "Cluster consistency during live resharding" {
|
|
set ele 0
|
|
for {set j 0} {$j < $numops} {incr j} {
|
|
# Trigger the resharding once we execute half the ops.
|
|
if {$tribpid ne {} &&
|
|
($j % 10000) == 0 &&
|
|
![process_is_alive $tribpid]} {
|
|
set tribpid {}
|
|
}
|
|
|
|
if {$j >= $numops/2 && $tribpid eq {}} {
|
|
puts -nonewline "...Starting resharding..."
|
|
flush stdout
|
|
set target [dict get [cluster_get_myself [randomInt 5]] id]
|
|
set tribpid [lindex [exec \
|
|
$::VALKEY_CLI_BIN --cluster reshard \
|
|
127.0.0.1:[srv 0 port] \
|
|
--cluster-from all \
|
|
--cluster-to $target \
|
|
--cluster-slots 100 \
|
|
--cluster-yes \
|
|
{*}[valkeycli_tls_config "./tests"] \
|
|
| [info nameofexecutable] \
|
|
tests/helpers/onlydots.tcl \
|
|
&] 0]
|
|
}
|
|
|
|
# Write random data to random list.
|
|
set listid [randomInt $numkeys]
|
|
set key "key:$listid"
|
|
incr ele
|
|
# We write both with Lua scripts and with plain commands.
|
|
# This way we are able to stress Lua -> server command invocation
|
|
# as well, that has tests to prevent Lua to write into wrong
|
|
# hash slots.
|
|
# We also use both TLS and plaintext connections.
|
|
if {$listid % 3 == 0} {
|
|
$cluster rpush $key $ele
|
|
} elseif {$listid % 3 == 1} {
|
|
$cluster_plaintext rpush $key $ele
|
|
} else {
|
|
$cluster eval {redis.call("rpush",KEYS[1],ARGV[1])} 1 $key $ele
|
|
}
|
|
lappend content($key) $ele
|
|
|
|
if {($j % 1000) == 0} {
|
|
puts -nonewline W; flush stdout
|
|
}
|
|
}
|
|
|
|
# Wait for the resharding process to end
|
|
wait_for_condition 1000 500 {
|
|
[process_is_alive $tribpid] == 0
|
|
} else {
|
|
fail "Resharding is not terminating after some time."
|
|
}
|
|
wait_for_cluster_propagation
|
|
}
|
|
|
|
test "Verify $numkeys keys for consistency with logical content" {
|
|
# Check that the Cluster content matches our logical content.
|
|
foreach {key value} [array get content] {
|
|
if {[$cluster lrange $key 0 -1] ne $value} {
|
|
fail "Key $key expected to hold '$value' but actual content is [$cluster lrange $key 0 -1]"
|
|
}
|
|
}
|
|
}
|
|
|
|
test "Terminate and restart all the instances" {
|
|
for {set id 0} {$id < [llength $::servers]} {incr id} {
|
|
# Stop AOF so that an initial AOFRW won't prevent the instance from terminating
|
|
R $id config set appendonly no
|
|
R $id bgsave
|
|
wait_for_condition 1000 50 {
|
|
[s [expr -1*$id] rdb_bgsave_in_progress] == 0
|
|
} else {
|
|
fail "bgsave didn't finish for instance #$id"
|
|
}
|
|
restart_server [expr -1*$id] true false
|
|
}
|
|
}
|
|
|
|
test "Cluster should eventually be up again" {
|
|
wait_for_cluster_state ok
|
|
}
|
|
|
|
test "Verify $numkeys keys after the restart" {
|
|
# Check that the Cluster content matches our logical content.
|
|
foreach {key value} [array get content] {
|
|
if {[$cluster lrange $key 0 -1] ne $value} {
|
|
fail "Key $key expected to hold '$value' but actual content is [$cluster lrange $key 0 -1]"
|
|
}
|
|
}
|
|
}
|
|
|
|
test "Disable AOF in all the instances" {
|
|
for {set id 0} {$id < [llength $::servers]} {incr id} {
|
|
R $id config set appendonly no
|
|
}
|
|
}
|
|
|
|
test "Verify slaves consistency" {
|
|
set verified_masters 0
|
|
for {set id 0} {$id < [llength $::servers]} {incr id} {
|
|
set role [R $id role]
|
|
lassign $role myrole myoffset slaves
|
|
if {$myrole eq {slave}} continue
|
|
set masterport [srv [expr -1*$id] port]
|
|
set masterdigest [R $id debug digest]
|
|
for {set sid 0} {$sid < [llength $::servers]} {incr sid} {
|
|
set srole [R $sid role]
|
|
if {[lindex $srole 0] eq {master}} continue
|
|
if {[lindex $srole 2] != $masterport} continue
|
|
wait_for_condition 1000 500 {
|
|
[R $sid debug digest] eq $masterdigest
|
|
} else {
|
|
fail "Master and slave data digest are different"
|
|
}
|
|
incr verified_masters
|
|
}
|
|
}
|
|
assert {$verified_masters >= 5}
|
|
}
|
|
|
|
} ;# start_cluster
|
|
} ;# run_solo
|
|
} ;# tag
|