Merge cockroachdb#72426

72426: roachtest: add ctx timeout in multitenant-upgrade r=[erikgrinaker,stevendanna] a=tbg This would have turned the timeout in cockroachdb#72420 into a faster failure. Release note: None Co-authored-by: Tobias Grieger <[email protected]>
healthy-pod · Nov 4, 2021 · f84b8e7 · f84b8e7
2 parents a058a02 + 1545843
commit f84b8e7
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pkg/cmd/roachtest/tests/multitenant_upgrade.go b/pkg/cmd/roachtest/tests/multitenant_upgrade.go
@@ -126,6 +126,8 @@ func (tn *tenantNode) start(ctx context.Context, t test.Test, c cluster.Cluster,
 			return err
 		}
 		defer db.Close()
+		ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second)
+		defer cancel()
 		_, err = db.ExecContext(ctx, `SELECT 1`)
 		return err
 	}); err != nil {