allow spread checkpoints when changing checksums online
2 patchsets tracked - current t139550_14
v14t139550_14posted Jul 13, 12:32successwon't retrystale 2mopg 20
base842169b6c Jul 08, 17:33 - 73 days / 722 commits behind master (from history)
applyapplied Jul 28, 22:45
rebaselast tried Aug 08, 04:13 on b59783502
Applying: Allow using spread checkpoints when enabling/disabling checksums Using index info to reconstruct a base tree... M src/backend/access/transam/xlog.c M src/backend/postmaster/datachecksum_state.c M src/include/catalog/pg_proc.dat Falling back to patching base and 3-way merge... Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/postmaster/datachecksum_state.c CONFLICT (content): Merge conflict in src/backend/postmaster/datachecksum_state.c Auto-merging src/backend/access/transam/xlog.c Patch failed at 0001 Allow using spread checkpoints when enabling/disabling checksums 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/postmaster/datachecksum_state.c
pushJul 28, 22:45 -> fb76108b8branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1008 / 1008 | 2m 28s / 5m 05s | docker run ... :t139550 | Jul 28, 22:57 |
run 30405711657executed 1008 - ccache 625 hit / 5995 miss - head fb76108b8 - digest sha256:600dbefaf4809e... - run 30405711657 | ||||||
v1t139550_1posted May 04, 13:42successsupersededstale 5mopg 19
base1df361e3d Apr 30, 11:41 - 142 days / 1252 commits behind master (from history)
applyapplied Jul 26, 07:19
pushJul 27, 00:46 -> a21ee2899branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 998 / 998 | 2m 48s / 5m 17s | docker run ... @sha256:b092522... | Jul 27, 00:57 |
run 30228239249executed 998 - ccache 78 hit / 6540 miss - head a21ee2899 - digest sha256:b09252295ccd03... - run 30228239249 | ||||||