NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc04c767

committed

Rethink blocking annotations in detach-partition-concurrently-[34].

In741d7f1, I tried to make the reports from canceled steps come outafter the pg_cancel_backend() steps, since that was the most commonordering before. However, that doesn't ensure that a canceled stepdoesn't report even later, as shown in a recent failure on buildfarmmember idiacanthus. Rather than complicating things even more withadditional annotations, let's just force the cancel's effect to bereported first. It's not *that* unnatural-looking.Back-patch to v14 where these test cases appeared.Report:https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=idiacanthus&dt=2021-07-02%2001%3A40%3A04

1 parentf025f23 commitc04c767Copy full SHA for c04c767

File tree

4 files changed

+143

-117

lines changed

src/test/isolation
- expected
  - detach-partition-concurrently-3.out
  - detach-partition-concurrently-4.out
- specs
  - detach-partition-concurrently-3.spec
  - detach-partition-concurrently-4.spec

4 files changed

+143

-117

lines changed

`‎src/test/isolation/expected/detach-partition-concurrently-3.out`

Lines changed: 72 additions & 54 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,15 @@ a`
`10`	`10`	`(1 row)`
`11`	`11`
`12`	`12`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`13`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`13`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`14`	`+step s2detach: <... completed>`
	`15`	`+ERROR: canceling statement due to user request`
	`16`	`+step s1cancel: <... completed>`
`14`	`17`	`pg_cancel_backend`
`15`	`18`	`-----------------`
`16`	`19`	`t`
`17`	`20`	`(1 row)`
`18`	`21`
`19`		`-step s2detach: <... completed>`
`20`		`-ERROR: canceling statement due to user request`
`21`	`22`	`step s1c: COMMIT;`
`22`	`23`	`step s1describe: SELECT 'd3_listp' AS root, * FROM pg_partition_tree('d3_listp')`
`23`	`24`	`UNION ALL SELECT 'd3_listp1', * FROM pg_partition_tree('d3_listp1');`
`@@ -41,14 +42,15 @@ a`
`41`	`42`	`(1 row)`
`42`	`43`
`43`	`44`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`44`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`45`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`46`	`+step s2detach: <... completed>`
	`47`	`+ERROR: canceling statement due to user request`
	`48`	`+step s1cancel: <... completed>`
`45`	`49`	`pg_cancel_backend`
`46`	`50`	`-----------------`
`47`	`51`	`t`
`48`	`52`	`(1 row)`
`49`	`53`
`50`		`-step s2detach: <... completed>`
`51`		`-ERROR: canceling statement due to user request`
`52`	`54`	`step s1insert: INSERT INTO d3_listp VALUES (1);`
`53`	`55`	`ERROR: no partition of relation "d3_listp" found for row`
`54`	`56`	`step s1c: COMMIT;`
`@@ -63,14 +65,15 @@ a`
`63`	`65`	`(1 row)`
`64`	`66`
`65`	`67`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`66`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`68`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`69`	`+step s2detach: <... completed>`
	`70`	`+ERROR: canceling statement due to user request`
	`71`	`+step s1cancel: <... completed>`
`67`	`72`	`pg_cancel_backend`
`68`	`73`	`-----------------`
`69`	`74`	`t`
`70`	`75`	`(1 row)`
`71`	`76`
`72`		`-step s2detach: <... completed>`
`73`		`-ERROR: canceling statement due to user request`
`74`	`77`	`step s1insert: INSERT INTO d3_listp VALUES (1);`
`75`	`78`	`step s1c: COMMIT;`
`76`	`79`	`step s1spart: SELECT * FROM d3_listp1;`
`@@ -91,14 +94,15 @@ a`
`91`	`94`	`(1 row)`
`92`	`95`
`93`	`96`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`94`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`97`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`98`	`+step s2detach: <... completed>`
	`99`	`+ERROR: canceling statement due to user request`
	`100`	`+step s1cancel: <... completed>`
`95`	`101`	`pg_cancel_backend`
`96`	`102`	`-----------------`
`97`	`103`	`t`
`98`	`104`	`(1 row)`
`99`	`105`
`100`		`-step s2detach: <... completed>`
`101`		`-ERROR: canceling statement due to user request`
`102`	`106`	`step s1c: COMMIT;`
`103`	`107`	`step s1insertpart: INSERT INTO d3_listp1 VALUES (1);`
`104`	`108`
`@@ -112,14 +116,15 @@ a`
`112`	`116`	`(1 row)`
`113`	`117`
`114`	`118`	`step s2detach2: ALTER TABLE d3_listp DETACH PARTITION d3_listp2 CONCURRENTLY; <waiting ...>`
`115`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`119`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`120`	`+step s2detach2: <... completed>`
	`121`	`+ERROR: canceling statement due to user request`
	`122`	`+step s1cancel: <... completed>`
`116`	`123`	`pg_cancel_backend`
`117`	`124`	`-----------------`
`118`	`125`	`t`
`119`	`126`	`(1 row)`
`120`	`127`
`121`		`-step s2detach2: <... completed>`
`122`		`-ERROR: canceling statement due to user request`
`123`	`128`	`step s1c: COMMIT;`
`124`	`129`	`step s1brr: BEGIN ISOLATION LEVEL REPEATABLE READ;`
`125`	`130`	`step s1insert: INSERT INTO d3_listp VALUES (1);`
`@@ -143,14 +148,15 @@ a`
`143`	`148`	`(1 row)`
`144`	`149`
`145`	`150`	`step s2detach2: ALTER TABLE d3_listp DETACH PARTITION d3_listp2 CONCURRENTLY; <waiting ...>`
`146`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`151`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`152`	`+step s2detach2: <... completed>`
	`153`	`+ERROR: canceling statement due to user request`
	`154`	`+step s1cancel: <... completed>`
`147`	`155`	`pg_cancel_backend`
`148`	`156`	`-----------------`
`149`	`157`	`t`
`150`	`158`	`(1 row)`
`151`	`159`
`152`		`-step s2detach2: <... completed>`
`153`		`-ERROR: canceling statement due to user request`
`154`	`160`	`step s1c: COMMIT;`
`155`	`161`	`step s1brr: BEGIN ISOLATION LEVEL REPEATABLE READ;`
`156`	`162`	`step s1s: SELECT * FROM d3_listp;`
`@@ -179,14 +185,15 @@ a`
`179`	`185`	`(1 row)`
`180`	`186`
`181`	`187`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`182`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`188`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`189`	`+step s2detach: <... completed>`
	`190`	`+ERROR: canceling statement due to user request`
	`191`	`+step s1cancel: <... completed>`
`183`	`192`	`pg_cancel_backend`
`184`	`193`	`-----------------`
`185`	`194`	`t`
`186`	`195`	`(1 row)`
`187`	`196`
`188`		`-step s2detach: <... completed>`
`189`		`-ERROR: canceling statement due to user request`
`190`	`197`	`step s1c: COMMIT;`
`191`	`198`	`step s1drop: DROP TABLE d3_listp;`
`192`	`199`	`step s1list: SELECT relname FROM pg_catalog.pg_class`
`@@ -206,14 +213,15 @@ a`
`206`	`213`	`(1 row)`
`207`	`214`
`208`	`215`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`209`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`216`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`217`	`+step s2detach: <... completed>`
	`218`	`+ERROR: canceling statement due to user request`
	`219`	`+step s1cancel: <... completed>`
`210`	`220`	`pg_cancel_backend`
`211`	`221`	`-----------------`
`212`	`222`	`t`
`213`	`223`	`(1 row)`
`214`	`224`
`215`		`-step s2detach: <... completed>`
`216`		`-ERROR: canceling statement due to user request`
`217`	`225`	`step s1c: COMMIT;`
`218`	`226`	`step s1trunc: TRUNCATE TABLE d3_listp;`
`219`	`227`	`step s1spart: SELECT * FROM d3_listp1;`
`@@ -233,14 +241,15 @@ a`
`233`	`241`	`(1 row)`
`234`	`242`
`235`	`243`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`236`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`244`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`245`	`+step s2detach: <... completed>`
	`246`	`+ERROR: canceling statement due to user request`
	`247`	`+step s1cancel: <... completed>`
`237`	`248`	`pg_cancel_backend`
`238`	`249`	`-----------------`
`239`	`250`	`t`
`240`	`251`	`(1 row)`
`241`	`252`
`242`		`-step s2detach: <... completed>`
`243`		`-ERROR: canceling statement due to user request`
`244`	`253`	`step s1noop:`
`245`	`254`	`step s2detach2: ALTER TABLE d3_listp DETACH PARTITION d3_listp2 CONCURRENTLY;`
`246`	`255`	`ERROR: partition "d3_listp1" already pending detach in partitioned table "public.d3_listp"`
`@@ -256,14 +265,15 @@ a`
`256`	`265`	`(1 row)`
`257`	`266`
`258`	`267`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`259`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`268`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`269`	`+step s2detach: <... completed>`
	`270`	`+ERROR: canceling statement due to user request`
	`271`	`+step s1cancel: <... completed>`
`260`	`272`	`pg_cancel_backend`
`261`	`273`	`-----------------`
`262`	`274`	`t`
`263`	`275`	`(1 row)`
`264`	`276`
`265`		`-step s2detach: <... completed>`
`266`		`-ERROR: canceling statement due to user request`
`267`	`277`	`step s1noop:`
`268`	`278`	`step s2detachfinal: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 FINALIZE; <waiting ...>`
`269`	`279`	`step s1c: COMMIT;`
`@@ -280,14 +290,15 @@ a`
`280`	`290`	`(1 row)`
`281`	`291`
`282`	`292`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`283`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`293`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`294`	`+step s2detach: <... completed>`
	`295`	`+ERROR: canceling statement due to user request`
	`296`	`+step s1cancel: <... completed>`
`284`	`297`	`pg_cancel_backend`
`285`	`298`	`-----------------`
`286`	`299`	`t`
`287`	`300`	`(1 row)`
`288`	`301`
`289`		`-step s2detach: <... completed>`
`290`		`-ERROR: canceling statement due to user request`
`291`	`302`	`step s1c: COMMIT;`
`292`	`303`	`step s1droppart: DROP TABLE d3_listp1;`
`293`	`304`	`step s2detach2: ALTER TABLE d3_listp DETACH PARTITION d3_listp2 CONCURRENTLY;`
`@@ -302,14 +313,15 @@ a`
`302`	`313`	`(1 row)`
`303`	`314`
`304`	`315`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`305`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`316`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`317`	`+step s2detach: <... completed>`
	`318`	`+ERROR: canceling statement due to user request`
	`319`	`+step s1cancel: <... completed>`
`306`	`320`	`pg_cancel_backend`
`307`	`321`	`-----------------`
`308`	`322`	`t`
`309`	`323`	`(1 row)`
`310`	`324`
`311`		`-step s2detach: <... completed>`
`312`		`-ERROR: canceling statement due to user request`
`313`	`325`	`step s1c: COMMIT;`
`314`	`326`	`step s2begin: BEGIN;`
`315`	`327`	`step s2drop: DROP TABLE d3_listp1;`
`@@ -331,14 +343,15 @@ a`
`331`	`343`	`(1 row)`
`332`	`344`
`333`	`345`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`334`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`346`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`347`	`+step s2detach: <... completed>`
	`348`	`+ERROR: canceling statement due to user request`
	`349`	`+step s1cancel: <... completed>`
`335`	`350`	`pg_cancel_backend`
`336`	`351`	`-----------------`
`337`	`352`	`t`
`338`	`353`	`(1 row)`
`339`	`354`
`340`		`-step s2detach: <... completed>`
`341`		`-ERROR: canceling statement due to user request`
`342`	`355`	`step s1c: COMMIT;`
`343`	`356`	`step s1b: BEGIN;`
`344`	`357`	`step s1spart: SELECT * FROM d3_listp1;`
`@@ -361,14 +374,15 @@ a`
`361`	`374`	`(1 row)`
`362`	`375`
`363`	`376`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`364`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`377`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`378`	`+step s2detach: <... completed>`
	`379`	`+ERROR: canceling statement due to user request`
	`380`	`+step s1cancel: <... completed>`
`365`	`381`	`pg_cancel_backend`
`366`	`382`	`-----------------`
`367`	`383`	`t`
`368`	`384`	`(1 row)`
`369`	`385`
`370`		`-step s2detach: <... completed>`
`371`		`-ERROR: canceling statement due to user request`
`372`	`386`	`step s1c: COMMIT;`
`373`	`387`	`step s1b: BEGIN;`
`374`	`388`	`step s1s: SELECT * FROM d3_listp;`
`@@ -389,14 +403,15 @@ a`
`389`	`403`	`(1 row)`
`390`	`404`
`391`	`405`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`392`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`406`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`407`	`+step s2detach: <... completed>`
	`408`	`+ERROR: canceling statement due to user request`
	`409`	`+step s1cancel: <... completed>`
`393`	`410`	`pg_cancel_backend`
`394`	`411`	`-----------------`
`395`	`412`	`t`
`396`	`413`	`(1 row)`
`397`	`414`
`398`		`-step s2detach: <... completed>`
`399`		`-ERROR: canceling statement due to user request`
`400`	`415`	`step s1c: COMMIT;`
`401`	`416`	`step s1b: BEGIN;`
`402`	`417`	`step s1spart: SELECT * FROM d3_listp1;`
`@@ -419,14 +434,15 @@ a`
`419`	`434`	`(1 row)`
`420`	`435`
`421`	`436`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`422`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`437`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`438`	`+step s2detach: <... completed>`
	`439`	`+ERROR: canceling statement due to user request`
	`440`	`+step s1cancel: <... completed>`
`423`	`441`	`pg_cancel_backend`
`424`	`442`	`-----------------`
`425`	`443`	`t`
`426`	`444`	`(1 row)`
`427`	`445`
`428`		`-step s2detach: <... completed>`
`429`		`-ERROR: canceling statement due to user request`
`430`	`446`	`step s1c: COMMIT;`
`431`	`447`	`step s2begin: BEGIN;`
`432`	`448`	`step s2detachfinal: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 FINALIZE;`
`@@ -442,14 +458,15 @@ a`
`442`	`458`	`(1 row)`
`443`	`459`
`444`	`460`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`445`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`461`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`462`	`+step s2detach: <... completed>`
	`463`	`+ERROR: canceling statement due to user request`
	`464`	`+step s1cancel: <... completed>`
`446`	`465`	`pg_cancel_backend`
`447`	`466`	`-----------------`
`448`	`467`	`t`
`449`	`468`	`(1 row)`
`450`	`469`
`451`		`-step s2detach: <... completed>`
`452`		`-ERROR: canceling statement due to user request`
`453`	`470`	`step s1c: COMMIT;`
`454`	`471`	`step s2begin: BEGIN;`
`455`	`472`	`step s2detachfinal: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 FINALIZE;`
`@@ -472,14 +489,15 @@ a`
`472`	`489`	`(1 row)`
`473`	`490`
`474`	`491`	`step s2detach: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 CONCURRENTLY; <waiting ...>`
`475`		`-step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid;`
	`492`	`+step s1cancel: SELECT pg_cancel_backend(pid) FROM d3_pid; <waiting ...>`
	`493`	`+step s2detach: <... completed>`
	`494`	`+ERROR: canceling statement due to user request`
	`495`	`+step s1cancel: <... completed>`
`476`	`496`	`pg_cancel_backend`
`477`	`497`	`-----------------`
`478`	`498`	`t`
`479`	`499`	`(1 row)`
`480`	`500`
`481`		`-step s2detach: <... completed>`
`482`		`-ERROR: canceling statement due to user request`
`483`	`501`	`step s1c: COMMIT;`
`484`	`502`	`step s2begin: BEGIN;`
`485`	`503`	`step s2detachfinal: ALTER TABLE d3_listp DETACH PARTITION d3_listp1 FINALIZE;`

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!

Commitc04c767

File tree

4 files changed

4 files changed

`‎src/test/isolation/expected/detach-partition-concurrently-3.out`

0 commit comments