Skip to content

Deflake slot migration waits by using the suite's 50s bound #4490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KewangZhili wants to merge 1 commit into
base: unstable
Choose a base branch
from
+10 −6
Open

Deflake slot migration waits by using the suite's 50s bound #4490

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions tests/unit/cluster/cluster-migrateslots.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,31 +46,35 @@ proc get_migration_by_name {node_idx name} {
return ""
}

# These three wait on work that completes asynchronously across the cluster, so
# they are bounded by the same 50s the rest of the cluster suite allows for
# cluster-wide conditions rather than by 10s. Raising the bound costs nothing on
# the passing path, where the poll exits as soon as the condition holds.
proc wait_for_migration_field {node_idx jobname field value} {
wait_for_condition 100 100 {
wait_for_condition 500 100 {
[get_migration_by_name $node_idx $jobname] ne "" && [dict get [get_migration_by_name $node_idx $jobname] $field] eq $value
} else {
set curr_state [get_migration_by_name $node_idx $jobname]
fail "Migration $jobname on node $node_idx did not have $field == $value (currently $curr_state) within 10000 ms"
fail "Migration $jobname on node $node_idx did not have $field == $value (currently $curr_state) within 50000 ms"
}
}

proc wait_for_countkeysinslot {node_idx slot value} {
wait_for_condition 100 100 {
wait_for_condition 500 100 {
[R $node_idx CLUSTER COUNTKEYSINSLOT $slot] eq "$value"
} else {
set curr_count [R $node_idx CLUSTER COUNTKEYSINSLOT $slot]
fail "Node $node_idx did not have $value keys in slot $slot within 10000 ms (current $curr_count)"
fail "Node $node_idx did not have $value keys in slot $slot within 50000 ms (current $curr_count)"
}
}

proc wait_for_migration {node_idx slot} {
set target_id [R $node_idx CLUSTER MYID]
wait_for_condition 100 100 {
wait_for_condition 500 100 {
[is_slot_migrated $node_idx $slot]
} else {
set nodes [get_cluster_nodes $node_idx]
fail "Cluster node $target_id did not get slot $slot within 10000 ms (current $nodes)"
fail "Cluster node $target_id did not get slot $slot within 50000 ms (current $nodes)"
}
wait_for_cluster_propagation
}
Expand Down
Loading