Bump up timeout delays some more in timeouts isolation test.

The buildfarm members using -DCLOBBER_CACHE_ALWAYS still don't like this
test.  Some experimentation shows that on my machine, isolationtester's
query to check for "waiting" state takes 2 to 2.5 seconds to bind+execute
under -DCLOBBER_CACHE_ALWAYS.  Set the timeouts to 5 seconds to leave some
headroom for possibly-slower buildfarm critters.

Really we ought to fix the "waiting" query, which is not only horridly
slow but outright wrong in detail; and then maybe we can back off these
timeouts.  But right now I'm just trying to get the buildfarm green again.

diff --git a/src/test/isolation/expected/timeouts.out b/src/test/isolation/expected/timeouts.out
index 13822005a48fc315588a5f298aa3c80c04d11cd8..ff646279ecb7eeea4482671e872412812ac6cc4c 100644 (file)
--- a/src/test/isolation/expected/timeouts.out
+++ b/src/test/isolation/expected/timeouts.out
@@ -6,7 +6,7 @@ accountid      balance
 
 checking       600            
 savings        600            
-step sto: SET statement_timeout = 2000;
+step sto: SET statement_timeout = 5000;
 step locktbl: LOCK TABLE accounts; <waiting ...>
 step locktbl: <... completed>
 ERROR:  canceling statement due to statement timeout
@@ -17,7 +17,7 @@ accountid      balance
 
 checking       600            
 savings        600            
-step lto: SET lock_timeout = 2000;
+step lto: SET lock_timeout = 5000;
 step locktbl: LOCK TABLE accounts; <waiting ...>
 step locktbl: <... completed>
 ERROR:  canceling statement due to lock timeout
@@ -28,7 +28,7 @@ accountid      balance
 
 checking       600            
 savings        600            
-step lsto: SET lock_timeout = 2000; SET statement_timeout = 3000;
+step lsto: SET lock_timeout = 5000; SET statement_timeout = 6000;
 step locktbl: LOCK TABLE accounts; <waiting ...>
 step locktbl: <... completed>
 ERROR:  canceling statement due to lock timeout
@@ -39,35 +39,35 @@ accountid      balance
 
 checking       600            
 savings        600            
-step slto: SET lock_timeout = 3000; SET statement_timeout = 2000;
+step slto: SET lock_timeout = 6000; SET statement_timeout = 5000;
 step locktbl: LOCK TABLE accounts; <waiting ...>
 step locktbl: <... completed>
 ERROR:  canceling statement due to statement timeout
 
 starting permutation: wrtbl sto update
 step wrtbl: UPDATE accounts SET balance = balance + 100;
-step sto: SET statement_timeout = 2000;
+step sto: SET statement_timeout = 5000;
 step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
 step update: <... completed>
 ERROR:  canceling statement due to statement timeout
 
 starting permutation: wrtbl lto update
 step wrtbl: UPDATE accounts SET balance = balance + 100;
-step lto: SET lock_timeout = 2000;
+step lto: SET lock_timeout = 5000;
 step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
 step update: <... completed>
 ERROR:  canceling statement due to lock timeout
 
 starting permutation: wrtbl lsto update
 step wrtbl: UPDATE accounts SET balance = balance + 100;
-step lsto: SET lock_timeout = 2000; SET statement_timeout = 3000;
+step lsto: SET lock_timeout = 5000; SET statement_timeout = 6000;
 step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
 step update: <... completed>
 ERROR:  canceling statement due to lock timeout
 
 starting permutation: wrtbl slto update
 step wrtbl: UPDATE accounts SET balance = balance + 100;
-step slto: SET lock_timeout = 3000; SET statement_timeout = 2000;
+step slto: SET lock_timeout = 6000; SET statement_timeout = 5000;
 step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
 step update: <... completed>
 ERROR:  canceling statement due to statement timeout

diff --git a/src/test/isolation/specs/timeouts.spec b/src/test/isolation/specs/timeouts.spec
index 39bcf0cc819f79d1adf13ba4c4a6c7c6a7a0be9a..7f821d44d0e62ca475045ca630a3af8d88213b74 100644 (file)
--- a/src/test/isolation/specs/timeouts.spec
+++ b/src/test/isolation/specs/timeouts.spec
@@ -19,10 +19,10 @@ teardown    { ABORT; }
 
 session "s2"
 setup          { BEGIN ISOLATION LEVEL READ COMMITTED; }
-step "sto"     { SET statement_timeout = 2000; }
-step "lto"     { SET lock_timeout = 2000; }
-step "lsto"    { SET lock_timeout = 2000; SET statement_timeout = 3000; }
-step "slto"    { SET lock_timeout = 3000; SET statement_timeout = 2000; }
+step "sto"     { SET statement_timeout = 5000; }
+step "lto"     { SET lock_timeout = 5000; }
+step "lsto"    { SET lock_timeout = 5000; SET statement_timeout = 6000; }
+step "slto"    { SET lock_timeout = 6000; SET statement_timeout = 5000; }
 step "locktbl" { LOCK TABLE accounts; }
 step "update"  { DELETE FROM accounts WHERE accountid = 'checking'; }
 teardown       { ABORT; }