Skip to content

Commit

Permalink
[release-17.0] Flakes: skip flaky check that ETA for a VReplication V…
Browse files Browse the repository at this point in the history
…Diff2 Progress command is in the future. (#13804) (#13817)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
  • Loading branch information
vitess-bot[bot] committed Sep 19, 2023
1 parent 4d13c34 commit 2ea0922
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions go/test/endtoend/vreplication/vdiff_helper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,20 @@ func waitForVDiff2ToComplete(t *testing.T, ksWorkflow, cells, uuid string, compl
// The timestamp format allows us to compare them lexicographically.
// We don't test that the ETA always increases as it can decrease based on how
// quickly we're doing work.
if info.Progress.ETA != "" {
// If we're operating at the second boundary then the ETA can be up
// to 1 second in the past due to using second based precision.
loc, _ := time.LoadLocation("UTC")
require.GreaterOrEqual(t, info.Progress.ETA, time.Now().Add(-time.Second).In(loc).Format(vdiff2.TimestampFormat))
}

// Commenting out this check for now as it is quite flaky in Github CI: we sometimes get a difference of
// more than 1s between the ETA and the current time, empirically seen 2s when it has failed,
// but presumably it can be higher. Keeping the code here for now in case we want to re-enable it.

/*
if info.Progress.ETA != "" {
// If we're operating at the second boundary then the ETA can be up
// to 1 second in the past due to using second based precision.
loc, _ := time.LoadLocation("UTC")
require.GreaterOrEqual(t, info.Progress.ETA, time.Now().Add(-time.Second).In(loc).Format(vdiff2.TimestampFormat))
}
*/

if !first {
require.GreaterOrEqual(t, info.Progress.Percentage, previousProgress.Percentage)
}
Expand Down

0 comments on commit 2ea0922

Please sign in to comment.