Fix XLogFileReadAnyTLI silently applying divergent WAL from wrong timeline

3 patchsets tracked - current t53368_10

v10t53368_10posted Sep 04, 19:02successneeds rebaserecent 29dpg 20

base4a2f5533f Sep 23, 20:37 on master

applyapplied Sep 23, 21:17

rebaselast tried about 16 hours ago on 1910daf98

Applying: Prevent archive recovery from reading divergent WAL
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlogrecovery.c
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/backend/access/transam/xlogrecovery.c
Patch failed at 0001 Prevent archive recovery from reading divergent WAL

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

pushSep 23, 21:17 -> 4c599245b branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1038 / 1038	2m 53s / 5m 06s	`docker run ... :t53368`	Sep 23, 21:27
run 35921503288 executed 1038 - ccache 98 hit / 6524 miss - head 4c599245b - digest sha256:f2344b3c14c40d... - run 35921503288
success	1	20	1038 / 1038	1m 49s / 4m 06s	`docker run ... @sha256:7e6bacf...`	Sep 22, 21:22
run 35785388709 executed 1038 - ccache 98 hit / 6524 miss - head ef596a4ac - digest sha256:7e6bacf89802e4... - run 35785388709
success	1	20	1038 / 1038	2m 57s / 5m 34s	`docker run ... @sha256:6d77aaf...`	Sep 21, 21:13
run 35654785280 executed 1038 - ccache 98 hit / 6524 miss - head b2296736b - digest sha256:6d77aafd651536... - run 35654785280
success	1	20	1038 / 1038	2m 45s / 4m 47s	`docker run ... @sha256:60f9aad...`	Sep 20, 15:39
run 35519724404 executed 1038 - ccache 98 hit / 6524 miss - head 69b12a3cb - digest sha256:60f9aadfa893a4... - run 35519724404
success	1	20	1038 / 1038	2m 55s / 5m 37s	`docker run ... @sha256:da4f0be...`	Sep 19, 15:39
run 35451917524 executed 1038 - ccache 98 hit / 6524 miss - head de10fd698 - digest sha256:da4f0be2bcb88e... - run 35451917524
success	1	20	1038 / 1038	2m 12s / 4m 29s	`docker run ... @sha256:8ab7892...`	Sep 18, 15:35
run 35362438035 executed 1038 - ccache 98 hit / 6524 miss - head 30970c865 - digest sha256:8ab789237e4eb7... - run 35362438035
success	1	20	1038 / 1038	1m 54s / 4m 12s	`docker run ... @sha256:8debc9c...`	Sep 17, 15:31
run 35239716483 executed 1038 - ccache 98 hit / 6524 miss - head 5d9e9be9b - digest sha256:8debc9ccdbdc98... - run 35239716483
success	1	20	1038 / 1038	2m 51s / 5m 02s	`docker run ... @sha256:e5322db...`	Sep 16, 15:22
run 35113640358 executed 1038 - ccache 98 hit / 6524 miss - head 99e017285 - digest sha256:e5322dbac39f9e... - run 35113640358
success	1	20	1038 / 1038	2m 50s / 4m 59s	`docker run ... @sha256:aa7f684...`	Sep 15, 15:19
run 34986521343 executed 1038 - ccache 98 hit / 6523 miss - head 6542d6d09 - digest sha256:aa7f684784beae... - run 34986521343
success	1	20	1038 / 1038	2m 46s / 5m 16s	`docker run ... @sha256:a39f24e...`	Sep 14, 15:16
run 34859937112 executed 1038 - ccache 98 hit / 6523 miss - head 0063f874f - digest sha256:a39f24eb1ed4be... - run 34859937112
success	1	20	1025 / 1025	2m 56s / 5m 34s	`docker run ... @sha256:83c9f97...`	Sep 13, 14:37
run 34762686437 executed 1025 - ccache 98 hit / 6523 miss - head 023ec9055 - digest sha256:83c9f970c436b6... - run 34762686437
success	1	20	1025 / 1025	1m 55s / 3m 59s	`docker run ... @sha256:326a153...`	Sep 12, 14:16
run 34698349507 executed 1025 - ccache 98 hit / 6523 miss - head 88d0b70e1 - digest sha256:326a153e0215d6... - run 34698349507
success	1	20	1024 / 1024	2m 51s / 5m 33s	`docker run ... @sha256:1cd5458...`	Sep 11, 14:17
run 34608127726 executed 1024 - ccache 98 hit / 6523 miss - head 2c67e79dc - digest sha256:1cd545800917d8... - run 34608127726
success	1	20	1024 / 1024	2m 36s / 4m 40s	`docker run ... @sha256:f34f32b...`	Sep 10, 14:19
run 34486787645 executed 1024 - ccache 98 hit / 6523 miss - head 70db0d651 - digest sha256:f34f32b1035d78... - run 34486787645
success	1	20	1022 / 1022	2m 10s / 4m 24s	`docker run ... @sha256:7d16bb5...`	Sep 09, 14:07
run 34360293070 executed 1022 - ccache 98 hit / 6523 miss - head 1fef569e4 - digest sha256:7d16bb5550efea... - run 34360293070
success	1	20	1022 / 1022	1m 50s / 4m 05s	`docker run ... @sha256:7dd7403...`	Sep 08, 14:09
run 34234900279 executed 1022 - ccache 98 hit / 6523 miss - head a90f58985 - digest sha256:7dd74039d4d031... - run 34234900279
success	1	20	1026 / 1026	2m 54s / 5m 20s	`docker run ... @sha256:c480d7c...`	Sep 07, 14:09
run 34129863093 executed 1026 - ccache 98 hit / 6527 miss - head 2da55f4f4 - digest sha256:c480d7c26db711... - run 34129863093
success	1	20	1026 / 1026	2m 52s / 5m 09s	`docker run ... @sha256:af5ffed...`	Sep 05, 19:14
run 33985967493 executed 1026 - ccache 98 hit / 6527 miss - head 80253d06d - digest sha256:af5ffed78f173d... - run 33985967493
success	1	20	1026 / 1026	2m 26s / 5m 03s	`docker run ... @sha256:97bceb6...`	Sep 04, 19:13
run 33909159981 executed 1026 - ccache 98 hit / 6527 miss - head ca4982654 - digest sha256:97bceb663db037... - run 33909159981

v8t53368_8posted Aug 21, 15:39successsupersededstale 58dpg 20

base1051099a9 Aug 26, 14:40 on master

applyapplied Aug 26, 15:45

rebaselast tried Sep 04, 15:51 on 168fa9dd4

Applying: Prevent archive recovery from reading divergent WAL
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlogrecovery.c
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/backend/access/transam/xlogrecovery.c
Patch failed at 0001 Prevent archive recovery from reading divergent WAL

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

pushAug 26, 15:45 -> c59195393 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1026 / 1026	2m 11s / 4m 53s	`docker run ... @sha256:0ea5d05...`	Aug 26, 16:09
run 32986564019 executed 1026 - ccache 98 hit / 6525 miss - head c59195393 - digest sha256:0ea5d0544fb74e... - run 32986564019
success	1	20	1026 / 1026	2m 58s / 5m 36s	`docker run ... @sha256:5094c79...`	Aug 25, 15:58
run 32867773581 executed 1026 - ccache 98 hit / 6525 miss - head 0fd726553 - digest sha256:5094c79d50015b... - run 32867773581
success	1	20	1025 / 1025	2m 54s / 5m 16s	`docker run ... @sha256:8ea3bdd...`	Aug 24, 15:55
run 32746713607 executed 1025 - ccache 98 hit / 6525 miss - head 8b9584767 - digest sha256:8ea3bdd54f3d09... - run 32746713607
success	1	20	1025 / 1025	2m 59s / 5m 55s	`docker run ... @sha256:8de4c25...`	Aug 23, 15:55
run 32649459170 executed 1025 - ccache 98 hit / 6525 miss - head d424d1581 - digest sha256:8de4c25a3f796c... - run 32649459170
success	1	20	1025 / 1025	2m 57s / 5m 19s	`docker run ... @sha256:2c2471e...`	Aug 22, 15:53
run 32582504745 executed 1025 - ccache 98 hit / 6525 miss - head c93559723 - digest sha256:2c2471e70ac825... - run 32582504745
success	1	20	1025 / 1025	2m 58s / 5m 37s	`docker run ... @sha256:c3bd250...`	Aug 21, 15:53
run 32498975153 executed 1025 - ccache 98 hit / 6525 miss - head 4928b9d7c - digest sha256:c3bd250de861fe... - run 32498975153

v4t53368_4posted Feb 25, 13:19successsupersededstale 2mopg 20

base1c41ebf22 Aug 21, 00:25 on master

applyapplied Aug 21, 01:08

rebaselast tried Aug 21, 01:08 on 1c41ebf22

pushAug 21, 01:08 -> 15e314401 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1026 / 1026	2m 56s / 5m 41s	`docker run ... @sha256:da937aa...`	Aug 21, 01:20
run 32435238665 executed 1026 - ccache 98 hit / 6525 miss - head 15e314401 - digest sha256:da937aaf48a97a... - run 32435238665
success	1	20	1026 / 1026	2m 56s / 5m 48s	`docker run ... @sha256:2110cd1...`	Aug 20, 01:21
run 32319818770 executed 1026 - ccache 98 hit / 6525 miss - head ce94d2f15 - digest sha256:2110cd19451726... - run 32319818770
success	1	20	1026 / 1026	2m 48s / 5m 26s	`docker run ... @sha256:0c7d3a0...`	Aug 19, 01:19
run 32203647642 executed 1026 - ccache 98 hit / 6525 miss - head e04cba677 - digest sha256:0c7d3a08411c84... - run 32203647642
success	1	20	1022 / 1022	3m 00s / 5m 51s	`docker run ... @sha256:b45971d...`	Aug 18, 01:19
run 32086844047 executed 1022 - ccache 98 hit / 6524 miss - head dfd206e38 - digest sha256:b45971d17a0d2c... - run 32086844047
success	1	20	1022 / 1022	2m 54s / 5m 24s	`docker run ... @sha256:a6003a0...`	Aug 17, 01:20
run 31983716933 executed 1022 - ccache 98 hit / 6524 miss - head f1524137a - digest sha256:a6003a03526286... - run 31983716933
success	1	20	1022 / 1022	1m 57s / 4m 28s	`docker run ... @sha256:a5bad29...`	Aug 16, 01:02
run 31918179736 executed 1022 - ccache 98 hit / 6524 miss - head 1b19a2612 - digest sha256:a5bad2955fc0d1... - run 31918179736
success	1	20	1022 / 1022	2m 31s / 4m 33s	`docker run ... @sha256:bb4d602...`	Aug 15, 01:01
run 31854736527 executed 1022 - ccache 98 hit / 6524 miss - head 714f20cb4 - digest sha256:bb4d602b4de7aa... - run 31854736527
success	1	20	1022 / 1022	2m 46s / 5m 30s	`docker run ... @sha256:ddb79e7...`	Aug 14, 00:59
run 31758558575 executed 1022 - ccache 165 hit / 6457 miss - head 271981ee7 - digest sha256:ddb79e746e9731... - run 31758558575
success	1	20	1022 / 1022	2m 48s / 5m 42s	`docker run ... @sha256:2a5aca3...`	Aug 13, 00:58
run 31655565154 executed 1022 - ccache 165 hit / 6457 miss - head 64fefe606 - digest sha256:2a5aca399aab48... - run 31655565154
success	1	20	1022 / 1022	2m 54s / 5m 42s	`docker run ... @sha256:b2df6ef...`	Aug 12, 00:57
run 31551334649 executed 1022 - ccache 165 hit / 6453 miss - head e29092f10 - digest sha256:b2df6ef4342132... - run 31551334649
success	1	20	1022 / 1022	2m 47s / 4m 55s	`docker run ... @sha256:8f33ea5...`	Aug 11, 00:55
run 31447070687 executed 1022 - ccache 165 hit / 6453 miss - head d7000ba7a - digest sha256:8f33ea532cc0ac... - run 31447070687
success	1	20	1022 / 1022	2m 51s / 5m 11s	`docker run ... @sha256:3714632...`	Aug 10, 00:55
run 31345180812 executed 1022 - ccache 166 hit / 6452 miss - head 9a3801f30 - digest sha256:37146322b23804... - run 31345180812
success	1	20	1022 / 1022	2m 45s / 5m 19s	`docker run ... @sha256:8c64768...`	Aug 07, 22:54
run 31224764387 executed 1022 - ccache 166 hit / 6452 miss - head a2e3f873a - digest sha256:8c64768dd3cb9c... - run 31224764387
success	1	20	1021 / 1021	2m 46s / 4m 58s	`docker run ... @sha256:aaff2c8...`	Aug 07, 00:21
run 31129744994 executed 1021 - ccache 166 hit / 6452 miss - head 791cb2cfd - digest sha256:aaff2c8f08e937... - run 31129744994
success	1	20	1021 / 1021	2m 34s / 4m 38s	`docker run ... @sha256:b7dc7b9...`	Aug 05, 17:28
run 31029201852 executed 1021 - ccache 166 hit / 6452 miss - head 1f6e24f6c - digest sha256:b7dc7b9aad0904... - run 31029201852
success	1	20	1021 / 1021	1m 50s / 4m 04s	`docker run ... @sha256:aebf29c...`	Aug 04, 17:25
run 30932997106 executed 1021 - ccache 166 hit / 6452 miss - head ba6fced54 - digest sha256:aebf29ce2ef616... - run 30932997106
success	1	20	1020 / 1020	2m 15s / 4m 37s	`docker run ... @sha256:abc37ae...`	Aug 03, 17:23
run 30835727907 executed 1020 - ccache 166 hit / 6452 miss - head f275a366d - digest sha256:abc37ae22d1427... - run 30835727907
success	1	20	1020 / 1020	2m 48s / 5m 25s	`docker run ... @sha256:af4c388...`	Aug 02, 17:23
run 30758340015 executed 1020 - ccache 166 hit / 6452 miss - head 33940d13b - digest sha256:af4c388b2c25a8... - run 30758340015
success	1	20	1020 / 1020	2m 46s / 5m 24s	`docker run ... @sha256:27d02b8...`	Aug 01, 17:22
run 30709771058 executed 1020 - ccache 166 hit / 6452 miss - head dae2d1fda - digest sha256:27d02b88f3f47f... - run 30709771058
success	1	20	1020 / 1020	3m 03s / 5m 33s	`docker run ... @sha256:697bcbb...`	Jul 31, 17:22
run 30650096503 executed 1020 - ccache 166 hit / 6452 miss - head b0ea0e77e - digest sha256:697bcbbd00133b... - run 30650096503
success	1	20	1019 / 1019	2m 46s / 5m 21s	`docker run ... @sha256:ed0acf8...`	Jul 30, 17:20
run 30564677402 executed 1019 - ccache 166 hit / 6452 miss - head f22bca0f5 - digest sha256:ed0acf89b8615b... - run 30564677402
success	1	20	1019 / 1019	2m 49s / 5m 34s	`docker run ... @sha256:27a6c9b...`	Jul 29, 17:20
run 30473930130 executed 1019 - ccache 166 hit / 6452 miss - head 3d9076960 - digest sha256:27a6c9b1748082... - run 30473930130
success	1	20	1017 / 1017	2m 47s / 5m 27s	`docker run ... @sha256:23985aa...`	Jul 28, 17:18
run 30381387376 executed 1017 - ccache 166 hit / 6452 miss - head e1849ac25 - digest sha256:23985aa35c31b3... - run 30381387376
success	1	20	1016 / 1016	2m 13s / 4m 42s	`docker run ... @sha256:d0761c8...`	Jul 27, 03:46
run 30235032492 executed 1016 - ccache 166 hit / 6452 miss - head 5ac12f2b2 - digest sha256:d0761c8f41a96b... - run 30235032492