Re-read subscription state after lock in AlterSubscription

3 patchsets tracked - current t248715_25

v25t248715_25posted Aug 07, 08:18successwon't retrystale 46dpg 20

base86f7c82cf Sep 08, 20:04 on master

applyapplied Sep 09, 07:30

rebaselast tried Oct 08, 14:43 on 16b94c401

Applying: Re-read subscription state after lock in AlterSubscription
Using index info to reconstruct a base tree...
M	src/backend/commands/subscriptioncmds.c
M	src/test/isolation/isolation_schedule
Falling back to patching base and 3-way merge...
Auto-merging src/test/isolation/isolation_schedule
CONFLICT (content): Merge conflict in src/test/isolation/isolation_schedule
Auto-merging src/backend/commands/subscriptioncmds.c
Patch failed at 0001 Re-read subscription state after lock in AlterSubscription

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

conflicts on master: src/test/isolation/isolation_schedule

pushSep 09, 07:31 -> dc9a62ea9 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1022 / 1022	2m 56s / 5m 37s	`docker run ... :t248715`	Sep 09, 07:46
run 34324251101 executed 1022 - ccache 98 hit / 6523 miss - head dc9a62ea9 - digest sha256:bc6819ba1dbedd... - run 34324251101
success	1	20	1022 / 1022	2m 41s / 4m 33s	`docker run ... @sha256:461f72c...`	Sep 08, 07:40
run 34199547157 executed 1022 - ccache 98 hit / 6523 miss - head 2975029b7 - digest sha256:461f72c5ad8384... - run 34199547157
success	1	20	1026 / 1026	2m 51s / 5m 19s	`docker run ... @sha256:c0a0d53...`	Sep 07, 07:43
run 34095398620 executed 1026 - ccache 98 hit / 6527 miss - head b7abcbabd - digest sha256:c0a0d535751f45... - run 34095398620
success	1	20	1026 / 1026	2m 56s / 5m 44s	`docker run ... @sha256:17c7781...`	Sep 05, 09:32
run 33957728093 executed 1026 - ccache 98 hit / 6527 miss - head dcae44115 - digest sha256:17c7781fd94956... - run 33957728093
success	1	20	1026 / 1026	2m 59s / 5m 23s	`docker run ... @sha256:c85cbc3...`	Sep 04, 09:35
run 33857689263 executed 1026 - ccache 98 hit / 6527 miss - head f66fe1d59 - digest sha256:c85cbc36c2b35e... - run 33857689263
success	1	20	1025 / 1025	2m 53s / 5m 24s	`docker run ... @sha256:0ebe787...`	Sep 03, 09:29
run 33737881792 executed 1025 - ccache 98 hit / 6526 miss - head 47c831ccb - digest sha256:0ebe787df3b75f... - run 33737881792
success	1	20	1024 / 1024	2m 19s / 4m 09s	`docker run ... @sha256:4583f49...`	Sep 02, 09:27
run 33613037058 executed 1024 - ccache 98 hit / 6526 miss - head 05648b50e - digest sha256:4583f49ad5b914... - run 33613037058
success	1	20	1024 / 1024	2m 55s / 5m 16s	`docker run ... @sha256:1eecc00...`	Sep 01, 09:27
run 33491081359 executed 1024 - ccache 98 hit / 6526 miss - head 038cf916f - digest sha256:1eecc005d35f59... - run 33491081359
success	1	20	1024 / 1024	2m 27s / 4m 17s	`docker run ... @sha256:62e00aa...`	Aug 31, 09:03
run 33374826328 executed 1024 - ccache 98 hit / 6526 miss - head 08ca2854e - digest sha256:62e00aa11c18c1... - run 33374826328
success	1	20	1023 / 1023	2m 56s / 5m 23s	`docker run ... @sha256:ece66fc...`	Aug 30, 08:59
run 33302457124 executed 1023 - ccache 98 hit / 6525 miss - head 39084de63 - digest sha256:ece66fc467ce4e... - run 33302457124
success	1	20	1023 / 1023	2m 13s / 4m 39s	`docker run ... @sha256:a05b1a9...`	Aug 29, 08:58
run 33243933730 executed 1023 - ccache 98 hit / 6525 miss - head 298f977bd - digest sha256:a05b1a97b25065... - run 33243933730
success	1	20	1023 / 1023	2m 46s / 4m 47s	`docker run ... @sha256:7d764fb...`	Aug 28, 08:54
run 33156528439 executed 1023 - ccache 98 hit / 6525 miss - head 835716b51 - digest sha256:7d764fb43a601c... - run 33156528439
success	1	20	1023 / 1023	2m 57s / 5m 19s	`docker run ... @sha256:6f11a80...`	Aug 27, 08:51
run 33055060358 executed 1023 - ccache 98 hit / 6525 miss - head b0829834c - digest sha256:6f11a800e4da7f... - run 33055060358
success	1	20	1026 / 1026	2m 51s / 5m 26s	`docker run ... @sha256:a42b890...`	Aug 26, 08:35
run 32947585334 executed 1026 - ccache 98 hit / 6525 miss - head aa9fc3830 - digest sha256:a42b890ddfae6b... - run 32947585334
success	1	20	1026 / 1026	2m 51s / 4m 57s	`docker run ... @sha256:1144fb6...`	Aug 25, 08:34
run 32826380981 executed 1026 - ccache 98 hit / 6525 miss - head 46ffa7495 - digest sha256:1144fb66ec5d63... - run 32826380981
success	1	20	1025 / 1025	2m 55s / 5m 28s	`docker run ... @sha256:07e802e...`	Aug 24, 08:33
run 32705965746 executed 1025 - ccache 98 hit / 6525 miss - head 95d2981e7 - digest sha256:07e802e324703b... - run 32705965746
success	1	20	1025 / 1025	2m 52s / 5m 17s	`docker run ... @sha256:a505a9e...`	Aug 23, 08:31
run 32628000003 executed 1025 - ccache 98 hit / 6525 miss - head 3b33db5c1 - digest sha256:a505a9e0e17f8c... - run 32628000003
success	1	20	1025 / 1025	2m 49s / 5m 15s	`docker run ... @sha256:3e6836d...`	Aug 22, 08:29
run 32561970964 executed 1025 - ccache 98 hit / 6525 miss - head 6177c670c - digest sha256:3e6836d9d5a0c0... - run 32561970964
success	1	20	1025 / 1025	2m 56s / 5m 34s	`docker run ... @sha256:d484611...`	Aug 21, 08:29
run 32462558261 executed 1025 - ccache 98 hit / 6525 miss - head 4e00d58bb - digest sha256:d484611067dfc4... - run 32462558261
success	1	20	1025 / 1025	2m 12s / 4m 26s	`docker run ... @sha256:4da106b...`	Aug 20, 08:25
run 32348016425 executed 1025 - ccache 98 hit / 6525 miss - head 55f46c3d3 - digest sha256:4da106b629f4a6... - run 32348016425
success	1	20	1025 / 1025	2m 56s / 4m 57s	`docker run ... @sha256:ff5be24...`	Aug 19, 08:26
run 32231741290 executed 1025 - ccache 98 hit / 6525 miss - head 6fab20f79 - digest sha256:ff5be24df7de5c... - run 32231741290
success	1	20	1023 / 1023	2m 53s / 5m 12s	`docker run ... @sha256:5ad1bfe...`	Aug 18, 08:26
run 32115354601 executed 1023 - ccache 98 hit / 6524 miss - head 7978b0ae9 - digest sha256:5ad1bfefe2f535... - run 32115354601
success	1	20	1021 / 1021	3m 00s / 5m 28s	`docker run ... @sha256:d62c9f6...`	Aug 17, 08:25
run 32009313904 executed 1021 - ccache 98 hit / 6524 miss - head 9aaf3263a - digest sha256:d62c9f6ec7951f... - run 32009313904
success	1	20	1021 / 1021	2m 47s / 5m 29s	`docker run ... @sha256:a09b77e...`	Aug 16, 08:21
run 31935806795 executed 1021 - ccache 98 hit / 6524 miss - head a3ebbb9ad - digest sha256:a09b77e9172a63... - run 31935806795
success	1	20	1021 / 1021	1m 53s / 4m 02s	`docker run ... @sha256:74ca81c...`	Aug 15, 08:19
run 31873789130 executed 1021 - ccache 98 hit / 6524 miss - head a754d35f3 - digest sha256:74ca81c25730c2... - run 31873789130
success	1	20	1021 / 1021	3m 04s / 5m 39s	`docker run ... @sha256:79f289b...`	Aug 14, 08:20
run 31782698544 executed 1021 - ccache 165 hit / 6457 miss - head 92c5749f0 - digest sha256:79f289b2923cb4... - run 31782698544
success	1	20	1021 / 1021	2m 49s / 5m 26s	`docker run ... @sha256:a1e1dbf...`	Aug 13, 08:18
run 31680639428 executed 1021 - ccache 165 hit / 6457 miss - head d38c49241 - digest sha256:a1e1dbfd2b0045... - run 31680639428
success	1	20	1021 / 1021	2m 56s / 5m 28s	`docker run ... @sha256:1d0f2b2...`	Aug 12, 08:17
run 31576799936 executed 1021 - ccache 165 hit / 6454 miss - head f96d43de0 - digest sha256:1d0f2b2a4daf12... - run 31576799936
success	1	20	1021 / 1021	2m 55s / 5m 34s	`docker run ... @sha256:f273ced...`	Aug 11, 08:16
run 31471567552 executed 1021 - ccache 165 hit / 6453 miss - head d108a9078 - digest sha256:f273ceda4cd4d0... - run 31471567552
success	1	20	1021 / 1021	3m 02s / 5m 07s	`docker run ... @sha256:07f248c...`	Aug 10, 08:03
run 31367599081 executed 1021 - ccache 166 hit / 6452 miss - head f8b79f302 - digest sha256:07f248cba7dfab... - run 31367599081
success	1	20	1021 / 1021	2m 55s / 5m 07s	`docker run ... @sha256:9ea2e14...`	Aug 08, 08:30
run 31248189744 executed 1021 - ccache 166 hit / 6452 miss - head 002c86873 - digest sha256:9ea2e144800002... - run 31248189744
success	1	20	1020 / 1020	2m 47s / 5m 17s	`docker run ... @sha256:e30842d...`	Aug 07, 08:30
run 31161239877 executed 1020 - ccache 166 hit / 6452 miss - head bc43c0c76 - digest sha256:e30842d7c5ef70... - run 31161239877

v22t248715_22posted Aug 04, 05:55successsupersededstale 3mopg 20

base034ff7f94 Aug 05, 02:36 on master

applyapplied Aug 05, 05:56

rebaselast tried Aug 07, 06:18 on bf80a4c2d

Applying: Re-read subscription state after lock in AlterSubscription
Using index info to reconstruct a base tree...
M	src/backend/commands/subscriptioncmds.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/commands/subscriptioncmds.c
CONFLICT (content): Merge conflict in src/backend/commands/subscriptioncmds.c
Patch failed at 0001 Re-read subscription state after lock in AlterSubscription

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

conflicts on master: src/backend/commands/subscriptioncmds.c

pushAug 05, 05:56 -> 802078408 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1018 / 1018	2m 45s / 4m 52s	`docker run ... @sha256:be05e1b...`	Aug 05, 06:06
run 30979692812 executed 1018 - ccache 166 hit / 6452 miss - head 802078408 - digest sha256:be05e1b46fdc57... - run 30979692812
success	1	20	1018 / 1018	2m 55s / 5m 15s	`docker run ... @sha256:6a4acb9...`	Aug 04, 06:07
run 30882267125 executed 1018 - ccache 166 hit / 6452 miss - head c3447dd4c - digest sha256:6a4acb999adce8... - run 30882267125

v18t248715_18posted Jul 06, 05:01successsupersededstale 4mopg 20

basea5918fddf Jul 02, 02:56 - 114 days / 1113 commits behind master (from history)

applyapplied Jul 28, 23:11

rebaselast tried Jul 31, 23:16 on c9a669492

Applying: Add invalidation-based retry loop for Alter/Drop Subscription
Using index info to reconstruct a base tree...
M	src/backend/commands/subscriptioncmds.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/commands/subscriptioncmds.c
CONFLICT (content): Merge conflict in src/backend/commands/subscriptioncmds.c
Patch failed at 0001 Add invalidation-based retry loop for Alter/Drop Subscription

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

conflicts on master: src/backend/commands/subscriptioncmds.c

pushJul 28, 23:11 -> e68aecdeb branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1006 / 1006	1m 46s / 4m 17s	`docker run ... @sha256:6ad31c0...`	Jul 28, 23:29
run 30407179424 executed 1006 - ccache 594 hit / 6026 miss - head e68aecdeb - digest sha256:6ad31c08b1f439... - run 30407179424