[PATCH] Fix minRecoveryPoint not advanced past checkpoint in CreateRestartPoint

1 patchset tracked - current t139195_6

v6t139195_6posted Apr 08, 07:05successneeds rebaserecent 8dpg 20

basec1c5d28f4 Sep 11, 11:42 on master

applyapplied Sep 11, 12:11

rebaselast tried about 9 hours ago on 9e17d25e7

Applying: Fix minRecoveryPoint not advanced past checkpoint in CreateRestartPoint
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlog.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/access/transam/xlog.c
CONFLICT (content): Merge conflict in src/backend/access/transam/xlog.c
Patch failed at 0001 Fix minRecoveryPoint not advanced past checkpoint in CreateRestartPoint

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/access/transam/xlog.c

pushSep 11, 12:11 -> a6bbc6e5e branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1023 / 1023	2m 55s / 5m 21s	`docker run ... :t139195`	Sep 11, 12:22
run 34597688034 executed 1023 - ccache 98 hit / 6523 miss - head a6bbc6e5e - digest sha256:2af973671c658c... - run 34597688034
success	1	20	1023 / 1023	1m 55s / 4m 17s	`docker run ... @sha256:3010a41...`	Sep 10, 12:17
run 34474997682 executed 1023 - ccache 98 hit / 6523 miss - head 6c47dd7e7 - digest sha256:3010a41aa4bb82... - run 34474997682
success	1	20	1021 / 1021	2m 53s / 5m 11s	`docker run ... @sha256:47a2526...`	Sep 09, 12:14
run 34348865255 executed 1021 - ccache 98 hit / 6523 miss - head 56cf5e846 - digest sha256:47a2526283d7a3... - run 34348865255
success	1	20	1021 / 1021	2m 54s / 5m 24s	`docker run ... @sha256:d260305...`	Sep 08, 12:12
run 34223740239 executed 1021 - ccache 98 hit / 6523 miss - head 04b5c89f4 - digest sha256:d26030510cb2e5... - run 34223740239
success	1	20	1025 / 1025	2m 55s / 5m 37s	`docker run ... @sha256:62f363d...`	Sep 07, 12:08
run 34119226714 executed 1025 - ccache 98 hit / 6527 miss - head cd4af47ba - digest sha256:62f363dd3442d6... - run 34119226714
success	1	20	1025 / 1025	2m 51s / 5m 09s	`docker run ... @sha256:64d99e4...`	Sep 05, 13:58
run 33969938158 executed 1025 - ccache 98 hit / 6527 miss - head cd31e9fe4 - digest sha256:64d99e4b04d751... - run 33969938158
success	1	20	1025 / 1025	2m 24s / 4m 21s	`docker run ... @sha256:431e1a0...`	Sep 04, 13:55
run 33879877171 executed 1025 - ccache 98 hit / 6527 miss - head 20d6a31bf - digest sha256:431e1a0079e57e... - run 33879877171
success	1	20	1024 / 1024	2m 47s / 5m 11s	`docker run ... @sha256:06782e5...`	Sep 03, 13:54
run 33762766314 executed 1024 - ccache 98 hit / 6526 miss - head da4ff63a9 - digest sha256:06782e598feac5... - run 33762766314
success	1	20	1023 / 1023	2m 45s / 4m 48s	`docker run ... @sha256:a404a9e...`	Sep 02, 13:51
run 33637297838 executed 1023 - ccache 98 hit / 6526 miss - head 5f26c5df2 - digest sha256:a404a9e5484a69... - run 33637297838
success	1	20	1023 / 1023	2m 57s / 5m 43s	`docker run ... @sha256:9798f43...`	Sep 01, 13:54
run 33514493803 executed 1023 - ccache 98 hit / 6526 miss - head 71129bdad - digest sha256:9798f431e4ad3e... - run 33514493803
success	1	20	1023 / 1023	2m 22s / 4m 31s	`docker run ... @sha256:690e064...`	Aug 31, 13:45
run 33397770615 executed 1023 - ccache 98 hit / 6526 miss - head 16a853c34 - digest sha256:690e064a0d5b5c... - run 33397770615
success	1	20	1022 / 1022	3m 00s / 5m 40s	`docker run ... @sha256:41602f4...`	Aug 30, 13:45
run 33314518148 executed 1022 - ccache 98 hit / 6525 miss - head 951998d3a - digest sha256:41602f4c2b8d3b... - run 33314518148
success	1	20	1022 / 1022	2m 54s / 5m 07s	`docker run ... @sha256:f36f4ab...`	Aug 29, 13:43
run 33255272028 executed 1022 - ccache 98 hit / 6525 miss - head ab8bdd6dd - digest sha256:f36f4abed28bbf... - run 33255272028
success	1	20	1022 / 1022	2m 10s / 4m 40s	`docker run ... @sha256:36d188c...`	Aug 28, 13:40
run 33175732684 executed 1022 - ccache 98 hit / 6525 miss - head cd0d7a4dd - digest sha256:36d188c7cb0082... - run 33175732684
success	1	20	1022 / 1022	1m 50s / 3m 40s	`docker run ... @sha256:171c8b2...`	Aug 27, 13:37
run 33077069233 executed 1022 - ccache 98 hit / 6525 miss - head e739270fd - digest sha256:171c8b22961e3a... - run 33077069233
success	1	20	1025 / 1025	2m 53s / 5m 09s	`docker run ... @sha256:967a429...`	Aug 26, 13:27
run 32973092037 executed 1025 - ccache 98 hit / 6525 miss - head ef6680b72 - digest sha256:967a4291130de4... - run 32973092037
success	1	20	1025 / 1025	2m 52s / 5m 24s	`docker run ... @sha256:cc48a1d...`	Aug 25, 13:16
run 32851053086 executed 1025 - ccache 98 hit / 6525 miss - head 0f2b165cd - digest sha256:cc48a1d62c4dcf... - run 32851053086
success	1	20	1024 / 1024	2m 56s / 5m 44s	`docker run ... @sha256:b7170bd...`	Aug 24, 13:14
run 32730358968 executed 1024 - ccache 98 hit / 6525 miss - head ee3d6307e - digest sha256:b7170bd1e80d89... - run 32730358968
success	1	20	1024 / 1024	2m 55s / 5m 37s	`docker run ... @sha256:b554489...`	Aug 23, 13:11
run 32641048681 executed 1024 - ccache 98 hit / 6525 miss - head c34ad5604 - digest sha256:b5544892d76445... - run 32641048681
success	1	20	1024 / 1024	2m 50s / 5m 16s	`docker run ... @sha256:7833aa1...`	Aug 22, 13:10
run 32574491973 executed 1024 - ccache 98 hit / 6525 miss - head 42fdbe4fb - digest sha256:7833aa1fc03794... - run 32574491973
success	1	20	1024 / 1024	2m 56s / 5m 19s	`docker run ... @sha256:0f5fd75...`	Aug 21, 13:08
run 32484381375 executed 1024 - ccache 98 hit / 6525 miss - head fe5d3604f - digest sha256:0f5fd7599a9329... - run 32484381375
success	1	20	1024 / 1024	2m 29s / 4m 33s	`docker run ... @sha256:9e9ddc3...`	Aug 20, 13:06
run 32371411114 executed 1024 - ccache 98 hit / 6525 miss - head 671f5c97b - digest sha256:9e9ddc3006f201... - run 32371411114
success	1	20	1024 / 1024	2m 58s / 5m 18s	`docker run ... @sha256:406947f...`	Aug 19, 13:10
run 32255117288 executed 1024 - ccache 98 hit / 6525 miss - head ff4e4fd41 - digest sha256:406947fd28a483... - run 32255117288
success	1	20	1022 / 1022	2m 50s / 5m 30s	`docker run ... @sha256:64b7851...`	Aug 18, 12:51
run 32137977075 executed 1022 - ccache 98 hit / 6525 miss - head 7adcfdab8 - digest sha256:64b78515b0d518... - run 32137977075
success	1	20	1020 / 1020	2m 59s / 5m 24s	`docker run ... @sha256:cb2ccdb...`	Aug 17, 12:51
run 32030876835 executed 1020 - ccache 98 hit / 6524 miss - head 2832d49ba - digest sha256:cb2ccdba70a8e3... - run 32030876835
success	1	20	1020 / 1020	2m 52s / 4m 59s	`docker run ... @sha256:a2fd293...`	Aug 16, 12:44
run 31947388696 executed 1020 - ccache 98 hit / 6524 miss - head 49a22760b - digest sha256:a2fd29301fbdac... - run 31947388696
success	1	20	1020 / 1020	2m 46s / 5m 26s	`docker run ... @sha256:9d0b77b...`	Aug 15, 12:44
run 31884860413 executed 1020 - ccache 98 hit / 6524 miss - head 2edeff811 - digest sha256:9d0b77b984b419... - run 31884860413
success	1	20	1020 / 1020	2m 52s / 5m 33s	`docker run ... @sha256:1906102...`	Aug 14, 12:42
run 31800725396 executed 1020 - ccache 165 hit / 6457 miss - head dc84429e6 - digest sha256:19061025f02372... - run 31800725396
success	1	20	1020 / 1020	2m 57s / 5m 26s	`docker run ... @sha256:1ca8f38...`	Aug 13, 12:42
run 31700420099 executed 1020 - ccache 165 hit / 6457 miss - head 88df0a7ad - digest sha256:1ca8f384b3ba4c... - run 31700420099
success	1	20	1020 / 1020	2m 48s / 5m 27s	`docker run ... @sha256:1b9cf3d...`	Aug 12, 12:39
run 31596607297 executed 1020 - ccache 165 hit / 6457 miss - head f964d39f0 - digest sha256:1b9cf3d784f7ae... - run 31596607297
success	1	20	1020 / 1020	2m 54s / 5m 07s	`docker run ... @sha256:01b2b08...`	Aug 11, 12:38
run 31491297458 executed 1020 - ccache 165 hit / 6453 miss - head 14b29b9f2 - digest sha256:01b2b0827b8307... - run 31491297458
success	1	20	1020 / 1020	2m 52s / 5m 41s	`docker run ... @sha256:3e18f4c...`	Aug 10, 12:34
run 31387103056 executed 1020 - ccache 166 hit / 6452 miss - head 28b3be706 - digest sha256:3e18f4c1037d0c... - run 31387103056
success	1	20	1020 / 1020	2m 57s / 5m 17s	`docker run ... @sha256:62c0d0f...`	Aug 08, 19:51
run 31275013817 executed 1020 - ccache 166 hit / 6452 miss - head 4bab0eaa4 - digest sha256:62c0d0f82ae3a5... - run 31275013817
success	1	20	1019 / 1019	2m 55s / 5m 26s	`docker run ... @sha256:41109bf...`	Aug 05, 16:35
run 31025059413 executed 1019 - ccache 166 hit / 6452 miss - head 08b1f6b59 - digest sha256:41109bf47b2b53... - run 31025059413
success	1	20	1019 / 1019	2m 58s / 5m 39s	`docker run ... @sha256:e1a2c23...`	Aug 04, 16:33
run 30928781866 executed 1019 - ccache 166 hit / 6452 miss - head 0c62e9f6c - digest sha256:e1a2c23c3f8d11... - run 30928781866
success	1	20	1018 / 1018	2m 56s / 5m 42s	`docker run ... @sha256:ee16fef...`	Aug 03, 16:32
run 30831694637 executed 1018 - ccache 166 hit / 6452 miss - head 9d5b1523e - digest sha256:ee16fef6d0eeb9... - run 30831694637
success	1	20	1018 / 1018	2m 57s / 5m 18s	`docker run ... @sha256:524d03f...`	Aug 02, 16:31
run 30756341397 executed 1018 - ccache 166 hit / 6452 miss - head 8442ec423 - digest sha256:524d03f92939b7... - run 30756341397
success	1	20	1018 / 1018	2m 53s / 5m 38s	`docker run ... @sha256:68a4ad6...`	Aug 01, 16:29
run 30707836196 executed 1018 - ccache 166 hit / 6452 miss - head 23b622498 - digest sha256:68a4ad67b4ac05... - run 30707836196
success	1	20	1018 / 1018	2m 53s / 5m 25s	`docker run ... @sha256:03e3c3e...`	Jul 31, 16:29
run 30646523750 executed 1018 - ccache 166 hit / 6452 miss - head bf0a630fd - digest sha256:03e3c3e76097d6... - run 30646523750
success	1	20	1017 / 1017	2m 55s / 5m 02s	`docker run ... @sha256:58dc660...`	Jul 30, 16:29
run 30560746576 executed 1017 - ccache 166 hit / 6452 miss - head 50301b93c - digest sha256:58dc660f2c8606... - run 30560746576
success	1	20	1017 / 1017	2m 53s / 5m 37s	`docker run ... @sha256:1d9423c...`	Jul 29, 16:27
run 30469960315 executed 1017 - ccache 166 hit / 6452 miss - head 84469b5af - digest sha256:1d9423c64c6631... - run 30469960315
success	1	20	1015 / 1015	2m 32s / 4m 34s	`docker run ... @sha256:32f33e9...`	Jul 28, 16:29
run 30377443317 executed 1015 - ccache 166 hit / 6452 miss - head 8bcd4888d - digest sha256:32f33e99a00d6f... - run 30377443317
success	1	20	1014 / 1014	2m 53s / 5m 10s	`docker run ... @sha256:2be5b4b...`	Jul 27, 02:04
run 30230868007 executed 1014 - ccache 166 hit / 6452 miss - head fbf5ad760 - digest sha256:2be5b4b43cbcb3... - run 30230868007