From f79705094d3936b14ff3d15a0ff71473068a1c41 Mon Sep 17 00:00:00 2001
From: Tobias Grieger <tobias.b.grieger@gmail.com>
Date: Mon, 26 Apr 2021 15:34:44 +0200
Subject: [PATCH] roachtest: tpccbench: ignore error from `c.Reset`

See
https://github.com/cockroachdb/cockroach/issues/61981#issuecomment-826838740.

Release note: None
---
 pkg/cmd/roachtest/tpcc.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/cmd/roachtest/tpcc.go b/pkg/cmd/roachtest/tpcc.go
index f9f65da8ca84..6b5a0cc080a0 100644
--- a/pkg/cmd/roachtest/tpcc.go
+++ b/pkg/cmd/roachtest/tpcc.go
@@ -801,7 +801,10 @@ func runTPCCBench(ctx context.Context, t *test, c *cluster, b tpccBenchSpec) {
 		// of starting warehouses. Do a best-effort at waiting for the cloud VM(s)
 		// to recover without failing the line search.
 		if err := c.Reset(ctx); err != nil {
-			t.Fatal(err)
+			// Reset() can flake sometimes, see for example:
+			// https://github.com/cockroachdb/cockroach/issues/61981#issuecomment-826838740
+			c.l.Printf("failed to reset VMs, proceeding anyway: %s", err)
+			_ = err // intentionally continuing
 		}
 		var ok bool
 		for i := 0; i < 10; i++ {