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

[8.15](backport #5270) Increase watcher in upgrade tests to timeout after 10m #5407

Closed
wants to merge 5 commits into from
Closed

[8.15](backport #5270) Increase watcher in upgrade tests to timeout after 10m #5407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d70c11
Increase watcher in upgrade tests to timeout after 10m (#5270)
michel-laterman Aug 19, 2024
ae98713
Update .agent-versions.json
AndersonQ Sep 3, 2024
137ec41
use main version .agent-versions.json
AndersonQ Sep 3, 2024
f82e039
Update .agent-versions.json
AndersonQ Sep 3, 2024
b18be78
Update .agent-versions.json
AndersonQ Sep 3, 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
7 changes: 3 additions & 4 deletions .agent-versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"testVersions": [
"8.15.0-SNAPSHOT",
"8.14.2",
"8.13.4",
"8.14.4-SNAPSHOT",
"7.17.23-SNAPSHOT",
"7.17.22"
"8.14.3",
"8.15.0-SNAPSHOT",
"7.17.24-SNAPSHOT"
]
}
6 changes: 3 additions & 3 deletions testing/upgradetest/upgrader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,11 @@ func PerformUpgrade(
}

// it is unstable to continue until the watcher is done
// the maximum wait time is 1 minutes (2 minutes for grace) some older versions
// the maximum wait time is 10 minutes (12 minutes for grace) some older versions
// do not respect the `ConfigureFastWatcher` so we have to kill the watcher after the
// 1 minute window (1 min 15 seconds for grace) has passed.
// 10 minute window (10 min 15 seconds for grace) has passed.
logger.Logf("waiting for upgrade watcher to finish")
err = WaitForNoWatcher(ctx, 2*time.Minute, 10*time.Second, 1*time.Minute+15*time.Second)
err = WaitForNoWatcher(ctx, 12*time.Minute, 10*time.Second, 10*time.Minute+15*time.Second)
if err != nil {
return fmt.Errorf("watcher never stopped running: %w", err)
}
Expand Down