[PATCH] Fix ProcKill lock-group vs procLatch recycle race

1 patchset tracked - current t139495_13

v13t139495_13posted May 27, 11:03successneeds rebaserecent 17dpg 20

base03985e1e5 Oct 05, 00:42 on master

applyapplied Oct 05, 01:17

rebaselast tried about 22 hours ago on ba6d9ee25

Applying: Add regression test for ProcKill lock-group procLatch recycle race
Using index info to reconstruct a base tree...
M	src/backend/storage/lmgr/proc.c
M	src/test/modules/injection_points/Makefile
M	src/test/modules/injection_points/injection_points--1.0.sql
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
Auto-merging src/test/modules/injection_points/injection_points--1.0.sql
Auto-merging src/test/modules/injection_points/Makefile
CONFLICT (content): Merge conflict in src/test/modules/injection_points/Makefile
Auto-merging src/backend/storage/lmgr/proc.c
Patch failed at 0001 Add regression test for ProcKill lock-group procLatch recycle race

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/Makefile

pushOct 05, 01:17 -> 1a3be375c branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1040 / 1040	2m 09s / 4m 40s	`docker run ... :t139495`	Oct 05, 01:26
run 37250874403 executed 1040 - ccache 78 hit / 6545 miss - head 1a3be375c - digest sha256:a16019704ce4e8... - run 37250874403
success	1	20	1040 / 1040	2m 52s / 5m 32s	`docker run ... @sha256:3bca094...`	Oct 04, 01:28
run 37167543835 executed 1040 - ccache 78 hit / 6545 miss - head 8835c7eb9 - digest sha256:3bca0940a2f6d3... - run 37167543835
success	1	20	1040 / 1040	1m 47s / 4m 09s	`docker run ... @sha256:39094f8...`	Oct 03, 01:23
run 37085377109 executed 1040 - ccache 78 hit / 6545 miss - head 4ff0120d8 - digest sha256:39094f85ad3ee8... - run 37085377109
success	1	20	1040 / 1040	2m 53s / 5m 06s	`docker run ... @sha256:7890349...`	Oct 02, 01:24
run 36949972465 executed 1040 - ccache 78 hit / 6545 miss - head 8bf9abcab - digest sha256:789034995cd6f4... - run 36949972465
success	1	20	1040 / 1040	3m 00s / 5m 36s	`docker run ... @sha256:8f1d44e...`	Oct 01, 01:18
run 36799598395 executed 1040 - ccache 78 hit / 6545 miss - head 21749d00e - digest sha256:8f1d44e3092050... - run 36799598395
success	1	20	1040 / 1040	2m 45s / 5m 13s	`docker run ... @sha256:30db8ab...`	Sep 30, 01:15
run 36653380128 executed 1040 - ccache 78 hit / 6545 miss - head 7615e35ae - digest sha256:30db8ab1155d78... - run 36653380128
success	1	20	1040 / 1040	1m 51s / 4m 02s	`docker run ... @sha256:bd89a6d...`	Sep 29, 01:11
run 36506044297 executed 1040 - ccache 78 hit / 6545 miss - head 2c5c8cf37 - digest sha256:bd89a6d4a0bc28... - run 36506044297
success	1	20	1040 / 1040	2m 56s / 5m 39s	`docker run ... @sha256:6fa32ef...`	Sep 28, 01:13
run 36364403431 executed 1040 - ccache 78 hit / 6545 miss - head d16826647 - digest sha256:6fa32ef4e1161c... - run 36364403431
success	1	20	1040 / 1040	2m 57s / 5m 32s	`docker run ... @sha256:8bf63a2...`	Sep 26, 20:26
run 36268862803 executed 1040 - ccache 78 hit / 6545 miss - head de65f5715 - digest sha256:8bf63a28c83ff3... - run 36268862803
success	1	20	1040 / 1040	2m 17s / 4m 48s	`docker run ... @sha256:9f93964...`	Sep 25, 20:16
run 36183733327 executed 1040 - ccache 78 hit / 6545 miss - head 7923b1a92 - digest sha256:9f9396445568cd... - run 36183733327
success	1	20	1039 / 1039	2m 56s / 6m 02s	`docker run ... @sha256:01fe779...`	Sep 24, 20:15
run 36052360671 executed 1039 - ccache 78 hit / 6545 miss - head 542e814ff - digest sha256:01fe7799dca80c... - run 36052360671
success	1	20	1037 / 1037	1m 48s / 4m 14s	`docker run ... @sha256:a20a3c5...`	Sep 23, 20:10
run 35913220051 executed 1037 - ccache 98 hit / 6525 miss - head dc061bf7f - digest sha256:a20a3c589f75b1... - run 35913220051
success	1	20	1037 / 1037	2m 50s / 5m 54s	`docker run ... @sha256:3951ce1...`	Sep 22, 20:10
run 35777342721 executed 1037 - ccache 98 hit / 6525 miss - head 123ff66b6 - digest sha256:3951ce1f1fe7dd... - run 35777342721
success	1	20	1037 / 1037	2m 13s / 5m 15s	`docker run ... @sha256:ad5ebb2...`	Sep 21, 19:58
run 35647126161 executed 1037 - ccache 98 hit / 6525 miss - head 03df425d6 - digest sha256:ad5ebb274c4bdc... - run 35647126161
success	1	20	1037 / 1037	2m 09s / 5m 23s	`docker run ... @sha256:9875265...`	Sep 20, 14:25
run 35515921804 executed 1037 - ccache 98 hit / 6525 miss - head efc9b9d2a - digest sha256:9875265dc1e2ef... - run 35515921804
success	1	20	1037 / 1037	2m 55s / 5m 59s	`docker run ... @sha256:1f1d619...`	Sep 19, 14:24
run 35448050340 executed 1037 - ccache 98 hit / 6525 miss - head e2df74cd6 - digest sha256:1f1d6195dfd278... - run 35448050340
success	1	20	1037 / 1037	2m 48s / 5m 38s	`docker run ... @sha256:5fa8a84...`	Sep 18, 14:22
run 35354720694 executed 1037 - ccache 98 hit / 6525 miss - head 9ec76d0ca - digest sha256:5fa8a843688b02... - run 35354720694
success	1	20	1037 / 1037	2m 45s / 5m 07s	`docker run ... @sha256:2860abf...`	Sep 17, 14:21
run 35231777936 executed 1037 - ccache 98 hit / 6525 miss - head 1c4f66b86 - digest sha256:2860abf4795f33... - run 35231777936
tests failed	1	20	1028 / 1029	2m 47s / 5m 05s	`docker run ... @sha256:b0502a7...`	Sep 16, 14:12
run 35105782860 failed: injection_points/001_prockill_lockgroup executed 1029 - ccache 98 hit / 6525 miss - head 3dec79aae - digest sha256:b0502a7a113734... - run 35105782860
success	1	20	1037 / 1037	2m 51s / 5m 53s	`docker run ... @sha256:edd0d7e...`	Sep 15, 14:08
run 34978355751 executed 1037 - ccache 98 hit / 6524 miss - head 3ef998f6f - digest sha256:edd0d7e18d0d62... - run 34978355751
success	1	20	1037 / 1037	2m 48s / 5m 26s	`docker run ... @sha256:93ea4f4...`	Sep 14, 14:03
run 34851981995 executed 1037 - ccache 98 hit / 6524 miss - head 7099d0a1c - digest sha256:93ea4f47a7f787... - run 34851981995
success	1	20	1024 / 1024	2m 10s / 4m 43s	`docker run ... @sha256:dc021b6...`	Sep 13, 13:21
run 34759191037 executed 1024 - ccache 98 hit / 6524 miss - head d417eae4c - digest sha256:dc021b65a84bb5... - run 34759191037
success	1	20	1024 / 1024	2m 55s / 5m 34s	`docker run ... @sha256:ea802eb...`	Sep 12, 13:07
run 34695001462 executed 1024 - ccache 98 hit / 6524 miss - head 31a0aa9a9 - digest sha256:ea802ebc5aad2b... - run 34695001462
success	1	20	1023 / 1023	2m 11s / 4m 45s	`docker run ... @sha256:f339502...`	Sep 11, 13:04
run 34601364253 executed 1023 - ccache 98 hit / 6524 miss - head 2519e84e2 - digest sha256:f339502f784f82... - run 34601364253
success	1	20	1023 / 1023	3m 00s / 5m 11s	`docker run ... @sha256:800ccaa...`	Sep 10, 13:06
run 34479375790 executed 1023 - ccache 98 hit / 6524 miss - head c381fc565 - digest sha256:800ccaafc54abd... - run 34479375790
success	1	20	1021 / 1021	2m 52s / 5m 18s	`docker run ... @sha256:bc0be60...`	Sep 09, 13:01
run 34352786833 executed 1021 - ccache 98 hit / 6524 miss - head c4a82be30 - digest sha256:bc0be6000a0b4e... - run 34352786833
cancelled	1	-	-	-	-	Sep 09, 12:44
run 34352784758 head c4a82be30 - run 34352784758
success	1	20	1021 / 1021	2m 56s / 5m 17s	`docker run ... @sha256:73f11fc...`	Sep 08, 13:00
run 34227619331 executed 1021 - ccache 98 hit / 6524 miss - head e970c783d - digest sha256:73f11fc96996e0... - run 34227619331
success	1	20	1025 / 1025	2m 57s / 5m 16s	`docker run ... @sha256:f639afc...`	Sep 07, 12:55
run 34123242591 executed 1025 - ccache 98 hit / 6528 miss - head 59dc4d32d - digest sha256:f639afc9258224... - run 34123242591
success	1	20	1025 / 1025	2m 11s / 4m 50s	`docker run ... @sha256:56f5f7a...`	Sep 05, 14:42
run 33972095784 executed 1025 - ccache 98 hit / 6528 miss - head bca95998e - digest sha256:56f5f7a8534c0e... - run 33972095784
success	1	20	1025 / 1025	2m 47s / 5m 09s	`docker run ... @sha256:089985c...`	Sep 04, 14:42
run 33884173050 executed 1025 - ccache 98 hit / 6528 miss - head efe7044ac - digest sha256:089985c4d7317a... - run 33884173050
success	1	20	1024 / 1024	2m 09s / 4m 36s	`docker run ... @sha256:d9736f8...`	Sep 03, 14:39
run 33767228833 executed 1024 - ccache 98 hit / 6527 miss - head c550abadf - digest sha256:d9736f88dbd022... - run 33767228833
success	1	20	1023 / 1023	2m 57s / 5m 44s	`docker run ... @sha256:b0de2bc...`	Sep 02, 14:39
run 33642245770 executed 1023 - ccache 98 hit / 6527 miss - head b9004e535 - digest sha256:b0de2bcecb18f9... - run 33642245770
success	1	20	1023 / 1023	2m 46s / 5m 30s	`docker run ... @sha256:4c2b5cf...`	Sep 01, 14:37
run 33519499128 executed 1023 - ccache 98 hit / 6527 miss - head b5a499a69 - digest sha256:4c2b5cfb206a6f... - run 33519499128
success	1	20	1023 / 1023	1m 58s / 4m 30s	`docker run ... @sha256:7392eba...`	Aug 31, 14:34
run 33402385681 executed 1023 - ccache 98 hit / 6527 miss - head a8429c741 - digest sha256:7392ebaf7d1bea... - run 33402385681
success	1	20	1022 / 1022	2m 58s / 5m 32s	`docker run ... @sha256:1adc3a0...`	Aug 30, 14:33
run 33316688963 executed 1022 - ccache 98 hit / 6526 miss - head a3ad56cd1 - digest sha256:1adc3a097acfb9... - run 33316688963
success	1	20	1022 / 1022	2m 54s / 5m 32s	`docker run ... @sha256:484c7ae...`	Aug 29, 14:31
run 33257343134 executed 1022 - ccache 98 hit / 6526 miss - head 8e3d63b80 - digest sha256:484c7aec1019b2... - run 33257343134
success	1	20	1022 / 1022	2m 55s / 5m 41s	`docker run ... @sha256:c32875c...`	Aug 28, 14:30
run 33179518765 executed 1022 - ccache 98 hit / 6526 miss - head cec478c0f - digest sha256:c32875c473ed36... - run 33179518765
success	1	20	1022 / 1022	2m 55s / 5m 20s	`docker run ... @sha256:a32aacd...`	Aug 27, 14:25
run 33081203491 executed 1022 - ccache 98 hit / 6526 miss - head 8275ecc50 - digest sha256:a32aacd66caa0c... - run 33081203491
success	1	20	1025 / 1025	2m 18s / 4m 50s	`docker run ... @sha256:5b9ba64...`	Aug 26, 14:16
run 32978113608 executed 1025 - ccache 98 hit / 6526 miss - head c684b80d9 - digest sha256:5b9ba64d7ac441... - run 32978113608
success	1	20	1025 / 1025	2m 45s / 4m 43s	`docker run ... @sha256:521ce2e...`	Aug 25, 14:06
run 32856355487 executed 1025 - ccache 98 hit / 6526 miss - head 78b8f9907 - digest sha256:521ce2e2d463ca... - run 32856355487
success	1	20	1024 / 1024	2m 59s / 5m 33s	`docker run ... @sha256:f5197b4...`	Aug 24, 14:06
run 32735525309 executed 1024 - ccache 98 hit / 6526 miss - head 46319e828 - digest sha256:f5197b405965d7... - run 32735525309
success	1	20	1024 / 1024	2m 55s / 5m 20s	`docker run ... @sha256:49c3f00...`	Aug 23, 14:04
run 32643720512 executed 1024 - ccache 98 hit / 6526 miss - head 64a418c4a - digest sha256:49c3f006cd027e... - run 32643720512
success	1	20	1024 / 1024	2m 45s / 4m 44s	`docker run ... @sha256:16f0520...`	Aug 22, 14:01
run 32576999183 executed 1024 - ccache 98 hit / 6526 miss - head bf79978c7 - digest sha256:16f0520199cbb9... - run 32576999183
success	1	20	1024 / 1024	2m 55s / 5m 32s	`docker run ... @sha256:346322c...`	Aug 21, 14:01
run 32488947590 executed 1024 - ccache 98 hit / 6526 miss - head 9ff880082 - digest sha256:346322c6f175ff... - run 32488947590
success	1	20	1024 / 1024	2m 57s / 5m 26s	`docker run ... @sha256:33bf523...`	Aug 20, 14:01
run 32376538444 executed 1024 - ccache 98 hit / 6526 miss - head 1bf97aa27 - digest sha256:33bf523ff35182... - run 32376538444
success	1	20	1024 / 1024	2m 55s / 5m 39s	`docker run ... @sha256:7e82e74...`	Aug 19, 14:00
run 32260308837 executed 1024 - ccache 98 hit / 6526 miss - head f05995a28 - digest sha256:7e82e743e6d635... - run 32260308837
success	1	20	1022 / 1022	2m 50s / 5m 27s	`docker run ... @sha256:998c9a4...`	Aug 18, 14:01
run 32143874194 executed 1022 - ccache 98 hit / 6526 miss - head 5bf07156b - digest sha256:998c9a4f1e1d96... - run 32143874194