=== Applying patches on top of PostgreSQL commit ID f554a95379a9adef233d21b1e1e8981a8f5f8de3 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Mar 12 13:02:47 UTC 2025
On branch cf/5567
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Change-log-message-when-hot-standby-is-not-access.patch ===
Applying: Change log message when hot standby is not accessible
=== using 'git am' to apply patch ./v1-0001-Make-it-clear-when-hot-standby-is-inaccessible-du.patch ===
Applying: Make it clear when hot standby is inaccessible due to subtransaction overflow
Using index info to reconstruct a base tree...
M	src/backend/postmaster/postmaster.c
M	src/backend/tcop/backend_startup.c
M	src/include/tcop/backend_startup.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/tcop/backend_startup.h
CONFLICT (content): Merge conflict in src/include/tcop/backend_startup.h
Auto-merging src/backend/tcop/backend_startup.c
Auto-merging src/backend/postmaster/postmaster.c
CONFLICT (content): Merge conflict in src/backend/postmaster/postmaster.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 Make it clear when hot standby is inaccessible due to subtransaction overflow
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/postmaster.c
M	src/backend/storage/ipc/procarray.c
M	src/backend/tcop/backend_startup.c
M	src/include/storage/pmsignal.h
M	src/include/tcop/backend_startup.h
=== using patch(1) to apply patch ./v1-0001-Make-it-clear-when-hot-standby-is-inaccessible-du.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v1-0001-Make-it-clear-when-hot-standby-is-inaccessible-du.patch ===
Applied patch to 'src/backend/postmaster/postmaster.c' with conflicts.
Applied patch to 'src/backend/storage/ipc/procarray.c' cleanly.
Applied patch to 'src/backend/tcop/backend_startup.c' cleanly.
Applied patch to 'src/include/storage/pmsignal.h' cleanly.
Applied patch to 'src/include/tcop/backend_startup.h' with conflicts.
U src/backend/postmaster/postmaster.c
U src/include/tcop/backend_startup.h
diff --cc src/backend/postmaster/postmaster.c
index aafd238a7cc,5c3de3f97dd..00000000000
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@@ -1812,10 -1814,11 +1814,18 @@@ canAcceptConnections(BackendType backen
  		else if (!FatalError && pmState == PM_STARTUP)
  			return CAC_STARTUP; /* normal startup */
  		else if (!FatalError && pmState == PM_RECOVERY)
++<<<<<<< ours
 +			return CAC_NOTCONSISTENT_OR_OVERFLOWED; /* not yet at consistent
 +													 * recovery state or
 +													 * subtransaction is
 +													 * overflowed */
++=======
+ 			return CAC_NOTCONSISTENT;	/* not yet at consistent recovery
+ 										 * state */
+ 		else if (!FatalError && pmState == PM_SNAPSHOT_PENDING)
+ 			return CAC_SNAPSHOT_PENDING;	/* waiting for non-overflowed
+ 											 * snapshot */
++>>>>>>> theirs
  		else
  			return CAC_RECOVERY;	/* else must be crash recovery */
  	}
diff --cc src/include/tcop/backend_startup.h
index 6580efcfbd4,866a3b7cd2c..00000000000
--- a/src/include/tcop/backend_startup.h
+++ b/src/include/tcop/backend_startup.h
@@@ -29,7 -29,8 +29,12 @@@ typedef enum CAC_stat
  	CAC_STARTUP,
  	CAC_SHUTDOWN,
  	CAC_RECOVERY,
++<<<<<<< ours
 +	CAC_NOTCONSISTENT_OR_OVERFLOWED,
++=======
+ 	CAC_NOTCONSISTENT,
+ 	CAC_SNAPSHOT_PENDING,
++>>>>>>> theirs
  	CAC_TOOMANY,
  } CAC_state;