File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -459,13 +459,12 @@ proc wait_for_slot_state {srv_idx pattern} {
459459 }
460460}
461461
462- # Check if server_a knows node_b_id
463- proc server_knows_node {server_a node_b_id} {
464- set nodes [get_cluster_nodes $server_a ]
465- foreach n $nodes {
466- if {[dict get $n id] eq $node_b_id } {
467- return 1
462+ # Returns the test index of a node given its node ID
463+ proc get_node_index_by_id {node_id} {
464+ for {set i 0} {$i < [llength $::servers ]} {incr i} {
465+ if {[R $i CLUSTER MYID] eq $node_id } {
466+ return $i
468467 }
469468 }
470- return 0
469+ return -1 ; # not found
471470}
Original file line number Diff line number Diff line change @@ -295,15 +295,13 @@ test {Migrate the last slot away from a node using valkey-cli} {
295295 set owner_r [valkey $owner_host $owner_port 0 $::tls ]
296296 set owner_id [$owner_r CLUSTER MYID]
297297
298- # Wait until owner node knows the new node
298+ # get the index of the owner node
299+ set owner_index [get_node_index_by_id $owner_id ]
300+
299301 wait_for_condition 1000 50 {
300- set found 0
301- foreach n [get_cluster_nodes $owner_id ] {
302- if {[dict get $n id] eq $newnode_id } { set found 1; break }
303- }
304- $found
302+ [cluster_get_node_by_id $owner_index $newnode_id ] ne {}
305303 } else {
306- fail " Owner node does not know the new node yet "
304+ fail " Owner node never learned the new node"
307305 }
308306
309307 # Move slot to new node using plain commands
You can’t perform that action at this time.
0 commit comments