From 01cfeb086b076770756b5a9d090cb11308f6c040 Mon Sep 17 00:00:00 2001
From: Yahor Yuzefovich <yahor@cockroachlabs.com>
Date: Tue, 7 Jun 2022 07:37:11 -0700
Subject: [PATCH] roachtest: fix a minor bug with tpch_concurrency roachtest

`tpch_concurrency` pushes the cluster to its limits, so it is expected
that OOMs occur. Previously, in a recently added code path, we would
fail the test if an error occurred when running a debugging statement,
yet that error is expected and should be returned.

Release note: None
---
 pkg/cmd/roachtest/tests/tpch_concurrency.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/cmd/roachtest/tests/tpch_concurrency.go b/pkg/cmd/roachtest/tests/tpch_concurrency.go
index 04d17de297c7..79c2fc8b0d03 100644
--- a/pkg/cmd/roachtest/tests/tpch_concurrency.go
+++ b/pkg/cmd/roachtest/tests/tpch_concurrency.go
@@ -118,7 +118,7 @@ func registerTPCHConcurrency(r registry.Registry) {
 				// diagram of the query.
 				rows, err := conn.Query("EXPLAIN (DISTSQL) " + tpch.QueriesByNumber[queryNum])
 				if err != nil {
-					t.Fatal(err)
+					return err
 				}
 				defer rows.Close()
 				for rows.Next() {