pg_rewind does not rewind diverging timelines

back to CI dashboard

3 patchsets tracked - current t139522_33

v33t139522_33posted Sep 19, 11:51successwon't retrystale 30dpg 20
base219334a22 Oct 22, 05:15 on master
applyapplied Oct 22, 05:32
rebaselast tried 2 days ago on 4a26e36f8
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
Falling back to patching base and 3-way merge...
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/backend/access/transam/timeline.c
pushOct 22, 05:32 -> 6171a4186branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201049 / 10492m 09s / 4m 55sdocker run ... :t139522Oct 22, 05:42
run 39728635138
executed 1049 - ccache 78 hit / 6544 miss - head 6171a4186 - digest sha256:0f7e94853c470b... - run 39728635138
success1201049 / 10493m 07s / 5m 50sdocker run ... @sha256:0e95ec2...Oct 21, 05:44
run 39550119645
executed 1049 - ccache 78 hit / 6544 miss - head dcabf5714 - digest sha256:0e95ec276d4a7c... - run 39550119645
success1201049 / 10492m 53s / 5m 19sdocker run ... @sha256:e322f79...Oct 20, 05:22
run 39373619828
executed 1049 - ccache 78 hit / 6544 miss - head 8cba972cb - digest sha256:e322f792085e39... - run 39373619828
success1201049 / 10491m 47s / 4m 07sdocker run ... @sha256:3dc561b...Oct 19, 05:13
run 39202736583
executed 1049 - ccache 78 hit / 6544 miss - head 4d296c3ac - digest sha256:3dc561bbec0434... - run 39202736583
success1201049 / 10492m 29s / 4m 47sdocker run ... @sha256:d308b43...Oct 17, 23:40
run 39079268662
executed 1049 - ccache 78 hit / 6544 miss - head ec6b7ccad - digest sha256:d308b435bbdfae... - run 39079268662
success1201049 / 10492m 55s / 5m 43sdocker run ... @sha256:06742e8...Oct 16, 23:40
run 38981656464
executed 1049 - ccache 78 hit / 6544 miss - head c575a2730 - digest sha256:06742e831e3d4f... - run 38981656464
success1201049 / 10493m 00s / 5m 50sdocker run ... @sha256:dbed87c...Oct 15, 23:39
run 38823722802
executed 1049 - ccache 78 hit / 6544 miss - head c206ff448 - digest sha256:dbed87c959c44f... - run 38823722802
success1201047 / 10472m 51s / 5m 35sdocker run ... @sha256:fa3c707...Oct 14, 23:36
run 38653986261
executed 1047 - ccache 78 hit / 6544 miss - head 8b95e889f - digest sha256:fa3c707b588b86... - run 38653986261
success1201044 / 10442m 15s / 4m 41sdocker run ... @sha256:3092a85...Oct 13, 23:33
run 38483989557
executed 1044 - ccache 78 hit / 6544 miss - head 00a7876c0 - digest sha256:3092a85e395f0d... - run 38483989557
success1201044 / 10442m 56s / 5m 57sdocker run ... @sha256:b95ad5f...Oct 12, 23:34
run 38321841255
executed 1044 - ccache 78 hit / 6544 miss - head 6acd04d88 - digest sha256:b95ad5f5023599... - run 38321841255
success1201044 / 10442m 41s / 4m 51sdocker run ... @sha256:e0b7c04...Oct 11, 23:31
run 38183968730
executed 1044 - ccache 78 hit / 6544 miss - head d53ec6cfb - digest sha256:e0b7c04d8abf50... - run 38183968730
success1201044 / 10441m 51s / 4m 31sdocker run ... @sha256:8dd6456...Oct 10, 23:27
run 38094591693
executed 1044 - ccache 78 hit / 6544 miss - head 0dab87d20 - digest sha256:8dd64568c704fb... - run 38094591693
success1201043 / 10432m 54s / 5m 19sdocker run ... @sha256:f7457b3...Oct 09, 23:27
run 38003644154
executed 1043 - ccache 78 hit / 6544 miss - head 1f75c165c - digest sha256:f7457b356e235c... - run 38003644154
success1201043 / 10431m 50s / 4m 13sdocker run ... @sha256:fe8a3af...Oct 08, 23:24
run 37858450441
executed 1043 - ccache 78 hit / 6544 miss - head 8b808d1a0 - digest sha256:fe8a3afaf1f48f... - run 37858450441
success1201042 / 10422m 54s / 5m 18sdocker run ... @sha256:58b34b6...Oct 07, 23:10
run 37699577780
executed 1042 - ccache 78 hit / 6544 miss - head 44c47cab3 - digest sha256:58b34b6065fa75... - run 37699577780
success1201040 / 10402m 14s / 5m 01sdocker run ... @sha256:9f8ed1d...Oct 06, 23:07
run 37543785739
executed 1040 - ccache 78 hit / 6544 miss - head 1db2ed420 - digest sha256:9f8ed1d0755319... - run 37543785739
success1201039 / 10392m 17s / 4m 47sdocker run ... @sha256:81a5ffd...Oct 05, 23:05
run 37385509630
executed 1039 - ccache 78 hit / 6544 miss - head 86f13d4e2 - digest sha256:81a5ffdd50bf59... - run 37385509630
success1201039 / 10392m 56s / 5m 17sdocker run ... @sha256:602b4cd...Oct 04, 23:04
run 37241766469
executed 1039 - ccache 78 hit / 6544 miss - head d3aa235a0 - digest sha256:602b4cd46658d3... - run 37241766469
success1201039 / 10391m 47s / 4m 18sdocker run ... @sha256:6e477f1...Oct 03, 23:01
run 37159939659
executed 1039 - ccache 78 hit / 6544 miss - head 2876dd2c2 - digest sha256:6e477f117f5c46... - run 37159939659
success1201039 / 10392m 53s / 5m 11sdocker run ... @sha256:cd93682...Oct 02, 23:02
run 37074712183
executed 1039 - ccache 78 hit / 6544 miss - head 1b181619c - digest sha256:cd93682ed65a68... - run 37074712183
success1201039 / 10392m 08s / 4m 27sdocker run ... @sha256:52c25de...Oct 01, 22:59
run 36937493023
executed 1039 - ccache 78 hit / 6544 miss - head 2b36375b8 - digest sha256:52c25de1be28c6... - run 36937493023
success1201039 / 10392m 20s / 4m 23sdocker run ... @sha256:4a0d0b9...Sep 30, 22:57
run 36787644336
executed 1039 - ccache 78 hit / 6544 miss - head b3e6655e2 - digest sha256:4a0d0b94660b99... - run 36787644336
success1201039 / 10392m 41s / 4m 42sdocker run ... @sha256:50431c3...Sep 29, 22:56
run 36641486595
executed 1039 - ccache 78 hit / 6544 miss - head 399a891c1 - digest sha256:50431c3cc874cf... - run 36641486595
success1201039 / 10392m 54s / 5m 25sdocker run ... @sha256:ed3a330...Sep 28, 22:54
run 36494076346
executed 1039 - ccache 78 hit / 6544 miss - head d3b3338a9 - digest sha256:ed3a330649b83f... - run 36494076346
success1201039 / 10392m 54s / 5m 34sdocker run ... @sha256:f945211...Sep 27, 22:51
run 36356113443
executed 1039 - ccache 78 hit / 6544 miss - head 3d0ae7716 - digest sha256:f9452115b571e8... - run 36356113443
success1201039 / 10392m 53s / 5m 20sdocker run ... @sha256:d30cc57...Sep 26, 18:09
run 36260695484
executed 1039 - ccache 78 hit / 6544 miss - head 9e409c22e - digest sha256:d30cc57839bc1b... - run 36260695484
success1201039 / 10392m 00s / 3m 57sdocker run ... @sha256:8a349cc...Sep 25, 17:49
run 36168662489
executed 1039 - ccache 78 hit / 6544 miss - head e6ba5cf93 - digest sha256:8a349ccdfb3886... - run 36168662489
success1201038 / 10382m 55s / 5m 17sdocker run ... @sha256:04782a9...Sep 24, 17:50
run 36035811395
executed 1038 - ccache 78 hit / 6544 miss - head a75bb16e9 - digest sha256:04782a91a75d33... - run 36035811395
success1201036 / 10361m 53s / 4m 16sdocker run ... @sha256:6c3553b...Sep 23, 17:46
run 35896915719
executed 1036 - ccache 98 hit / 6524 miss - head 908c1b548 - digest sha256:6c3553bcdf83c6... - run 35896915719
success1201036 / 10362m 49s / 4m 45sdocker run ... @sha256:7fbf3df...Sep 22, 17:45
run 35761645941
executed 1036 - ccache 98 hit / 6524 miss - head 4de47ed64 - digest sha256:7fbf3df69b28fc... - run 35761645941
success1201036 / 10362m 53s / 5m 19sdocker run ... @sha256:869e8f5...Sep 21, 17:36
run 35631947463
executed 1036 - ccache 98 hit / 6524 miss - head 2939333d3 - digest sha256:869e8f55fed16f... - run 35631947463
success1201036 / 10362m 12s / 4m 28sdocker run ... @sha256:050e8fb...Sep 20, 12:04
run 35509160483
executed 1036 - ccache 98 hit / 6524 miss - head e97a17a2f - digest sha256:050e8fbcd88d9a... - run 35509160483
success1201036 / 10362m 53s / 5m 31sdocker run ... @sha256:a44de13...Sep 19, 12:04
run 35441351567
executed 1036 - ccache 98 hit / 6524 miss - head 001998aaf - digest sha256:a44de135cd6ff4... - run 35441351567
v20t139522_20posted Jul 26, 05:11successsupersededstale 6mopg 19
basecd857dec0 May 29, 19:26 - 175 days / 1718 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 6mopg 19
base01a80f062 May 24, 04:33 - 181 days / 1765 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