Skip to content
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

Flaky test TestOnlineDDLVDiff: add additional check for vreplication workflow to exist #15695

Merged
merged 2 commits into from
Apr 11, 2024
Merged

Flaky test TestOnlineDDLVDiff: add additional check for vreplication workflow to exist #15695

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7bf863
Add additional check for vreplication workflow to be created. Otherwi…
rohit-nayak-ps Apr 11, 2024
231c812
fix lint error
shlomi-noach Apr 11, 2024
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
10 changes: 10 additions & 0 deletions go/test/endtoend/vreplication/helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,16 @@
assert.Equalf(t, count0, count1, "query %q executed in target;\ntried to match %q\nbefore:\n%s\n\nafter:\n%s\n\n", query, matchQuery, body0, body1)
}

func waitForWorkflowToBeCreated(t *testing.T, vc *VitessCluster, ksWorkflow string) {
require.NoError(t, waitForCondition("workflow to be created", func() bool {
_, err := vc.VtctlClient.ExecuteCommandWithOutput("Workflow", ksWorkflow, "show")
if err == nil {

Check failure on line 353 in go/test/endtoend/vreplication/helper_test.go

View workflow job for this annotation

GitHub Actions / Static Code Checks Etc 

S1008: should use 'return err == nil' instead of 'if err == nil { return true }; return false' (gosimple)
return true
}
return false
}, defaultTimeout))
}

// waitForWorkflowState waits for all of the given workflow's
// streams to reach the provided state. You can pass optional
// key value pairs of the form "key==value" to also wait for
Expand Down
4 changes: 3 additions & 1 deletion go/test/endtoend/vreplication/vdiff_online_ddl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ func execOnlineDDL(t *testing.T, strategy, keyspace, query string) string {
return false
}, defaultTimeout)
require.NoError(t, err)

// The online ddl migration is set to SchemaMigration_RUNNING before it creates the
// _vt.vreplication records. Hence wait for the vreplication workflow to be created as well.
waitForWorkflowToBeCreated(t, vc, fmt.Sprintf("%s.%s", keyspace, uuid))
}
return uuid
}
Expand Down
Loading