Offline data checksum changes can cause incorrect checksum state on standbys

back to CI dashboard

1 patchset tracked - current t253388_1

v1t253388_1posted Aug 12, 07:55successneeds rebaserecent 5dpg 20
base92e20d4a4 6 days ago on master
applyapplied 6 days ago
rebaselast tried about 18 hours ago on f20c42783
Applying: Keep offline data checksum changes local
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlog.c
M	src/include/catalog/pg_control.h
M	src/test/modules/test_checksums/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/test_checksums/meson.build
CONFLICT (content): Merge conflict in src/test/modules/test_checksums/meson.build
Auto-merging src/include/catalog/pg_control.h
CONFLICT (content): Merge conflict in src/include/catalog/pg_control.h
Auto-merging src/backend/access/transam/xlog.c
CONFLICT (content): Merge conflict in src/backend/access/transam/xlog.c
Patch failed at 0001 Keep offline data checksum changes local

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/modules/test_checksums/meson.build, src/include/catalog/pg_control.h, src/backend/access/transam/xlog.c
push6 days ago -> 6c171bfa6branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201021 / 10212m 48s / 5m 21sdocker run ... :t2533886 days ago
run 32114586468
executed 1021 - ccache 98 hit / 6524 miss - head 6c171bfa6 - digest sha256:052092ada16dd7... - run 32114586468
success1201020 / 10202m 53s / 5m 30sdocker run ... @sha256:b897154...7 days ago
run 32008583443
executed 1020 - ccache 98 hit / 6524 miss - head d8ca1ff21 - digest sha256:b8971546d97dc8... - run 32008583443
success1201020 / 10202m 57s / 5m 41sdocker run ... @sha256:4529c75...Aug 16, 08:15
run 31935430376
executed 1020 - ccache 98 hit / 6524 miss - head 3697a5500 - digest sha256:4529c75215879a... - run 31935430376
success1201020 / 10202m 56s / 5m 34sdocker run ... @sha256:dd3e974...Aug 15, 08:17
run 31873423041
executed 1020 - ccache 98 hit / 6524 miss - head c6a078192 - digest sha256:dd3e974c1f0d47... - run 31873423041
success1201020 / 10202m 49s / 5m 27sdocker run ... @sha256:41776f0...Aug 14, 08:13
run 31782095530
executed 1020 - ccache 165 hit / 6457 miss - head c995c1348 - digest sha256:41776f0a3fe109... - run 31782095530
success1201020 / 10202m 39s / 4m 27sdocker run ... @sha256:c80087a...Aug 13, 08:10
run 31679996376
executed 1020 - ccache 165 hit / 6457 miss - head 0407d764f - digest sha256:c80087a2386d71... - run 31679996376
success1201020 / 10202m 52s / 5m 14sdocker run ... @sha256:3ee9fe4...Aug 12, 08:15
run 31576146314
executed 1020 - ccache 165 hit / 6454 miss - head 2b11a7f48 - digest sha256:3ee9fe4b4146b3... - run 31576146314