Commit2268e6a

committed

Fix isolation test to be less timing-dependent

I did this by adding another locking process, which makes the other twowait. This way the output should be stable enough.Per buildfarm and Andres FreundDiscussion:https://postgr.es/m/20180103034445.t3utrtrnrevfsghm@alap3.anarazel.de

1 parent9d4649c commit2268e6aCopy full SHA for 2268e6a

File tree

+19

-10

lines changed

src/test/isolation
- expected
  - multiple-cic.out
- specs
  - multiple-cic.spec

+19

-10

lines changed

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`		`-Parsed test spec with2 sessions`
	`1`	`+Parsed test spec with3 sessions`
`2`	`2`
`3`		`-starting permutation: s2l s1i s2i`
	`3`	`+starting permutation: s2l s1i s2i s3u`
	`4`	`+pg_advisory_lock`
	`5`	`+`
	`6`	`+`
`4`	`7`	`step s2l: SELECT pg_advisory_lock(281457);`
`5`	`8`	`pg_advisory_lock`
`6`	`9`
`@@ -11,9 +14,11 @@ step s1i:`
`11`	`14`	`<waiting ...>`
`12`	`15`	`step s2i:`
`13`	`16`	`CREATE INDEX CONCURRENTLY mcic_two_pkey ON mcic_two (id)`
`14`		`-WHERE unlck();`
	`17`	`+WHERE unlck() AND lck_shr(572814);`
	`18`	`+ <waiting ...>`
	`19`	`+step s3u: SELECT unlck();`
	`20`	`+unlck`
`15`	`21`
	`22`	`+t`
`16`	`23`	`step s1i: <... completed>`
`17`		`-s1`
`18`		`-`
`19`		`-`
	`24`	`+step s2i: <... completed>`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,19 @@ session "s1"`
`26`	`26`	`step"s1i"{`
`27`	`27`	`CREATEINDEXCONCURRENTLYmcic_one_pkeyONmcic_one (id)`
`28`	`28`	`WHERElck_shr(281457);`
`29`		`-}`
`30`		`-teardown{SELECTpg_advisory_unlock_all()AS"s1"; }`
	`29`	`+}`
	`30`	`+step"s1u"{SELECTunlck(); }`
`31`	`31`
`32`	`32`
`33`	`33`	`session"s2"`
`34`	`34`	`step"s2l" {SELECTpg_advisory_lock(281457); }`
`35`	`35`	`step"s2i"{`
`36`	`36`	`CREATEINDEXCONCURRENTLYmcic_two_pkeyONmcic_two (id)`
`37`		`-WHEREunlck();`
	`37`	`+WHEREunlck()ANDlck_shr(572814);`
`38`	`38`	`}`
`39`	`39`
`40`		`-permutation"s2l""s1i""s2i"`
	`40`	`+session"s3"`
	`41`	`+setup{SELECTpg_advisory_lock(572814); }`
	`42`	`+step"s3u"{SELECTunlck(); }`
	`43`	`+`
	`44`	`+permutation"s2l""s1i""s2i""s3u"`

Comments

(0)