Skip to content

Commit

Permalink
roachtest: fix upgrade test
Browse files Browse the repository at this point in the history
This is the same fix as cockroachdb#28472, but for a different test. Use a `quit`
command line that is compatible with 2.0. This was accidentally broken
in cockroachdb#28373.

Fixes cockroachdb#28452

Release note: None
  • Loading branch information
petermattis committed Aug 11, 2018
1 parent 9024a9c commit defb8cc
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions pkg/cmd/roachtest/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ func registerUpgrade(r *registry) {

stop := func(node int) error {
port := fmt.Sprintf("{pgport:%d}", node)
if err := c.RunE(ctx, c.Node(node), "./cockroach quit --insecure --host=:"+port); err != nil {
// Note that the following command line needs to run against both v2.0
// and the current branch. Do not change it in a manner that is
// incompatible with 2.0.
if err := c.RunE(ctx, c.Node(node), "./cockroach quit --insecure --port="+port); err != nil {
return err
}
c.Stop(ctx, c.Node(node))
Expand All @@ -95,7 +98,10 @@ func registerUpgrade(r *registry) {

decommissionAndStop := func(node int) error {
port := fmt.Sprintf("{pgport:%d}", node)
if err := c.RunE(ctx, c.Node(node), "./cockroach quit --decommission --insecure --host=:"+port); err != nil {
// Note that the following command line needs to run against both v2.0
// and the current branch. Do not change it in a manner that is
// incompatible with 2.0.
if err := c.RunE(ctx, c.Node(node), "./cockroach quit --decommission --insecure --port="+port); err != nil {
return err
}
c.Stop(ctx, c.Node(node))
Expand Down

0 comments on commit defb8cc

Please sign in to comment.