NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitd71197c

committed

Set different deadlock_timeout on each session in new isolation tests

This provides deterministic deadlock-detection ordering for newisolation tests, fixing the sporadic failures in them.Author: Noah Misch

1 parentbf3c585 commitd71197cCopy full SHA for d71197c

File tree

4 files changed

+10

-10

lines changed

src/test/isolation
- expected
  - fk-deadlock.out
  - fk-deadlock2.out
- specs
  - fk-deadlock.spec
  - fk-deadlock2.spec

4 files changed

+10

-10

lines changed

`‎src/test/isolation/expected/fk-deadlock.out`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ step s1i: INSERT INTO child VALUES (1, 1);`
`32`	`32`	`step s2i: INSERT INTO child VALUES (2, 1);`
`33`	`33`	`step s2u: UPDATE parent SET aux = 'baz'; <waiting ...>`
`34`	`34`	`step s1u: UPDATE parent SET aux = 'bar';`
`35`		`-step s2u: <... completed>`
`36`	`35`	`ERROR: deadlock detected`
	`36`	`+step s2u: <... completed>`
`37`	`37`	`step s2c: COMMIT;`
`38`	`38`	`step s1c: COMMIT;`
`39`	`39`
`@@ -52,8 +52,8 @@ step s2i: INSERT INTO child VALUES (2, 1);`
`52`	`52`	`step s1i: INSERT INTO child VALUES (1, 1);`
`53`	`53`	`step s2u: UPDATE parent SET aux = 'baz'; <waiting ...>`
`54`	`54`	`step s1u: UPDATE parent SET aux = 'bar';`
`55`		`-step s2u: <... completed>`
`56`	`55`	`ERROR: deadlock detected`
	`56`	`+step s2u: <... completed>`
`57`	`57`	`step s2c: COMMIT;`
`58`	`58`	`step s1c: COMMIT;`
`59`	`59`

`‎src/test/isolation/expected/fk-deadlock2.out`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;`
`42`	`42`	`step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`43`	`43`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`44`	`44`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`45`		`-step s2u2: <... completed>`
`46`	`45`	`ERROR: deadlock detected`
	`46`	`+step s2u2: <... completed>`
`47`	`47`	`step s1c: COMMIT;`
`48`	`48`	`step s2c: COMMIT;`
`49`	`49`
`@@ -52,8 +52,8 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;`
`52`	`52`	`step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`53`	`53`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`54`	`54`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`55`		`-step s2u2: <... completed>`
`56`	`55`	`ERROR: deadlock detected`
	`56`	`+step s2u2: <... completed>`
`57`	`57`	`step s2c: COMMIT;`
`58`	`58`	`step s1c: COMMIT;`
`59`	`59`
`@@ -82,8 +82,8 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`82`	`82`	`step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;`
`83`	`83`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`84`	`84`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`85`		`-step s2u2: <... completed>`
`86`	`85`	`ERROR: deadlock detected`
	`86`	`+step s2u2: <... completed>`
`87`	`87`	`step s1c: COMMIT;`
`88`	`88`	`step s2c: COMMIT;`
`89`	`89`
`@@ -92,8 +92,8 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`92`	`92`	`step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;`
`93`	`93`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`94`	`94`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`95`		`-step s2u2: <... completed>`
`96`	`95`	`ERROR: deadlock detected`
	`96`	`+step s2u2: <... completed>`
`97`	`97`	`step s2c: COMMIT;`
`98`	`98`	`step s1c: COMMIT;`
`99`	`99`

`‎src/test/isolation/specs/fk-deadlock.spec`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,13 @@ teardown`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`session"s1"`
`22`		`-setup{BEGIN; }`
	`22`	`+setup{BEGIN;SETdeadlock_timeout='20ms';}`
`23`	`23`	`step"s1i"{INSERTINTOchildVALUES (1,1); }`
`24`	`24`	`step"s1u"{UPDATEparentSETaux='bar'; }`
`25`	`25`	`step"s1c"{COMMIT; }`
`26`	`26`
`27`	`27`	`session"s2"`
`28`		`-setup{BEGIN; }`
	`28`	`+setup{BEGIN;SETdeadlock_timeout='10s';}`
`29`	`29`	`step"s2i"{INSERTINTOchildVALUES (2,1); }`
`30`	`30`	`step"s2u"{UPDATEparentSETaux='baz'; }`
`31`	`31`	`step"s2c"{COMMIT; }`

`‎src/test/isolation/specs/fk-deadlock2.spec`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,13 @@ teardown`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`session"s1"`
`27`		`-setup{BEGIN; }`
	`27`	`+setup{BEGIN;SETdeadlock_timeout='20ms';}`
`28`	`28`	`step"s1u1"{UPDATEASETCol1=1WHEREAID=1; }`
`29`	`29`	`step"s1u2"{UPDATEBSETCol2=1WHEREBID=2; }`
`30`	`30`	`step"s1c"{COMMIT; }`
`31`	`31`
`32`	`32`	`session"s2"`
`33`		`-setup{BEGIN; }`
	`33`	`+setup{BEGIN;SETdeadlock_timeout='10s';}`
`34`	`34`	`step"s2u1"{UPDATEBSETCol2=1WHEREBID=2; }`
`35`	`35`	`step"s2u2"{UPDATEBSETCol2=1WHEREBID=2; }`
`36`	`36`	`step"s2c"{COMMIT; }`

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!

Commitd71197c

File tree

4 files changed

4 files changed

`‎src/test/isolation/expected/fk-deadlock.out`

`‎src/test/isolation/expected/fk-deadlock2.out`

`‎src/test/isolation/specs/fk-deadlock.spec`

`‎src/test/isolation/specs/fk-deadlock2.spec`

0 commit comments