From a7921f71a3c747141344d8604f6a6d7b4cddb2a9 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 20 Mar 2013 13:53:43 -0400 Subject: [PATCH] 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. --- src/test/isolation/expected/timeouts.out | 16 ++++++++-------- src/test/isolation/specs/timeouts.spec | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/test/isolation/expected/timeouts.out b/src/test/isolation/expected/timeouts.out index 13822005a4..ff646279ec 100644 --- 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; 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; 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; 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; 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'; 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'; 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'; 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'; 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 39bcf0cc81..7f821d44d0 100644 --- 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; }