From 4b9c0077b98cc5434aee74cad06917abbdaee136 Mon Sep 17 00:00:00 2001
From: Yahor Yuzefovich <yahor@cockroachlabs.com>
Date: Thu, 20 Nov 2025 17:10:20 -0800
Subject: [PATCH] sql: skip external process under deadlock in
 TestShowLastQueryStatistics

If we have external-process test tenant and run under the deadlock
config, sometimes we can exceed 1s limit on planning latency. This
behavior seems somewhat expected, so let's just skip the
external-process config (which was enabled recently).

Release note: None
---
 pkg/sql/conn_executor_test.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkg/sql/conn_executor_test.go b/pkg/sql/conn_executor_test.go
index 04000a229ba4..3e1e83deb2c9 100644
--- a/pkg/sql/conn_executor_test.go
+++ b/pkg/sql/conn_executor_test.go
@@ -1408,8 +1408,15 @@ func TestShowLastQueryStatistics(t *testing.T) {
 	skip.UnderRace(t, "measure planning latency which is slower than usual under race")
 
 	ctx := context.Background()
-	params := base.TestServerArgs{}
-	s, sqlConn, _ := serverutils.StartServer(t, params)
+	var testTenant base.DefaultTestTenantOptions
+	if syncutil.DeadlockEnabled {
+		// Under deadlock, the planning latency in the external process mode can
+		// sometimes exceed 1s allowed limit.
+		testTenant = base.TestSkipForExternalProcessMode()
+	}
+	s, sqlConn, _ := serverutils.StartServer(t, base.TestServerArgs{
+		DefaultTestTenant: testTenant,
+	})
 	defer s.Stopper().Stop(ctx)
 
 	testCases := []struct {