Skip to content

Commit c934b2b

Browse files
[release-16.0] Flakes: skip flaky check that ETA for a VReplication VDiff2 Progress command is in the future. (#13804) (#13816)
Signed-off-by: Rohit Nayak <rohit@planetscale.com> Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
1 parent 73fa4d6 commit c934b2b

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

go/test/endtoend/vreplication/vdiff_helper_test.go

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,20 @@ func waitForVDiff2ToComplete(t *testing.T, ksWorkflow, cells, uuid string, compl
110110
// The timestamp format allows us to compare them lexicographically.
111111
// We don't test that the ETA always increases as it can decrease based on how
112112
// quickly we're doing work.
113-
if info.Progress.ETA != "" {
114-
// If we're operating at the second boundary then the ETA can be up
115-
// to 1 second in the past due to using second based precision.
116-
loc, _ := time.LoadLocation("UTC")
117-
require.GreaterOrEqual(t, info.Progress.ETA, time.Now().Add(-time.Second).In(loc).Format(vdiff2.TimestampFormat))
118-
}
113+
114+
// Commenting out this check for now as it is quite flaky in Github CI: we sometimes get a difference of
115+
// more than 1s between the ETA and the current time, empirically seen 2s when it has failed,
116+
// but presumably it can be higher. Keeping the code here for now in case we want to re-enable it.
117+
118+
/*
119+
if info.Progress.ETA != "" {
120+
// If we're operating at the second boundary then the ETA can be up
121+
// to 1 second in the past due to using second based precision.
122+
loc, _ := time.LoadLocation("UTC")
123+
require.GreaterOrEqual(t, info.Progress.ETA, time.Now().Add(-time.Second).In(loc).Format(vdiff2.TimestampFormat))
124+
}
125+
*/
126+
119127
if !first {
120128
require.GreaterOrEqual(t, info.Progress.Percentage, previousProgress.Percentage)
121129
}

0 commit comments

Comments
 (0)