=== Applying patches on top of PostgreSQL commit ID 01261fb07888642efa98ba8d4117654bfd2a413d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Mar 14 06:05:28 UTC 2025
On branch cf/5479
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-Introduce-reserved-background-worker-slots.patch ===
Applying: Introduce reserved background worker slots.
=== using 'git am' to apply patch ./v3-0002-Introduce-bgtask-infrastructure-to-perform-tasks-.patch ===
Applying: Introduce bgtask, infrastructure to perform tasks in background.
=== using 'git am' to apply patch ./v3-0003-PoC-Convert-wal_level-a-PGC_SIGHUP-parameter.patch ===
Applying: PoC: Convert wal_level a PGC_SIGHUP parameter.
error: sha1 information is lacking or useless (src/backend/postmaster/postmaster.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 PoC: Convert wal_level a PGC_SIGHUP parameter.
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".
=== using patch(1) to apply patch ./v3-0003-PoC-Convert-wal_level-a-PGC_SIGHUP-parameter.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 ./v3-0003-PoC-Convert-wal_level-a-PGC_SIGHUP-parameter.patch ===
Applied patch to 'src/backend/access/rmgrdesc/xlogdesc.c' cleanly.
Applied patch to 'src/backend/access/transam/Makefile' cleanly.
Applied patch to 'src/backend/access/transam/meson.build' cleanly.
Applied patch to 'src/backend/access/transam/xlog.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogfuncs.c' cleanly.
Falling back to direct application...
Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly.
Applied patch to 'src/backend/commands/publicationcmds.c' cleanly.
Applied patch to 'src/backend/postmaster/checkpointer.c' cleanly.
Applied patch to 'src/backend/postmaster/pgarch.c' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/backend/replication/logical/decode.c' cleanly.
Applied patch to 'src/backend/replication/logical/logical.c' cleanly.
Applied patch to 'src/backend/replication/logical/slotsync.c' cleanly.
Applied patch to 'src/backend/replication/slot.c' with conflicts.
Applied patch to 'src/backend/replication/walsender.c' cleanly.
Applied patch to 'src/backend/storage/ipc/ipci.c' cleanly.
Applied patch to 'src/backend/storage/ipc/procsignal.c' cleanly.
Applied patch to 'src/backend/storage/ipc/standby.c' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/backend/utils/misc/bgtask.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'src/bin/pg_controldata/pg_controldata.c' cleanly.
Applied patch to 'src/include/access/xlog.h' cleanly.
Applied patch to 'src/include/catalog/pg_control.h' cleanly.
Applied patch to 'src/include/postmaster/pgarch.h' cleanly.
Applied patch to 'src/include/replication/walsender.h' cleanly.
Applied patch to 'src/include/storage/lwlocklist.h' cleanly.
Applied patch to 'src/include/storage/procsignal.h' cleanly.
Applied patch to 'src/include/utils/bgtask.h' cleanly.
Applied patch to 'src/include/utils/guc_hooks.h' cleanly.
U src/backend/replication/slot.c
diff --cc src/backend/replication/slot.c
index 719e531eb90,b092008ce56..00000000000
--- a/src/backend/replication/slot.c
+++ b/src/backend/replication/slot.c
@@@ -2521,30 -2360,13 +2521,40 @@@ RestoreSlotFromDisk(const char *name
  	 * NB: Changing the requirements here also requires adapting
  	 * CheckSlotRequirements() and CheckLogicalDecodingRequirements().
  	 */
++<<<<<<< ours
 +	if (cp.slotdata.database != InvalidOid)
 +	{
 +		if (wal_level < WAL_LEVEL_LOGICAL)
 +			ereport(FATAL,
 +					(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 +					 errmsg("logical replication slot \"%s\" exists, but \"wal_level\" < \"logical\"",
 +							NameStr(cp.slotdata.name)),
 +					 errhint("Change \"wal_level\" to be \"logical\" or higher.")));
 +
 +		/*
 +		 * In standby mode, the hot standby must be enabled. This check is
 +		 * necessary to ensure logical slots are invalidated when they become
 +		 * incompatible due to insufficient wal_level. Otherwise, if the
 +		 * primary reduces wal_level < logical while hot standby is disabled,
 +		 * logical slots would remain valid even after promotion.
 +		 */
 +		if (StandbyMode && !EnableHotStandby)
 +			ereport(FATAL,
 +					(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 +					 errmsg("logical replication slot \"%s\" exists on the standby, but \"hot_standby\" = \"off\"",
 +							NameStr(cp.slotdata.name)),
 +					 errhint("Change \"hot_standby\" to be \"on\".")));
 +	}
 +	else if (wal_level < WAL_LEVEL_REPLICA)
++=======
+ 	if (cp.slotdata.database != InvalidOid && GetActiveWalLevel() < WAL_LEVEL_LOGICAL)
+ 		ereport(FATAL,
+ 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+ 				 errmsg("logical replication slot \"%s\" exists, but \"wal_level\" < \"logical\"",
+ 						NameStr(cp.slotdata.name)),
+ 				 errhint("Change \"wal_level\" to be \"logical\" or higher.")));
+ 	else if (GetActiveWalLevel() < WAL_LEVEL_REPLICA)
++>>>>>>> theirs
  		ereport(FATAL,
  				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
  				 errmsg("physical replication slot \"%s\" exists, but \"wal_level\" < \"replica\"",