Merge pull request #135370 from cockroachdb/blathers/backport-release…

…-24.2-133922 release-24.2: testccl: ignore timeout error for decode_plan_gist in TestExplainGist (#135370) Co-Authored-By: Drew Kimball <[email protected]>
cockroachdb · Nov 16, 2024 · c427c81 · c427c81
2 parents e475d04 + 5dd9ed5
commit c427c81
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/pkg/ccl/testccl/sqlccl/explain_test.go b/pkg/ccl/testccl/sqlccl/explain_test.go
@@ -255,9 +255,11 @@ func TestExplainGist(t *testing.T) {
 			}
 			_, err = sqlDB.Exec("SELECT crdb_internal.decode_plan_gist($1);", gist)
 			if err != nil {
-				// We might be still in the process of cancelling the previous
-				// DROP operation - ignore this particular error.
-				if !testutils.IsError(err, "descriptor is being dropped") {
+				// We might be still in the process of cancelling the previous DROP
+				// operation or hit the statement timeout - ignore this particular
+				// error.
+				if !testutils.IsError(err, "descriptor is being dropped") &&
+					!sqltestutils.IsClientSideQueryCanceledErr(err) {
 					t.Fatal(err)
 				}
 				continue