=== Applying patches on top of PostgreSQL commit ID 0810fbb02dbe70b8a7a7bcc51580827b8bbddbdc ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Jul 22 23:04:17 UTC 2025
On branch cf/5612
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-backpatch-0001-Limit-checkpointer-requests-queue-size.patch ===
Applying: Limit checkpointer requests queue size
=== using 'git am' to apply patch ./v8-0001-Process-sync-requests-incrementally-in-AbsorbSync.patch ===
Applying: Process sync requests incrementally in AbsorbSyncRequests
Using index info to reconstruct a base tree...
M	src/backend/postmaster/checkpointer.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/postmaster/checkpointer.c
CONFLICT (content): Merge conflict in src/backend/postmaster/checkpointer.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 Process sync requests incrementally in AbsorbSyncRequests
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/postmaster/checkpointer.c
=== using patch(1) to apply patch ./v8-0001-Process-sync-requests-incrementally-in-AbsorbSync.patch ===
patching file src/backend/postmaster/checkpointer.c
Hunk #2 succeeded at 148 with fuzz 2 (offset 3 lines).
Hunk #3 FAILED at 986.
Hunk #4 succeeded at 1217 (offset 3 lines).
Hunk #5 succeeded at 1241 (offset 3 lines).
Hunk #6 succeeded at 1290 (offset 3 lines).
Hunk #7 succeeded at 1311 (offset 3 lines).
Hunk #8 succeeded at 1341 (offset 3 lines).
Hunk #9 succeeded at 1355 (offset 3 lines).
Hunk #10 succeeded at 1381 (offset 3 lines).
Hunk #11 succeeded at 1429 (offset 3 lines).
1 out of 11 hunks FAILED -- saving rejects to file src/backend/postmaster/checkpointer.c.rej
Unstaged changes after reset:
M	src/backend/postmaster/checkpointer.c
Removing src/backend/postmaster/checkpointer.c.rej
=== using 'git apply' to apply patch ./v8-0001-Process-sync-requests-incrementally-in-AbsorbSync.patch ===
Applied patch to 'src/backend/postmaster/checkpointer.c' with conflicts.
U src/backend/postmaster/checkpointer.c
diff --cc src/backend/postmaster/checkpointer.c
index 6190ebc00d7,7d235e382ec..00000000000
--- a/src/backend/postmaster/checkpointer.c
+++ b/src/backend/postmaster/checkpointer.c
@@@ -138,6 -145,9 +145,12 @@@ static CheckpointerShmemStruct *Checkpo
  /* interval for calling AbsorbSyncRequests in CheckpointWriteDelay */
  #define WRITES_PER_ABSORB		1000
  
++<<<<<<< ours
++=======
+ /* Maximum number of checkpointer requests to process in one batch */
+ #define CKPT_REQ_BATCH_SIZE 10000
+ 
++>>>>>>> theirs
  /* Max number of requests the checkpointer request queue can hold */
  #define MAX_CHECKPOINT_REQUESTS 10000000
  
@@@ -977,6 -987,7 +990,10 @@@ CheckpointerShmemInit(void
  		MemSet(CheckpointerShmem, 0, size);
  		SpinLockInit(&CheckpointerShmem->ckpt_lck);
  		CheckpointerShmem->max_requests = Min(NBuffers, MAX_CHECKPOINT_REQUESTS);
++<<<<<<< ours
++=======
+ 		CheckpointerShmem->head = CheckpointerShmem->tail = 0;
++>>>>>>> theirs
  		ConditionVariableInit(&CheckpointerShmem->start_cv);
  		ConditionVariableInit(&CheckpointerShmem->done_cv);
  	}