Commit Timestamp and LSN Inversion issue

1 patchset tracked - current t50223_15

v15t50223_15posted Nov 08, 2024successwon't retrystale 33dpg 20

base4921447be Aug 17, 22:17 on master

applyapplied Aug 18, 03:23

rebaselast tried 5 days ago on 04c4c1c3a

Applying: Make commit timestamp monotonic increase
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xact.c
M	src/backend/access/transam/xlog.c
M	src/include/access/xact.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/access/xact.h
Auto-merging src/backend/access/transam/xlog.c
CONFLICT (content): Merge conflict in src/backend/access/transam/xlog.c
Auto-merging src/backend/access/transam/xact.c
Patch failed at 0001 Make commit timestamp monotonic increase

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

pushAug 18, 03:23 -> 23765d74d branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1019 / 1019	2m 11s / 4m 47s	`docker run ... :t50223`	Aug 18, 03:34
run 32095307889 executed 1019 - ccache 98 hit / 6524 miss - head 23765d74d - digest sha256:cd2f5e772d6b91... - run 32095307889
success	1	20	1019 / 1019	2m 49s / 5m 35s	`docker run ... @sha256:b98810b...`	Aug 17, 03:35
run 31990948452 executed 1019 - ccache 98 hit / 6524 miss - head bee13a37a - digest sha256:b98810b907c3c3... - run 31990948452
success	1	20	1019 / 1019	2m 56s / 5m 34s	`docker run ... @sha256:5695750...`	Aug 16, 03:26
run 31923633782 executed 1019 - ccache 98 hit / 6524 miss - head 1c365255b - digest sha256:5695750fa8a482... - run 31923633782
success	1	20	1019 / 1019	2m 52s / 5m 01s	`docker run ... @sha256:f65883d...`	Aug 15, 03:26
run 31861052424 executed 1019 - ccache 98 hit / 6524 miss - head 4004186fa - digest sha256:f65883d611aebd... - run 31861052424
success	1	20	1019 / 1019	2m 54s / 5m 11s	`docker run ... @sha256:ac94cd4...`	Aug 14, 03:23
run 31765831156 executed 1019 - ccache 165 hit / 6457 miss - head 6dcc81307 - digest sha256:ac94cd4b3a3475... - run 31765831156
success	1	20	1019 / 1019	3m 03s / 5m 44s	`docker run ... @sha256:07a295b...`	Aug 13, 03:23
run 31662905335 executed 1019 - ccache 165 hit / 6457 miss - head b5a07459e - digest sha256:07a295bf73ff8e... - run 31662905335
success	1	20	1019 / 1019	2m 47s / 5m 36s	`docker run ... @sha256:e866dc1...`	Aug 12, 03:21
run 31558858949 executed 1019 - ccache 165 hit / 6453 miss - head 13824d61b - digest sha256:e866dc17c2f6ab... - run 31558858949
success	1	20	1019 / 1019	2m 32s / 4m 33s	`docker run ... @sha256:165dd40...`	Aug 11, 03:12
run 31454154194 executed 1019 - ccache 165 hit / 6453 miss - head f2e2ec9c7 - digest sha256:165dd40343ff53... - run 31454154194
success	1	20	1019 / 1019	2m 11s / 4m 04s	`docker run ... @sha256:8650fa6...`	Aug 10, 03:18
run 31351295951 executed 1019 - ccache 166 hit / 6452 miss - head 22e9eef35 - digest sha256:8650fa613e676d... - run 31351295951
success	1	20	1019 / 1019	2m 48s / 5m 25s	`docker run ... @sha256:7e90de3...`	Aug 08, 01:53
run 31233195081 executed 1019 - ccache 166 hit / 6452 miss - head 754a966f4 - digest sha256:7e90de34ba4c1a... - run 31233195081
success	1	20	1018 / 1018	2m 48s / 5m 22s	`docker run ... @sha256:d4d35e9...`	Aug 07, 01:50
run 31138717604 executed 1018 - ccache 166 hit / 6452 miss - head a1e69f364 - digest sha256:d4d35e9a107522... - run 31138717604
success	1	20	1018 / 1018	2m 47s / 5m 08s	`docker run ... @sha256:07f710d...`	Aug 05, 19:58
run 31040895671 executed 1018 - ccache 166 hit / 6452 miss - head 0db80a3af - digest sha256:07f710d8db5f73... - run 31040895671
success	1	20	1018 / 1018	1m 55s / 4m 00s	`docker run ... @sha256:b149075...`	Aug 04, 19:57
run 30944654693 executed 1018 - ccache 166 hit / 6452 miss - head 23b9a269a - digest sha256:b149075e3f8396... - run 30944654693
success	1	20	1018 / 1018	2m 47s / 5m 17s	`docker run ... @sha256:075a3e0...`	Aug 03, 19:56
run 30847047077 executed 1018 - ccache 166 hit / 6452 miss - head 42b053833 - digest sha256:075a3e07655eeb... - run 30847047077
success	1	20	1017 / 1017	2m 55s / 5m 37s	`docker run ... @sha256:f9b0d5e...`	Aug 02, 19:54
run 30763973614 executed 1017 - ccache 166 hit / 6452 miss - head ddc59df78 - digest sha256:f9b0d5ea57035e... - run 30763973614
success	1	20	1017 / 1017	2m 54s / 5m 14s	`docker run ... @sha256:94fafb9...`	Aug 01, 19:53
run 30715307683 executed 1017 - ccache 166 hit / 6452 miss - head a1883662f - digest sha256:94fafb9795af36... - run 30715307683
success	1	20	1017 / 1017	2m 11s / 4m 32s	`docker run ... @sha256:fc81e8c...`	Jul 31, 19:52
run 30659971730 executed 1017 - ccache 166 hit / 6452 miss - head 08ef3e967 - digest sha256:fc81e8cb139c25... - run 30659971730
success	1	20	1016 / 1016	2m 58s / 5m 30s	`docker run ... @sha256:f6fbcb8...`	Jul 30, 19:50
run 30575629953 executed 1016 - ccache 166 hit / 6452 miss - head 85a277b03 - digest sha256:f6fbcb85dfc706... - run 30575629953
success	1	20	1016 / 1016	2m 54s / 5m 39s	`docker run ... @sha256:61b12a0...`	Jul 29, 19:48
run 30485158526 executed 1016 - ccache 166 hit / 6452 miss - head 0825157ae - digest sha256:61b12a0dbe354f... - run 30485158526
success	1	20	1015 / 1015	3m 19s / 5m 25s	`docker run ... @sha256:de33681...`	Jul 28, 19:50
run 30392635320 executed 1015 - ccache 166 hit / 6452 miss - head b9a1933ce - digest sha256:de3368125d7542... - run 30392635320
success	1	20	1013 / 1013	2m 52s / 5m 22s	`docker run ... @sha256:0fcc95a...`	Jul 27, 11:05
run 30259513015 executed 1013 - ccache 166 hit / 6452 miss - head 66a423a25 - digest sha256:0fcc95a50afa4c... - run 30259513015