=== Applying patches on top of PostgreSQL commit ID b45242fd30ffa6e1e7f490cc400ecbd966880f41 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Jul 2 03:37:21 UTC 2025 === expanding ./049_slot_get_changes_wait_continously_pg17.zip Archive: ./049_slot_get_changes_wait_continously_pg17.zip extracting: 049_slot_get_changes_wait_continously_pg17.pl On branch cf/5886 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-Fix-infinite-wait-when-reading-partially-written-.patch === Applying: Fix infinite wait when reading partially written WAL record after crash === using 'git am' to apply patch ./v3_PG14-0001-Fix-infinite-wait-when-reading-partially-written-.patch === Applying: Fix infinite wait when reading partially written WAL record after crash Using index info to reconstruct a base tree... M src/backend/access/transam/xlogreader.c Falling back to patching base and 3-way merge... Auto-merging src/backend/access/transam/xlogreader.c CONFLICT (content): Merge conflict in src/backend/access/transam/xlogreader.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Fix infinite wait when reading partially written WAL record after crash When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Unstaged changes after reset: M src/backend/access/transam/xlogreader.c === using patch(1) to apply patch ./v3_PG14-0001-Fix-infinite-wait-when-reading-partially-written-.patch === patching file src/backend/access/transam/xlogreader.c Hunk #1 FAILED at 407. Hunk #2 succeeded at 788 with fuzz 2 (offset 329 lines). 1 out of 2 hunks FAILED -- saving rejects to file src/backend/access/transam/xlogreader.c.rej Unstaged changes after reset: M src/backend/access/transam/xlogreader.c Removing src/backend/access/transam/xlogreader.c.rej === using 'git apply' to apply patch ./v3_PG14-0001-Fix-infinite-wait-when-reading-partially-written-.patch === Applied patch to 'src/backend/access/transam/xlogreader.c' with conflicts. U src/backend/access/transam/xlogreader.c diff --cc src/backend/access/transam/xlogreader.c index bf4a13ba55f,11b1d8facaf..00000000000 --- a/src/backend/access/transam/xlogreader.c +++ b/src/backend/access/transam/xlogreader.c @@@ -731,9 -415,7 +731,13 @@@ restart * indefinitely for data that doesn't exist. */ readOff = ReadPageInternal(state, targetPagePtr, SizeOfXLogShortPHD); ++<<<<<<< ours + if (readOff == XLREAD_WOULDBLOCK) + return XLREAD_WOULDBLOCK; + else if (readOff < 0) ++======= + if (readOff < 0) ++>>>>>>> theirs goto err; Assert(SizeOfXLogShortPHD <= readOff); @@@ -783,9 -466,7 +787,13 @@@ readOff = ReadPageInternal(state, targetPagePtr, Min(total_len - gotlen + SizeOfXLogShortPHD, XLOG_BLCKSZ)); ++<<<<<<< ours + if (readOff == XLREAD_WOULDBLOCK) + return XLREAD_WOULDBLOCK; + else if (readOff < 0) ++======= + if (readOff < 0) ++>>>>>>> theirs goto err; /* Append the continuation from this page to the buffer */