Skip to content

Commit

Permalink
Merge #33011
Browse files Browse the repository at this point in the history
33011: roachtest: don't fail tests based on slow health checker r=petermattis a=tbg

We know there can be a backlog of Raft snapshots at the beginning of the
test. This isn't ideal, but we know about it and have #32046 tracking it.

Closes #32859.

Release note: None

Co-authored-by: Tobias Schottdorf <tobias.schottdorf@gmail.com>
  • Loading branch information
craig[bot] and tbg committed Dec 11, 2018
2 parents 1cd7dcf + 82277af commit e4d576a
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions pkg/cmd/roachtest/restore.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (hc *HealthChecker) Runner(ctx context.Context) (err error) {
}
// TODO(tschottdorf): remove replicate queue failures when the cluster first starts.
// Ditto queue.raftsnapshot.process.failure.
rows, err := db.QueryContext(ctx, `SELECT * FROM crdb_internal.gossip_alerts WHERE description != 'queue.replicate.process.failure' AND description != 'ranges.underreplicated' AND description != 'queue.raftsnapshot.process.failure' ORDER BY node_id ASC, store_id ASC`)
rows, err := db.QueryContext(ctx, `SELECT * FROM crdb_internal.gossip_alerts ORDER BY node_id ASC, store_id ASC`)
_ = db.Close()
if err != nil {
return err
Expand All @@ -134,7 +134,10 @@ func (hc *HealthChecker) Runner(ctx context.Context) (err error) {
}

if elapsed := timeutil.Since(tBegin); elapsed > 10*time.Second {
return errors.Errorf("health check against node %d took %s", nodeIdx, elapsed)
err := errors.Errorf("health check against node %d took %s", nodeIdx, elapsed)
logger.Printf(err.Error() + "\n")
// TODO(tschottdorf): see method comment.
// return err
}
}
}
Expand Down

0 comments on commit e4d576a

Please sign in to comment.