Skip to content

Commit

Permalink
roachtest: don't swallow relocate/split errors in kv50/rangelookups
Browse files Browse the repository at this point in the history
Before, these errors would cause the context of the load generator to
be canceled, which would result in a "signal killed" error instead of
the real error from the test. This commit fixes that.

Release justification: Testing only.

Release note: None
  • Loading branch information
nvanbenschoten committed Oct 9, 2019
1 parent fad071e commit d14d69f
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions pkg/cmd/roachtest/kv.go
Original file line number Diff line number Diff line change
Expand Up @@ -572,8 +572,10 @@ func registerKVRangeLookups(r *testRegistry) {
m := newMonitor(ctx, c, c.Range(1, nodes))
m.Go(func(ctx context.Context) error {
defer close(doneWorkload)
cmd := fmt.Sprintf("./workload init kv {pgurl:1-%d} --splits=1000", nodes)
c.Run(ctx, c.Node(nodes+1), cmd)
cmd := fmt.Sprintf("./workload init kv --splits=1000 {pgurl:1}")
if err := c.RunE(ctx, c.Node(nodes+1), cmd); err != nil {
return err
}
close(doneInit)
concurrency := ifLocal("", " --concurrency="+fmt.Sprint(nodes*64))
duration := " --duration=" + ifLocal("10s", "10m")
Expand All @@ -584,7 +586,9 @@ func registerKVRangeLookups(r *testRegistry) {
concurrency+duration+readPercent+
" {pgurl:1-%d}", nodes)
start := timeutil.Now()
c.Run(ctx, c.Node(nodes+1), cmd)
if err := c.RunE(ctx, c.Node(nodes+1), cmd); err != nil {
return err
}
end := timeutil.Now()
verifyLookupsPerSec(ctx, c, t, c.Node(1), start, end, maximumRangeLookupsPerSec)
return nil
Expand Down

0 comments on commit d14d69f

Please sign in to comment.