NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commita7921f7

committed

Bump up timeout delays some more in timeouts isolation test.

The buildfarm members using -DCLOBBER_CACHE_ALWAYS still don't like thistest. Some experimentation shows that on my machine, isolationtester'squery to check for "waiting" state takes 2 to 2.5 seconds to bind+executeunder -DCLOBBER_CACHE_ALWAYS. Set the timeouts to 5 seconds to leave someheadroom for possibly-slower buildfarm critters.Really we ought to fix the "waiting" query, which is not only horridlyslow but outright wrong in detail; and then maybe we can back off thesetimeouts. But right now I'm just trying to get the buildfarm green again.

1 parent241139a commita7921f7Copy full SHA for a7921f7

File tree

2 files changed

+12

-12

lines changed

src/test/isolation
- expected
  - timeouts.out
- specs
  - timeouts.spec

2 files changed

+12

-12

lines changed

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

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ accountid balance`
`6`	`6`
`7`	`7`	`checking 600`
`8`	`8`	`savings 600`
`9`		`-step sto: SET statement_timeout =2000;`
	`9`	`+step sto: SET statement_timeout =5000;`
`10`	`10`	`step locktbl: LOCK TABLE accounts; <waiting ...>`
`11`	`11`	`step locktbl: <... completed>`
`12`	`12`	`ERROR: canceling statement due to statement timeout`
`@@ -17,7 +17,7 @@ accountid balance`
`17`	`17`
`18`	`18`	`checking 600`
`19`	`19`	`savings 600`
`20`		`-step lto: SET lock_timeout =2000;`
	`20`	`+step lto: SET lock_timeout =5000;`
`21`	`21`	`step locktbl: LOCK TABLE accounts; <waiting ...>`
`22`	`22`	`step locktbl: <... completed>`
`23`	`23`	`ERROR: canceling statement due to lock timeout`
`@@ -28,7 +28,7 @@ accountid balance`
`28`	`28`
`29`	`29`	`checking 600`
`30`	`30`	`savings 600`
`31`		`-step lsto: SET lock_timeout =2000; SET statement_timeout =3000;`
	`31`	`+step lsto: SET lock_timeout =5000; SET statement_timeout =6000;`
`32`	`32`	`step locktbl: LOCK TABLE accounts; <waiting ...>`
`33`	`33`	`step locktbl: <... completed>`
`34`	`34`	`ERROR: canceling statement due to lock timeout`
`@@ -39,35 +39,35 @@ accountid balance`
`39`	`39`
`40`	`40`	`checking 600`
`41`	`41`	`savings 600`
`42`		`-step slto: SET lock_timeout =3000; SET statement_timeout =2000;`
	`42`	`+step slto: SET lock_timeout =6000; SET statement_timeout =5000;`
`43`	`43`	`step locktbl: LOCK TABLE accounts; <waiting ...>`
`44`	`44`	`step locktbl: <... completed>`
`45`	`45`	`ERROR: canceling statement due to statement timeout`
`46`	`46`
`47`	`47`	`starting permutation: wrtbl sto update`
`48`	`48`	`step wrtbl: UPDATE accounts SET balance = balance + 100;`
`49`		`-step sto: SET statement_timeout =2000;`
	`49`	`+step sto: SET statement_timeout =5000;`
`50`	`50`	`step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>`
`51`	`51`	`step update: <... completed>`
`52`	`52`	`ERROR: canceling statement due to statement timeout`
`53`	`53`
`54`	`54`	`starting permutation: wrtbl lto update`
`55`	`55`	`step wrtbl: UPDATE accounts SET balance = balance + 100;`
`56`		`-step lto: SET lock_timeout =2000;`
	`56`	`+step lto: SET lock_timeout =5000;`
`57`	`57`	`step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>`
`58`	`58`	`step update: <... completed>`
`59`	`59`	`ERROR: canceling statement due to lock timeout`
`60`	`60`
`61`	`61`	`starting permutation: wrtbl lsto update`
`62`	`62`	`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;`
`64`	`64`	`step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>`
`65`	`65`	`step update: <... completed>`
`66`	`66`	`ERROR: canceling statement due to lock timeout`
`67`	`67`
`68`	`68`	`starting permutation: wrtbl slto update`
`69`	`69`	`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;`
`71`	`71`	`step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>`
`72`	`72`	`step update: <... completed>`
`73`	`73`	`ERROR: canceling statement due to statement timeout`

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

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ teardown{ ABORT; }`
`19`	`19`
`20`	`20`	`session"s2"`
`21`	`21`	`setup{BEGINISOLATIONLEVELREADCOMMITTED; }`
`22`		`-step"sto"{SETstatement_timeout=2000; }`
`23`		`-step"lto"{SETlock_timeout=2000; }`
`24`		`-step"lsto"{SETlock_timeout=2000;SETstatement_timeout=3000; }`
`25`		`-step"slto"{SETlock_timeout=3000;SETstatement_timeout=2000; }`
	`22`	`+step"sto"{SETstatement_timeout=5000; }`
	`23`	`+step"lto"{SETlock_timeout=5000; }`
	`24`	`+step"lsto"{SETlock_timeout=5000;SETstatement_timeout=6000; }`
	`25`	`+step"slto"{SETlock_timeout=6000;SETstatement_timeout=5000; }`
`26`	`26`	`step"locktbl"{LOCKTABLEaccounts; }`
`27`	`27`	`step"update"{DELETEFROMaccountsWHEREaccountid='checking'; }`
`28`	`28`	`teardown{ABORT; }`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita7921f7

File tree

2 files changed

2 files changed

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

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

0 commit comments