Skip to content

Commit

Permalink
Merge #38515
Browse files Browse the repository at this point in the history
38515: roachtest: improve worker status in decommission test r=andreimatei a=andreimatei

Touches #38501

Release note: None

Co-authored-by: Andrei Matei <andrei@cockroachlabs.com>
  • Loading branch information
craig[bot] and andreimatei committed Jul 8, 2019
2 parents 78bcb5a + 0dc1f8a commit a9dd587
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkg/cmd/roachtest/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,15 @@ func registerUpgrade(r *testRegistry) {
}

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

0 comments on commit a9dd587

Please sign in to comment.