8000 Bump up timeout delays some more in timeouts isolation test. · postgrespro/postgres_cluster@a7921f7 · GitHub
[go: up one dir, main page]
Skip to content

Commit a7921f7

Browse files
tglsfdctglsfdc
committed
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.
1 parent 241139a commit a7921f7

File tree

2 files changed

+12
-12
lines changed
  • src/test/isolation
    • < 8000 div class="PRIVATE_TreeView-item-container prc-TreeView-TreeViewItemContainer--2Rkn" style="--level:2">
      expected
  • specs

    • 2 files changed

    +12
    -12
    lines changed

    ‎src/test/isolation/expected/timeouts.out‎

    Lines changed: 8 additions & 8 deletions
    Original file line numberDiff line numberDiff line change
    @@ -6,7 +6,7 @@ accountid balance
    66

    77
    checking 600
    88
    savings 600
    9-
    step sto: SET statement_timeout = 2000;
    9+
    step sto: SET statement_timeout = 5000;
    1010
    step locktbl: LOCK TABLE accounts; <waiting ...>
    1111
    step locktbl: <... completed>
    1212
    ERROR: canceling statement due to statement timeout
    @@ -17,7 +17,7 @@ accountid balance
    1717

    1818
    checking 600
    1919
    savings 600
    20-
    step lto: SET lock_timeout = 2000;
    20+
    step lto: SET lock_timeout = 5000;
    2121
    step locktbl: LOCK TABLE accounts; <waiting ...>
    2222
    step locktbl: <... completed>
    2323
    ERROR: canceling statement due to lock timeout
    @@ -28,7 +28,7 @@ accountid balance
    2828

    2929
    checking 600
    3030
    savings 600
    31-
    step lsto: SET lock_timeout = 2000; SET statement_timeout = 3000;
    31+
    step lsto: SET lock_timeout = 5000; SET statement_timeout = 6000;
    3232
    step locktbl: LOCK TABLE accounts; <waiting ...>
    3333
    step locktbl: <... completed>
    3434
    ERROR: canceling statement due to lock timeout
    @@ -39,35 +39,35 @@ accountid balance
    3939

    4040
    checking 600
    4141
    savings 600
    42-
    step slto: SET lock_timeout = 3000; SET statement_timeout = 2000;
    42+
    step slto: SET lock_timeout = 6000; SET statement_timeout = 5000;
    4343
    step locktbl: LOCK TABLE accounts; <waiting ...>
    4444
    step locktbl: <... completed>
    4545
    ERROR: canceling statement due to statement timeout
    4646

    4747
    starting permutation: wrtbl sto update
    4848
    step wrtbl: UPDATE accounts SET balance = balance + 100;
    49-
    step sto: SET statement_timeout = 2000;
    49+
    step sto: SET statement_timeout = 5000;
    5050
    step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
    5151
    step update: <... completed>
    5252
    ERROR: canceling statement due to statement timeout
    5353

    5454
    starting permutation: wrtbl lto update
    5555
    step wrtbl: UPDATE accounts SET balance = balance + 100;
    56-
    step lto: SET lock_timeout = 2000;
    56+
    step lto: SET lock_timeout = 5000;
    5757
    step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
    5858
    step update: <... completed>
    5959
    ERROR: canceling statement due to lock timeout
    6060

    6161
    starting permutation: wrtbl lsto update
    6262
    step wrtbl: UPDATE accounts SET balance = balance + 100;
    63-
    step lsto: SET lock_timeout = 2000; SET statement_timeout = 3000;
    63+
    step lsto: SET lock_timeout = 5000; SET statement_timeout = 6000;
    6464
    step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
    6565
    step update: <... completed>
    6666
    ERROR: canceling statement due to lock timeout
    6767

    6868
    starting permutation: wrtbl slto update
    6969
    step wrtbl: UPDATE accounts SET balance = balance + 100;
    70-
    step slto: SET lock_timeout = 3000; SET statement_timeout = 2000;
    70+
    step slto: SET lock_timeout = 6000; SET statement_timeout = 5000;
    7171
    step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
    7272
    step update: <... completed>
    7373
    ERROR: canceling statement due to statement timeout

    ‎src/test/isolation/specs/timeouts.spec‎

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -19,10 +19,10 @@ teardown { ABORT; }
    1919

    2020
    session "s2"
    2121
    setup { BEGIN ISOLATION LEVEL READ COMMITTED; }
    22-
    step "sto" { SET statement_timeout = 2000; }
    23-
    step "lto" { SET lock_timeout = 2000; }
    24-
    step "lsto" { SET lock_timeout = 2000; SET statement_timeout = 3000; }
    25-
    step "slto" { SET lock_timeout = 3000; SET statement_timeout = 2000; }
    22+
    step "sto" { SET statement_timeout = 5000; }
    23+
    step "lto" { SET lock_timeout = 5000; }
    24+
    step "lsto" { SET lock_timeout = 5000; SET statement_timeout = 6000; }
    25+
    step "slto" { SET lock_timeout = 6000; SET statement_timeout = 5000; }
    2626
    step "locktbl" { LOCK TABLE accounts; }
    2727
    step "update" { DELETE FROM accounts WHERE accountid = 'checking'; }
    2828
    teardown { ABORT; }

    0 commit comments

    Comments
     (0)
    0