=== Applying patches on top of PostgreSQL commit ID 0ef891e54175c6646a132bc00e330ff64edb9888 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Aug 7 12:39:22 UTC 2025 On branch cf/5913 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-aio-Try-repeatedly-to-give-batched-IOs-to-workers.patch === Applying: aio: Try repeatedly to give batched IOs to workers. === using 'git am' to apply patch ./v2-0002-aio-Adjust-IO-worker-pool-size-automatically.patch === Applying: aio: Adjust IO worker pool size automatically. Using index info to reconstruct a base tree... M doc/src/sgml/config.sgml M src/backend/postmaster/postmaster.c M src/backend/utils/activity/wait_event_names.txt M src/include/storage/lwlocklist.h Falling back to patching base and 3-way merge... Auto-merging src/include/storage/lwlocklist.h CONFLICT (content): Merge conflict in src/include/storage/lwlocklist.h Auto-merging src/backend/utils/activity/wait_event_names.txt Auto-merging src/backend/postmaster/postmaster.c Auto-merging doc/src/sgml/config.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 aio: Adjust IO worker pool size automatically. 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 doc/src/sgml/config.sgml M src/backend/postmaster/postmaster.c M src/backend/storage/aio/method_worker.c M src/backend/utils/activity/wait_event_names.txt M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/include/storage/io_worker.h M src/include/storage/lwlocklist.h M src/include/storage/pmsignal.h M src/test/modules/test_aio/t/002_io_workers.pl === using patch(1) to apply patch ./v2-0002-aio-Adjust-IO-worker-pool-size-automatically.patch === patching file doc/src/sgml/config.sgml patching file src/backend/postmaster/postmaster.c Hunk #3 succeeded at 3767 (offset 7 lines). Hunk #4 succeeded at 4381 (offset 7 lines). Hunk #5 succeeded at 4412 (offset 7 lines). Hunk #6 succeeded at 4435 (offset 7 lines). Hunk #7 succeeded at 4456 (offset 7 lines). patching file src/backend/storage/aio/method_worker.c patching file src/backend/utils/activity/wait_event_names.txt patching file src/backend/utils/misc/guc_tables.c patching file src/backend/utils/misc/postgresql.conf.sample patching file src/include/storage/io_worker.h patching file src/include/storage/lwlocklist.h Hunk #1 FAILED at 84. 1 out of 1 hunk FAILED -- saving rejects to file src/include/storage/lwlocklist.h.rej patching file src/include/storage/pmsignal.h patching file src/test/modules/test_aio/t/002_io_workers.pl Unstaged changes after reset: M doc/src/sgml/config.sgml M src/backend/postmaster/postmaster.c M src/backend/storage/aio/method_worker.c M src/backend/utils/activity/wait_event_names.txt M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/include/storage/io_worker.h M src/include/storage/pmsignal.h M src/test/modules/test_aio/t/002_io_workers.pl Removing src/include/storage/lwlocklist.h.rej === using 'git apply' to apply patch ./v2-0002-aio-Adjust-IO-worker-pool-size-automatically.patch === Applied patch to 'doc/src/sgml/config.sgml' cleanly. Applied patch to 'src/backend/postmaster/postmaster.c' cleanly. Applied patch to 'src/backend/storage/aio/method_worker.c' cleanly. Applied patch to 'src/backend/utils/activity/wait_event_names.txt' cleanly. Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly. Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly. Applied patch to 'src/include/storage/io_worker.h' cleanly. Applied patch to 'src/include/storage/lwlocklist.h' with conflicts. Applied patch to 'src/include/storage/pmsignal.h' cleanly. Applied patch to 'src/test/modules/test_aio/t/002_io_workers.pl' cleanly. U src/include/storage/lwlocklist.h diff --cc src/include/storage/lwlocklist.h index 208d2e3a8ed,c1801d08833..00000000000 --- a/src/include/storage/lwlocklist.h +++ b/src/include/storage/lwlocklist.h @@@ -85,53 -84,4 +85,57 @@@ PG_LWLOCK(50, DSMRegistry PG_LWLOCK(51, InjectionPoint) PG_LWLOCK(52, SerialControl) PG_LWLOCK(53, AioWorkerSubmissionQueue) ++<<<<<<< ours + +/* + * There also exist several built-in LWLock tranches. As with the predefined + * LWLocks, be sure to update the WaitEventLWLock section of + * src/backend/utils/activity/wait_event_names.txt when modifying this list. + * + * Note that the IDs here (the first value) don't include the LWTRANCHE_ + * prefix. It's added elsewhere. + */ +PG_LWLOCKTRANCHE(XACT_BUFFER, XactBuffer) +PG_LWLOCKTRANCHE(COMMITTS_BUFFER, CommitTsBuffer) +PG_LWLOCKTRANCHE(SUBTRANS_BUFFER, SubtransBuffer) +PG_LWLOCKTRANCHE(MULTIXACTOFFSET_BUFFER, MultiXactOffsetBuffer) +PG_LWLOCKTRANCHE(MULTIXACTMEMBER_BUFFER, MultiXactMemberBuffer) +PG_LWLOCKTRANCHE(NOTIFY_BUFFER, NotifyBuffer) +PG_LWLOCKTRANCHE(SERIAL_BUFFER, SerialBuffer) +PG_LWLOCKTRANCHE(WAL_INSERT, WALInsert) +PG_LWLOCKTRANCHE(BUFFER_CONTENT, BufferContent) +PG_LWLOCKTRANCHE(REPLICATION_ORIGIN_STATE, ReplicationOriginState) +PG_LWLOCKTRANCHE(REPLICATION_SLOT_IO, ReplicationSlotIO) +PG_LWLOCKTRANCHE(LOCK_FASTPATH, LockFastPath) +PG_LWLOCKTRANCHE(BUFFER_MAPPING, BufferMapping) +PG_LWLOCKTRANCHE(LOCK_MANAGER, LockManager) +PG_LWLOCKTRANCHE(PREDICATE_LOCK_MANAGER, PredicateLockManager) +PG_LWLOCKTRANCHE(PARALLEL_HASH_JOIN, ParallelHashJoin) +PG_LWLOCKTRANCHE(PARALLEL_BTREE_SCAN, ParallelBtreeScan) +PG_LWLOCKTRANCHE(PARALLEL_QUERY_DSA, ParallelQueryDSA) +PG_LWLOCKTRANCHE(PER_SESSION_DSA, PerSessionDSA) +PG_LWLOCKTRANCHE(PER_SESSION_RECORD_TYPE, PerSessionRecordType) +PG_LWLOCKTRANCHE(PER_SESSION_RECORD_TYPMOD, PerSessionRecordTypmod) +PG_LWLOCKTRANCHE(SHARED_TUPLESTORE, SharedTupleStore) +PG_LWLOCKTRANCHE(SHARED_TIDBITMAP, SharedTidBitmap) +PG_LWLOCKTRANCHE(PARALLEL_APPEND, ParallelAppend) +PG_LWLOCKTRANCHE(PER_XACT_PREDICATE_LIST, PerXactPredicateList) +PG_LWLOCKTRANCHE(PGSTATS_DSA, PgStatsDSA) +PG_LWLOCKTRANCHE(PGSTATS_HASH, PgStatsHash) +PG_LWLOCKTRANCHE(PGSTATS_DATA, PgStatsData) +PG_LWLOCKTRANCHE(LAUNCHER_DSA, LogicalRepLauncherDSA) +PG_LWLOCKTRANCHE(LAUNCHER_HASH, LogicalRepLauncherHash) +PG_LWLOCKTRANCHE(DSM_REGISTRY_DSA, DSMRegistryDSA) +PG_LWLOCKTRANCHE(DSM_REGISTRY_HASH, DSMRegistryHash) +PG_LWLOCKTRANCHE(COMMITTS_SLRU, CommitTsSLRU) +PG_LWLOCKTRANCHE(MULTIXACTOFFSET_SLRU, MultiXactOffsetSLRU) +PG_LWLOCKTRANCHE(MULTIXACTMEMBER_SLRU, MultiXactMemberSLRU) +PG_LWLOCKTRANCHE(NOTIFY_SLRU, NotifySLRU) +PG_LWLOCKTRANCHE(SERIAL_SLRU, SerialSLRU) +PG_LWLOCKTRANCHE(SUBTRANS_SLRU, SubtransSLRU) +PG_LWLOCKTRANCHE(XACT_SLRU, XactSLRU) +PG_LWLOCKTRANCHE(PARALLEL_VACUUM_DSA, ParallelVacuumDSA) +PG_LWLOCKTRANCHE(AIO_URING_COMPLETION, AioUringCompletion) ++======= + PG_LWLOCK(54, AioWorkerControl) ++>>>>>>> theirs