Merge #153811

153811: fk_read_committed: set explicit lock wait timeouts r=mw5h a=mw5h

Previously, we enabled locking for serializable inserts in this test without setting a lock timeout. In the event that the pg_sleep() in these race tests completes and the UPDATE/DELETE gets locks before the INSERT runs, the INSERT will wait indefinitely for the locks because the lock_timeout defaults to 0 (no timeout). Because the test itself is waiting for the INSERT to finish, the deadlock between the INSERT and the UPDATE/DELETE is never detected, resulting in the test timing out after a long wait.

This change doesn't prevent the test from failing, but should make what is going on a little more obvious. If the test is failing with any regularity, we should increase the pg_sleep() time, but so far this seems like a rarity.

Informs: #153453
Release note: None

Co-authored-by: Matt White <matt.white@cockroachlabs.com>

Author: craig[bot]

pkg/ccl/logictestccl/testdata/logic_test/fk_read_committed

@@ -135,11 +135,12 @@ statement ok
 SELECT 1;
 
 statement async fk_delete
-WITH sleep AS (SELECT pg_sleep(1)) DELETE FROM parent_150282@parent_150282_i_idx WHERE i = 2;
+WITH sleep AS (SELECT pg_sleep(2)) DELETE FROM parent_150282@parent_150282_i_idx WHERE i = 2;
 
 user testuser
 
 statement ok
+SET lock_timeout = '10s';
 SET enable_implicit_fk_locking_for_serializable = on;
 SET enable_shared_locking_for_serializable = on;
 SET enable_durable_locking_for_serializable = on;
@@ -174,11 +175,12 @@ statement ok
 SELECT 1;
 
 statement async fk_update
-WITH sleep AS (SELECT pg_sleep(1)) UPDATE parent_150282 SET p = 4 WHERE i = 2;
+WITH sleep AS (SELECT pg_sleep(2)) UPDATE parent_150282 SET p = 4 WHERE i = 2;
 
 user testuser
 
 statement ok
+SET lock_timeout = '10s';
 SET enable_implicit_fk_locking_for_serializable = on;
 SET enable_shared_locking_for_serializable = on;
 SET enable_durable_locking_for_serializable = on;
@@ -220,11 +222,12 @@ statement ok
 SELECT 1;
 
 statement async fk_delete
-WITH sleep AS (SELECT pg_sleep(1)) DELETE FROM parent_150282 WHERE p = 1;
+WITH sleep AS (SELECT pg_sleep(2)) DELETE FROM parent_150282 WHERE p = 1;
 
 user testuser
 
 statement ok
+SET lock_timeout = '10s';
 SET enable_implicit_fk_locking_for_serializable = on;
 SET enable_shared_locking_for_serializable = on;
 SET enable_durable_locking_for_serializable = on;
@@ -248,6 +251,7 @@ SELECT * FROM child_150282;
 user testuser
 
 statement ok
+RESET lock_timeout;
 RESET enable_implicit_fk_locking_for_serializable;
 RESET enable_shared_locking_for_serializable;
 RESET enable_durable_locking_for_serializable
@@ -373,7 +377,7 @@ user root
 
 # Give the delete a moment to wait on the p=3 lock by testuser2.
 statement ok
-SELECT pg_sleep(1)
+SELECT pg_sleep(2)
 
 # The serializable insert needs this locking to properly sychronize with the
 # read committed delete.
@@ -392,7 +396,7 @@ user testuser
 
 # Give the insert a moment to wait on the p=2 update by testuser.
 statement ok
-SELECT pg_sleep(1)
+SELECT pg_sleep(2)
 
 statement ok
 ROLLBACK
@@ -401,7 +405,7 @@ user testuser2
 
 # Give the insert a moment to lock p=1.
 statement ok
-SELECT pg_sleep(1)
+SELECT pg_sleep(2)
 
 statement ok
 ROLLBACK