rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-30 11:31:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Increase timeout delays in new timeouts isolation test.

Browse Source 
Buildfarm member friarbird doesn't like this test as-committed, evidently
because it's so slow that the test framework doesn't reliably notice that
the backend is waiting before the timeout goes off.  (This is not totally
surprising, since friarbird builds with -DCLOBBER_CACHE_ALWAYS.)  Increase
the timeout delay from 1 second to 2 in hopes of resolving that problem.
This commit is contained in:
Tom Lane 2013-03-17 23:00:44 -04:00
parent 05f3f9c7b2
commit 4c855750fc
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/isolation/expected/timeouts.out
View File

@ -6,7 +6,7 @@ accountid balance
checking 600
savings 600
step sto: SET statement_timeout = 1000;
step sto: SET statement_timeout = 2000;
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 = 1000;
step lto: SET lock_timeout = 2000;
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 = 1000; SET statement_timeout = 2000;
step lsto: SET lock_timeout = 2000; SET statement_timeout = 3000;
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 = 2000; SET statement_timeout = 1000;
step slto: SET lock_timeout = 3000; SET statement_timeout = 2000;
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 = 1000;
step sto: SET statement_timeout = 2000;
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 = 1000;
step lto: SET lock_timeout = 2000;
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 = 1000; SET statement_timeout = 2000;
step lsto: SET lock_timeout = 2000; SET statement_timeout = 3000;
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 = 2000; SET statement_timeout = 1000;
step slto: SET lock_timeout = 3000; SET statement_timeout = 2000;
step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
step update: <... completed>
ERROR: canceling statement due to statement timeout

8
src/test/isolation/specs/timeouts.spec
View File

@ -19,10 +19,10 @@ teardown { ABORT; }
session "s2"
setup { BEGIN ISOLATION LEVEL READ COMMITTED; }
step "sto" { SET statement_timeout = 1000; }
step "lto" { SET lock_timeout = 1000; }
step "lsto" { SET lock_timeout = 1000; SET statement_timeout = 2000; }
step "slto" { SET lock_timeout = 2000; SET statement_timeout = 1000; }
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 "locktbl" { LOCK TABLE accounts; }
step "update" { DELETE FROM accounts WHERE accountid = 'checking'; }
teardown { ABORT; }