NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit997563d

committed

Try to harden insert-conflict-specconflict against autovacuum.

Looks like guaibasaurus had a autovacuum running during thecontroller_print_speculative_locks step (just added in43e0841). Which does indeed seem quite possible.Avoid the problem by only looking for the backends participating inthe test.

1 parentdcdbb5a commit997563dCopy full SHA for 997563d

File tree

2 files changed

+16

-4

lines changed

src/test/isolation
- expected
  - insert-conflict-specconflict.out
- specs
  - insert-conflict-specconflict.spec

2 files changed

+16

-4

lines changed

`‎src/test/isolation/expected/insert-conflict-specconflict.out`

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,10 @@ s1: NOTICE: acquiring advisory lock on 2`
`361`	`361`	`step controller_print_speculative_locks:`
`362`	`362`	`SELECT pa.application_name, locktype, mode, granted`
`363`	`363`	`FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)`
`364`		`- WHERE locktype IN ('speculative token', 'transactionid') AND pa.datname = current_database()`
	`364`	`+ WHERE`
	`365`	`+ locktype IN ('speculative token', 'transactionid')`
	`366`	`+ AND pa.datname = current_database()`
	`367`	`+ AND pa.application_name LIKE 'isolation/insert-conflict-specconflict-s%'`
`365`	`368`	`ORDER BY 1, 2, 3, 4;`
`366`	`369`
`367`	`370`	`application_namelocktype mode granted`
`@@ -380,7 +383,10 @@ step s2_upsert: <... completed>`
`380`	`383`	`step controller_print_speculative_locks:`
`381`	`384`	`SELECT pa.application_name, locktype, mode, granted`
`382`	`385`	`FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)`
`383`		`- WHERE locktype IN ('speculative token', 'transactionid') AND pa.datname = current_database()`
	`386`	`+ WHERE`
	`387`	`+ locktype IN ('speculative token', 'transactionid')`
	`388`	`+ AND pa.datname = current_database()`
	`389`	`+ AND pa.application_name LIKE 'isolation/insert-conflict-specconflict-s%'`
`384`	`390`	`ORDER BY 1, 2, 3, 4;`
`385`	`391`
`386`	`392`	`application_namelocktype mode granted`
`@@ -399,7 +405,10 @@ k1 inserted s2 with conflict update s1`
`399`	`405`	`step controller_print_speculative_locks:`
`400`	`406`	`SELECT pa.application_name, locktype, mode, granted`
`401`	`407`	`FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)`
`402`		`- WHERE locktype IN ('speculative token', 'transactionid') AND pa.datname = current_database()`
	`408`	`+ WHERE`
	`409`	`+ locktype IN ('speculative token', 'transactionid')`
	`410`	`+ AND pa.datname = current_database()`
	`411`	`+ AND pa.application_name LIKE 'isolation/insert-conflict-specconflict-s%'`
`403`	`412`	`ORDER BY 1, 2, 3, 4;`
`404`	`413`
`405`	`414`	`application_namelocktype mode granted`

`‎src/test/isolation/specs/insert-conflict-specconflict.spec`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,10 @@ step "controller_show_count" {SELECT COUNT(*) FROM upserttest; }`
`63`	`63`	`step"controller_print_speculative_locks"{`
`64`	`64`	`SELECTpa.application_name,locktype,mode,granted`
`65`	`65`	`FROMpg_locksplJOINpg_stat_activitypaUSING(pid)`
`66`		`-WHERElocktypeIN('speculative token','transactionid')ANDpa.datname=current_database()`
	`66`	`+WHERE`
	`67`	`+locktypeIN('speculative token','transactionid')`
	`68`	`+ANDpa.datname=current_database()`
	`69`	`+ANDpa.application_nameLIKE'isolation/insert-conflict-specconflict-s%'`
`67`	`70`	`ORDERBY1,2,3,4;`
`68`	`71`	`}`
`69`	`72`

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!

Commit997563d

File tree

2 files changed

2 files changed

`‎src/test/isolation/expected/insert-conflict-specconflict.out`

`‎src/test/isolation/specs/insert-conflict-specconflict.spec`

0 commit comments