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

roachtest: deflake autoupgrade #99479

Closed
wants to merge 1 commit into from
Closed

roachtest: deflake autoupgrade #99479

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
5 changes: 4 additions & 1 deletion pkg/cmd/roachtest/tests/autoupgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ func registerAutoUpgrade(r registry.Registry) {

clusterVersion := func() (string, error) {
var version string
if err := db.QueryRowContext(ctx, `SHOW CLUSTER SETTING version`).Scan(&version); err != nil {
// NB:`SHOW CLUSTER SETTING version` can block when in the middle of
// migrating and then fail because it has an internal timeout.
// See: https://github.com/cockroachdb/cockroach/issues/99115
if err := db.QueryRowContext(ctx, `SELECT value FROM [SHOW CLUSTER SETTINGS] WHERE variable='version'`).Scan(&version); err != nil {
return "", errors.Wrap(err, "determining cluster version")
}
return version, nil
Expand Down