pg_rewind does not rewind diverging timelines

back to CI dashboard

3 patchsets tracked - current t139522_33

v33t139522_33posted 1 day agosuccessappliesrecent 0dpg 20
base9e17d25e7 about 11 hours ago on master
applyapplied about 5 hours ago
rebaselast tried about 5 hours ago on 9e17d25e7
pushabout 5 hours ago -> e97a17a2fbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201036 / 10362m 12s / 4m 28sdocker run ... :t139522about 4 hours ago
run 35509160483
executed 1036 - ccache 98 hit / 6524 miss - head e97a17a2f - digest sha256:050e8fbcd88d9a... - run 35509160483
success1201036 / 10362m 53s / 5m 31sdocker run ... @sha256:a44de13...1 day ago
run 35441351567
executed 1036 - ccache 98 hit / 6524 miss - head 001998aaf - digest sha256:a44de135cd6ff4... - run 35441351567
v20t139522_20posted Jul 26, 05:11successsupersededstale 4mopg 19
basecd857dec0 May 29, 19:26 - 113 days / 1055 commits behind master (from history)
applyapplied Jul 28, 21:43
rebaselast tried Jul 28, 21:43 on 239eabda4
Applying: pg_rewind: use UUIDs to detect independent same-TLI promotions
Using index info to reconstruct a base tree...
M	src/backend/access/transam/timeline.c
M	src/backend/access/transam/xlog.c
M	src/backend/utils/adt/uuid.c
M	src/bin/pg_rewind/pg_rewind.c
M	src/include/access/timeline.h
M	src/include/access/xlog_internal.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/access/xlog_internal.h
Auto-merging src/include/access/timeline.h
CONFLICT (content): Merge conflict in src/include/access/timeline.h
Auto-merging src/bin/pg_rewind/pg_rewind.c
Auto-merging src/backend/utils/adt/uuid.c
Auto-merging src/backend/access/transam/xlog.c
Auto-merging src/backend/access/transam/timeline.c
CONFLICT (content): Merge conflict in src/backend/access/transam/timeline.c
Patch failed at 0001 pg_rewind: use UUIDs to detect independent same-TLI promotions

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/include/access/timeline.h, src/backend/access/transam/timeline.c
pushJul 28, 21:43 -> 016e3439cbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1191005 / 10052m 56s / 5m 10sdocker run ... @sha256:8dcdaf8...Jul 28, 21:54
run 30401802242
executed 1005 - ccache 145 hit / 6474 miss - head 016e3439c - digest sha256:8dcdaf8f5d0363... - run 30401802242
v10t139522_10posted May 30, 20:26successsupersededstale 4mopg 19
base01a80f062 May 24, 04:33 - 119 days / 1102 commits behind master (from history)
applyapplied Jul 26, 07:18
pushJul 26, 23:42 -> f7d79eb85branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1191003 / 10032m 49s / 4m 54sdocker run ... @sha256:8803b38...Jul 26, 23:52
run 30225823633
executed 1003 - ccache 145 hit / 6474 miss - head f7d79eb85 - digest sha256:8803b387f79e0f... - run 30225823633