From 8f2d7fc413012a7be48668ae4bcb41f9dbe23ad3 Mon Sep 17 00:00:00 2001
From: Rebecca Taft <becca@cockroachlabs.com>
Date: Mon, 21 Sep 2020 07:32:21 -0500
Subject: [PATCH 1/2] build: increase default TESTTIMEOUT for SQL Race Logic
 Tests

This commit increases the test timeout to 1 hour, since the tests
have been failing by timing out after 30 minutes. We may need
to increase the timeout further, but this is a start.

Release note: None
---
 build/teamcity-testlogicrace.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/teamcity-testlogicrace.sh b/build/teamcity-testlogicrace.sh
index 841f3bea7874..d1c98b3df65a 100755
--- a/build/teamcity-testlogicrace.sh
+++ b/build/teamcity-testlogicrace.sh
@@ -8,11 +8,14 @@ maybe_ccache
 
 mkdir -p artifacts
 
+TESTTIMEOUT=2h
+
 run_json_test build/builder.sh \
   stdbuf -oL -eL \
   make testrace \
   GOTESTFLAGS=-json \
   PKG=./pkg/sql/logictest \
+  TESTTIMEOUT="${TESTTIMEOUT}" \
   TESTFLAGS='-v' \
   ENABLE_ROCKSDB_ASSERTIONS=1
 
@@ -25,6 +28,7 @@ run_json_test build/builder.sh \
   GOTESTFLAGS=-json \
   PKG=./pkg/sql/logictest \
   TESTS='^TestLogic/local$$' \
+  TESTTIMEOUT="${TESTTIMEOUT}" \
   TESTFLAGS='-optimizer-cost-perturbation=0.9 -v' \
   ENABLE_ROCKSDB_ASSERTIONS=1
 
@@ -43,9 +47,10 @@ for file in $LOGICTESTS; do
         run_json_test build/builder.sh \
           stdbuf -oL -eL \
           make testrace \
-    GOTESTFLAGS=-json \
+          GOTESTFLAGS=-json \
           PKG=./pkg/sql/logictest \
           TESTS='^TestLogic/local/'${file}'$$' \
+          TESTTIMEOUT="${TESTTIMEOUT}" \
           TESTFLAGS='-disable-opt-rule-probability=0.5 -v' \
           ENABLE_ROCKSDB_ASSERTIONS=1 \
     fi

From 5842a73ae4f007326dbe79c0d9ef4e4d465848f7 Mon Sep 17 00:00:00 2001
From: Rebecca Taft <becca@cockroachlabs.com>
Date: Wed, 23 Sep 2020 08:24:41 -0500
Subject: [PATCH 2/2] build: bump timeout for SQL Race Logic tests to 4 hours

The test is still timing out after 2 hours, so this commit bumps the
timeout to 4 hours.

Release note: None
---
 build/teamcity-testlogicrace.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/teamcity-testlogicrace.sh b/build/teamcity-testlogicrace.sh
index d1c98b3df65a..ce4de6ba387c 100755
--- a/build/teamcity-testlogicrace.sh
+++ b/build/teamcity-testlogicrace.sh
@@ -8,7 +8,7 @@ maybe_ccache
 
 mkdir -p artifacts
 
-TESTTIMEOUT=2h
+TESTTIMEOUT=4h
 
 run_json_test build/builder.sh \
   stdbuf -oL -eL \