NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitbbd38af

committed

Remove dependency on error ordering in isolation tests

We now report errors reported by the just-unblocked and unblockingtransactions identically; this should fix relatively common buildfarmfailures reported by animals that are failing the "wrong" session.

1 parent1734992 commitbbd38afCopy full SHA for bbd38af

File tree

8 files changed

+107

-142

lines changed

src/test/isolation

8 files changed

+107

-142

lines changed

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

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ step s2i: INSERT INTO child VALUES (2, 1);`
`23`	`23`	`step s1u: UPDATE parent SET aux = 'bar'; <waiting ...>`
`24`	`24`	`step s2u: UPDATE parent SET aux = 'baz';`
`25`	`25`	`step s1u: <... completed>`
`26`		`-ERROR: deadlock detected`
	`26`	`+error in steps s2u s1u:ERROR: deadlock detected`
`27`	`27`	`step s1c: COMMIT;`
`28`	`28`	`step s2c: COMMIT;`
`29`	`29`
`@@ -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`		`-ERROR: deadlock detected`
`36`	`35`	`step s2u: <... completed>`
	`36`	`+error in steps s1u s2u: ERROR: deadlock detected`
`37`	`37`	`step s2c: COMMIT;`
`38`	`38`	`step s1c: COMMIT;`
`39`	`39`
`@@ -43,7 +43,7 @@ step s1i: INSERT INTO child VALUES (1, 1);`
`43`	`43`	`step s1u: UPDATE parent SET aux = 'bar'; <waiting ...>`
`44`	`44`	`step s2u: UPDATE parent SET aux = 'baz';`
`45`	`45`	`step s1u: <... completed>`
`46`		`-ERROR: deadlock detected`
	`46`	`+error in steps s2u s1u:ERROR: deadlock detected`
`47`	`47`	`step s1c: COMMIT;`
`48`	`48`	`step s2c: COMMIT;`
`49`	`49`
`@@ -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`		`-ERROR: deadlock detected`
`56`	`55`	`step s2u: <... completed>`
	`56`	`+error in steps s1u s2u: ERROR: deadlock detected`
`57`	`57`	`step s2c: COMMIT;`
`58`	`58`	`step s1c: COMMIT;`
`59`	`59`

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

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`23`	`23`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`24`	`24`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`25`	`25`	`step s1u2: <... completed>`
`26`		`-ERROR: deadlock detected`
	`26`	`+error in steps s2u2 s1u2:ERROR: deadlock detected`
`27`	`27`	`step s1c: COMMIT;`
`28`	`28`	`step s2c: COMMIT;`
`29`	`29`
`@@ -33,7 +33,7 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`33`	`33`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`34`	`34`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`35`	`35`	`step s1u2: <... completed>`
`36`		`-ERROR: deadlock detected`
	`36`	`+error in steps s2u2 s1u2:ERROR: deadlock detected`
`37`	`37`	`step s2c: COMMIT;`
`38`	`38`	`step s1c: COMMIT;`
`39`	`39`
`@@ -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`		`-ERROR: deadlock detected`
`46`	`45`	`step s2u2: <... completed>`
	`46`	`+error in steps s1u2 s2u2: ERROR: deadlock detected`
`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`		`-ERROR: deadlock detected`
`56`	`55`	`step s2u2: <... completed>`
	`56`	`+error in steps s1u2 s2u2: ERROR: deadlock detected`
`57`	`57`	`step s2c: COMMIT;`
`58`	`58`	`step s1c: COMMIT;`
`59`	`59`
`@@ -63,7 +63,7 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;`
`63`	`63`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`64`	`64`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`65`	`65`	`step s1u2: <... completed>`
`66`		`-ERROR: deadlock detected`
	`66`	`+error in steps s2u2 s1u2:ERROR: deadlock detected`
`67`	`67`	`step s1c: COMMIT;`
`68`	`68`	`step s2c: COMMIT;`
`69`	`69`
`@@ -73,7 +73,7 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;`
`73`	`73`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`74`	`74`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`75`	`75`	`step s1u2: <... completed>`
`76`		`-ERROR: deadlock detected`
	`76`	`+error in steps s2u2 s1u2:ERROR: deadlock detected`
`77`	`77`	`step s2c: COMMIT;`
`78`	`78`	`step s1c: COMMIT;`
`79`	`79`
`@@ -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`		`-ERROR: deadlock detected`
`86`	`85`	`step s2u2: <... completed>`
	`86`	`+error in steps s1u2 s2u2: ERROR: deadlock detected`
`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`		`-ERROR: deadlock detected`
`96`	`95`	`step s2u2: <... completed>`
	`96`	`+error in steps s1u2 s2u2: ERROR: deadlock detected`
`97`	`97`	`step s2c: COMMIT;`
`98`	`98`	`step s1c: COMMIT;`
`99`	`99`

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

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`14`	`14`	`step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`15`	`15`	`step s1c: COMMIT;`
`16`	`16`	`step s2u1: <... completed>`
`17`		`-ERROR: could not serialize access due to concurrent update`
	`17`	`+error in steps s1c s2u1:ERROR: could not serialize access due to concurrent update`
`18`	`18`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`19`	`19`	`ERROR: current transaction is aborted, commands ignored until end of transaction block`
`20`	`20`	`step s2c: COMMIT;`
`@@ -25,7 +25,7 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`25`	`25`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`26`	`26`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`27`	`27`	`step s1u2: <... completed>`
`28`		`-ERROR: deadlock detected`
	`28`	`+error in steps s2u2 s1u2:ERROR: deadlock detected`
`29`	`29`	`step s1c: COMMIT;`
`30`	`30`	`step s2c: COMMIT;`
`31`	`31`
`@@ -35,7 +35,7 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`35`	`35`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`36`	`36`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`37`	`37`	`step s1u2: <... completed>`
`38`		`-ERROR: deadlock detected`
	`38`	`+error in steps s2u2 s1u2:ERROR: deadlock detected`
`39`	`39`	`step s2c: COMMIT;`
`40`	`40`	`step s1c: COMMIT;`
`41`	`41`
`@@ -44,8 +44,8 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;`
`44`	`44`	`step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`45`	`45`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`46`	`46`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`47`		`-ERROR: deadlock detected`
`48`	`47`	`step s2u2: <... completed>`
	`48`	`+error in steps s1u2 s2u2: ERROR: deadlock detected`
`49`	`49`	`step s1c: COMMIT;`
`50`	`50`	`step s2c: COMMIT;`
`51`	`51`
`@@ -54,8 +54,8 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;`
`54`	`54`	`step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`55`	`55`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`56`	`56`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`57`		`-ERROR: deadlock detected`
`58`	`57`	`step s2u2: <... completed>`
	`58`	`+error in steps s1u2 s2u2: ERROR: deadlock detected`
`59`	`59`	`step s2c: COMMIT;`
`60`	`60`	`step s1c: COMMIT;`
`61`	`61`
`@@ -65,7 +65,7 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;`
`65`	`65`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`66`	`66`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`67`	`67`	`step s1u2: <... completed>`
`68`		`-ERROR: deadlock detected`
	`68`	`+error in steps s2u2 s1u2:ERROR: deadlock detected`
`69`	`69`	`step s1c: COMMIT;`
`70`	`70`	`step s2c: COMMIT;`
`71`	`71`
`@@ -75,7 +75,7 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;`
`75`	`75`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`76`	`76`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`77`	`77`	`step s1u2: <... completed>`
`78`		`-ERROR: deadlock detected`
	`78`	`+error in steps s2u2 s1u2:ERROR: deadlock detected`
`79`	`79`	`step s2c: COMMIT;`
`80`	`80`	`step s1c: COMMIT;`
`81`	`81`
`@@ -84,8 +84,8 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`84`	`84`	`step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;`
`85`	`85`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`86`	`86`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`87`		`-ERROR: deadlock detected`
`88`	`87`	`step s2u2: <... completed>`
	`88`	`+error in steps s1u2 s2u2: ERROR: deadlock detected`
`89`	`89`	`step s1c: COMMIT;`
`90`	`90`	`step s2c: COMMIT;`
`91`	`91`
`@@ -94,8 +94,8 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`94`	`94`	`step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;`
`95`	`95`	`step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>`
`96`	`96`	`step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;`
`97`		`-ERROR: deadlock detected`
`98`	`97`	`step s2u2: <... completed>`
	`98`	`+error in steps s1u2 s2u2: ERROR: deadlock detected`
`99`	`99`	`step s2c: COMMIT;`
`100`	`100`	`step s1c: COMMIT;`
`101`	`101`

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

Lines changed: 0 additions & 110 deletions

This file was deleted.

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

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ step s1u: UPDATE parent SET aux = 'bar';`
`14`	`14`	`step s2i: INSERT INTO child VALUES (2, 1); <waiting ...>`
`15`	`15`	`step s1c: COMMIT;`
`16`	`16`	`step s2i: <... completed>`
`17`		`-ERROR: could not serialize access due to concurrent update`
	`17`	`+error in steps s1c s2i:ERROR: could not serialize access due to concurrent update`
`18`	`18`	`step s2u: UPDATE parent SET aux = 'baz';`
`19`	`19`	`ERROR: current transaction is aborted, commands ignored until end of transaction block`
`20`	`20`	`step s2c: COMMIT;`
`@@ -25,7 +25,7 @@ step s2i: INSERT INTO child VALUES (2, 1);`
`25`	`25`	`step s1u: UPDATE parent SET aux = 'bar'; <waiting ...>`
`26`	`26`	`step s2u: UPDATE parent SET aux = 'baz';`
`27`	`27`	`step s1u: <... completed>`
`28`		`-ERROR: deadlock detected`
	`28`	`+error in steps s2u s1u:ERROR: deadlock detected`
`29`	`29`	`step s1c: COMMIT;`
`30`	`30`	`step s2c: COMMIT;`
`31`	`31`
`@@ -34,8 +34,8 @@ step s1i: INSERT INTO child VALUES (1, 1);`
`34`	`34`	`step s2i: INSERT INTO child VALUES (2, 1);`
`35`	`35`	`step s2u: UPDATE parent SET aux = 'baz'; <waiting ...>`
`36`	`36`	`step s1u: UPDATE parent SET aux = 'bar';`
`37`		`-ERROR: deadlock detected`
`38`	`37`	`step s2u: <... completed>`
	`38`	`+error in steps s1u s2u: ERROR: deadlock detected`
`39`	`39`	`step s2c: COMMIT;`
`40`	`40`	`step s1c: COMMIT;`
`41`	`41`
`@@ -45,7 +45,7 @@ step s1i: INSERT INTO child VALUES (1, 1);`
`45`	`45`	`step s1u: UPDATE parent SET aux = 'bar'; <waiting ...>`
`46`	`46`	`step s2u: UPDATE parent SET aux = 'baz';`
`47`	`47`	`step s1u: <... completed>`
`48`		`-ERROR: deadlock detected`
	`48`	`+error in steps s2u s1u:ERROR: deadlock detected`
`49`	`49`	`step s1c: COMMIT;`
`50`	`50`	`step s2c: COMMIT;`
`51`	`51`
`@@ -54,8 +54,8 @@ step s2i: INSERT INTO child VALUES (2, 1);`
`54`	`54`	`step s1i: INSERT INTO child VALUES (1, 1);`
`55`	`55`	`step s2u: UPDATE parent SET aux = 'baz'; <waiting ...>`
`56`	`56`	`step s1u: UPDATE parent SET aux = 'bar';`
`57`		`-ERROR: deadlock detected`
`58`	`57`	`step s2u: <... completed>`
	`58`	`+error in steps s1u s2u: ERROR: deadlock detected`
`59`	`59`	`step s2c: COMMIT;`
`60`	`60`	`step s1c: COMMIT;`
`61`	`61`
`@@ -65,7 +65,7 @@ step s2u: UPDATE parent SET aux = 'baz';`
`65`	`65`	`step s1i: INSERT INTO child VALUES (1, 1); <waiting ...>`
`66`	`66`	`step s2c: COMMIT;`
`67`	`67`	`step s1i: <... completed>`
`68`		`-ERROR: could not serialize access due to concurrent update`
	`68`	`+error in steps s2c s1i:ERROR: could not serialize access due to concurrent update`
`69`	`69`	`step s1u: UPDATE parent SET aux = 'bar';`
`70`	`70`	`ERROR: current transaction is aborted, commands ignored until end of transaction block`
`71`	`71`	`step s1c: 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!

Commitbbd38af

File tree

8 files changed

8 files changed

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

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

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

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

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

0 commit comments