[PATCH] Discard aborted updaters when expanding a multixact

5 patchsets tracked - current t253801_5

v5t253801_5posted Oct 09, 20:52successwon't retryrecent 10dpg 20

base89e06d782 Oct 14, 20:38 on master

applyapplied Oct 14, 21:07

rebaselast tried Oct 14, 21:07 on 89e06d782

pushOct 14, 21:07 -> abb9a14eb branch diff vs base

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1049 / 1049	2m 48s / 4m 56s	`docker run ... :t253801`	Oct 14, 21:19
run 38637768979 executed 1049 - ccache 78 hit / 6544 miss - head abb9a14eb - digest sha256:8fa110be93a50e... - run 38637768979
success	1	20	1046 / 1046	2m 28s / 4m 46s	`docker run ... @sha256:04e6fe0...`	Oct 13, 21:07
run 38466847394 executed 1046 - ccache 78 hit / 6544 miss - head 518e14ba5 - digest sha256:04e6fe02602149... - run 38466847394
success	1	20	1046 / 1046	2m 47s / 5m 24s	`docker run ... @sha256:0c267f6...`	Oct 12, 21:07
run 38307445770 executed 1046 - ccache 78 hit / 6544 miss - head a2d31fc9b - digest sha256:0c267f6456eb5b... - run 38307445770
success	1	20	1046 / 1046	2m 52s / 5m 15s	`docker run ... @sha256:c4a73f8...`	Oct 11, 21:06
run 38174252469 executed 1046 - ccache 78 hit / 6544 miss - head 97e3d0c74 - digest sha256:c4a73f8a79d5e7... - run 38174252469
success	1	20	1046 / 1046	2m 12s / 4m 51s	`docker run ... @sha256:0d64f7b...`	Oct 10, 21:04
run 38085641985 executed 1046 - ccache 78 hit / 6544 miss - head 94e1497f8 - digest sha256:0d64f7b942e377... - run 38085641985
success	1	20	1045 / 1045	3m 00s / 5m 26s	`docker run ... @sha256:532f903...`	Oct 09, 21:05
run 37990094278 executed 1045 - ccache 78 hit / 6544 miss - head 1d4934b61 - digest sha256:532f903f8cc5a8... - run 37990094278

v4t253801_4posted Oct 08, 09:04infra errorsupersededrecent 15dpg 20

base412848dac Oct 09, 04:59 on master

applyapplied Oct 09, 09:07

rebaselast tried Oct 09, 09:07 on 412848dac

pushOct 09, 09:07 -> b873fd3bc branch diff vs base

skippedno CI verdict 48h after push

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1044 / 1044	2m 53s / 5m 28s	`docker run ... @sha256:d6c515c...`	Oct 08, 09:18
run 37754404416 executed 1044 - ccache 78 hit / 6544 miss - head bbff9923e - digest sha256:d6c515c9c712f1... - run 37754404416

v3t253801_3posted Sep 29, 04:44successsupersededrecent 20dpg 20

basebfa1a69ed Oct 04, 03:06 on master

applyapplied Oct 04, 05:01

rebaselast tried Oct 08, 05:07 on 061065e28

Applying: Test abort-window conflicts and crashed multixact updaters
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xact.c
M	src/test/modules/injection_points/Makefile
M	src/test/modules/injection_points/meson.build
M	src/test/recovery/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/recovery/meson.build
CONFLICT (content): Merge conflict in src/test/recovery/meson.build
Auto-merging src/test/modules/injection_points/meson.build
CONFLICT (content): Merge conflict in src/test/modules/injection_points/meson.build
Auto-merging src/test/modules/injection_points/Makefile
Auto-merging src/backend/access/transam/xact.c
Patch failed at 0001 Test abort-window conflicts and crashed multixact updaters

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/recovery/meson.build, src/test/modules/injection_points/meson.build

pushOct 04, 05:01 -> 9ab440a95 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1041 / 1041	2m 55s / 5m 27s	`docker run ... @sha256:0d1e2de...`	Oct 04, 05:11
run 37178670822 executed 1041 - ccache 78 hit / 6544 miss - head 9ab440a95 - digest sha256:0d1e2de2f68785... - run 37178670822
success	1	20	1041 / 1041	2m 37s / 4m 55s	`docker run ... @sha256:32bad12...`	Oct 03, 05:10
run 37098427478 executed 1041 - ccache 78 hit / 6544 miss - head d9a1aa9de - digest sha256:32bad12ccf9e05... - run 37098427478
success	1	20	1041 / 1041	2m 53s / 5m 10s	`docker run ... @sha256:b331e63...`	Oct 02, 05:09
run 36966920438 executed 1041 - ccache 78 hit / 6544 miss - head c203eddde - digest sha256:b331e638ac0d2c... - run 36966920438
success	1	20	1041 / 1041	2m 11s / 4m 43s	`docker run ... @sha256:c3e3eff...`	Oct 01, 05:07
run 36817544394 executed 1041 - ccache 78 hit / 6544 miss - head 32b9dfc0b - digest sha256:c3e3eff666dd32... - run 36817544394
success	1	20	1041 / 1041	2m 14s / 4m 53s	`docker run ... @sha256:05fcbc2...`	Sep 30, 04:59
run 36670585104 executed 1041 - ccache 78 hit / 6544 miss - head bd986cb6b - digest sha256:05fcbc2425017b... - run 36670585104
success	1	20	1041 / 1041	2m 52s / 5m 31s	`docker run ... @sha256:26ff25a...`	Sep 29, 04:58
run 36523186545 executed 1041 - ccache 78 hit / 6544 miss - head 4cbfa50ac - digest sha256:26ff25ae2c71bc... - run 36523186545

v2t253801_2posted Sep 17, 01:36successsupersededrecent 26dpg 20

basea5447a2de Sep 28, 15:46 on master

applyapplied Sep 28, 16:20

rebaselast tried Sep 28, 16:20 on a5447a2de

pushSep 28, 16:20 -> 1df083249 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1040 / 1040	2m 55s / 5m 06s	`docker run ... @sha256:900baac...`	Sep 28, 16:31
run 36450344873 executed 1040 - ccache 78 hit / 6544 miss - head 1df083249 - digest sha256:900baacfd1d88f... - run 36450344873
success	1	20	1040 / 1040	2m 47s / 4m 55s	`docker run ... @sha256:7b5353a...`	Sep 27, 16:24
run 36332504323 executed 1040 - ccache 78 hit / 6544 miss - head cd3edf83a - digest sha256:7b5353a2e7d9a1... - run 36332504323
success	1	20	1040 / 1040	2m 56s / 5m 38s	`docker run ... @sha256:2a101c6...`	Sep 26, 16:20
run 36254449038 executed 1040 - ccache 78 hit / 6544 miss - head 3099d9fb8 - digest sha256:2a101c6d58cd4f... - run 36254449038
success	1	20	1040 / 1040	2m 54s / 5m 37s	`docker run ... @sha256:76e0f2a...`	Sep 25, 16:18
run 36158685133 executed 1040 - ccache 78 hit / 6544 miss - head a469753db - digest sha256:76e0f2ad896058... - run 36158685133
success	1	20	1039 / 1039	2m 48s / 5m 09s	`docker run ... @sha256:6fc9db5...`	Sep 24, 16:14
run 36024711233 executed 1039 - ccache 78 hit / 6544 miss - head 85a00bbf9 - digest sha256:6fc9db598f61d5... - run 36024711233
success	1	20	1037 / 1037	2m 47s / 5m 23s	`docker run ... @sha256:a52d0bf...`	Sep 23, 16:16
run 35885679802 executed 1037 - ccache 98 hit / 6524 miss - head d14699c7e - digest sha256:a52d0bfaae0301... - run 35885679802
success	1	20	1037 / 1037	1m 54s / 4m 05s	`docker run ... @sha256:f160d80...`	Sep 22, 16:07
run 35750937603 executed 1037 - ccache 98 hit / 6524 miss - head 06495b984 - digest sha256:f160d803550fb8... - run 35750937603
success	1	20	1037 / 1037	2m 12s / 4m 39s	`docker run ... @sha256:f7eb048...`	Sep 21, 15:59
run 35621596127 executed 1037 - ccache 98 hit / 6524 miss - head 978f97619 - digest sha256:f7eb048a977937... - run 35621596127
success	1	20	1037 / 1037	2m 44s / 4m 37s	`docker run ... @sha256:86f2b73...`	Sep 20, 10:30
run 35504823513 executed 1037 - ccache 98 hit / 6524 miss - head a12f0805a - digest sha256:86f2b73b947bf1... - run 35504823513
success	1	20	1037 / 1037	2m 39s / 4m 30s	`docker run ... @sha256:f872591...`	Sep 19, 10:29
run 35437088341 executed 1037 - ccache 98 hit / 6524 miss - head e68f54fab - digest sha256:f872591e757245... - run 35437088341
success	1	20	1037 / 1037	2m 54s / 5m 21s	`docker run ... @sha256:e8ebf5a...`	Sep 18, 10:29
run 35334021760 executed 1037 - ccache 98 hit / 6524 miss - head fac5a0699 - digest sha256:e8ebf5adc5e976... - run 35334021760
success	1	20	1037 / 1037	2m 51s / 5m 24s	`docker run ... @sha256:904ce2f...`	Sep 17, 10:28
run 35209702883 executed 1037 - ccache 98 hit / 6524 miss - head 4ce9fb6b9 - digest sha256:904ce2f755d5f0... - run 35209702883

v1t253801_1posted Sep 15, 10:36successsupersededstale 43dpg 20

base7164dcb66 Sep 11, 17:20 - 43 days / 390 commits behind master (from history)

applyapplied Sep 15, 12:02

rebaselast tried Sep 16, 12:09 on a4f18fd8f

Applying: Test multixact expansion during updater abort
Using index info to reconstruct a base tree...
M	src/test/modules/injection_points/Makefile
M	src/test/modules/injection_points/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/injection_points/meson.build
CONFLICT (content): Merge conflict in src/test/modules/injection_points/meson.build
Auto-merging src/test/modules/injection_points/Makefile
CONFLICT (content): Merge conflict in src/test/modules/injection_points/Makefile
Patch failed at 0001 Test multixact expansion during updater abort

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/modules/injection_points/meson.build, src/test/modules/injection_points/Makefile

pushSep 15, 12:02 -> 5f4ca9d54 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1024 / 1024	2m 53s / 5m 41s	`docker run ... @sha256:16cce25...`	Sep 15, 12:13
run 34966576770 executed 1024 - ccache 98 hit / 6523 miss - head 5f4ca9d54 - digest sha256:16cce258c6d627... - run 34966576770