=== Applying patches on top of PostgreSQL commit ID 993368113c432832862db29f927c206dab0c0b8a === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Mar 30 21:59:24 UTC 2026 On branch cf/6607 nothing to commit, working tree clean === using 'git am' to apply patch ./pg_stat_tablespace_final_v3.patch === Applying: Add pg_stat_tablespace statistics view Using index info to reconstruct a base tree... M src/backend/storage/buffer/bufmgr.c M src/include/catalog/pg_proc.dat M src/include/utils/pgstat_internal.h Falling back to patching base and 3-way merge... Auto-merging src/include/utils/pgstat_internal.h Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/storage/buffer/bufmgr.c CONFLICT (content): Merge conflict in src/backend/storage/buffer/bufmgr.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 Add pg_stat_tablespace statistics view 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 ./pg_stat_tablespace_final_v3.patch === patching file doc/src/sgml/monitoring.sgml patching file src/backend/catalog/system_views.sql patching file src/backend/commands/tablespace.c patching file src/backend/storage/buffer/bufmgr.c Hunk #1 succeeded at 1808 (offset -29 lines). Hunk #2 succeeded at 1816 (offset -29 lines). Hunk #3 FAILED at 1927. Hunk #4 succeeded at 2136 (offset 41 lines). Hunk #5 succeeded at 2794 (offset 40 lines). Hunk #6 succeeded at 3018 (offset 47 lines). Hunk #7 succeeded at 4506 with fuzz 2 (offset 47 lines). Hunk #8 succeeded at 4599 (offset 39 lines). 1 out of 8 hunks FAILED -- saving rejects to file src/backend/storage/buffer/bufmgr.c.rej patching file src/backend/storage/file/fd.c patching file src/backend/utils/activity/Makefile patching file src/backend/utils/activity/meson.build patching file src/backend/utils/activity/pgstat.c patching file src/backend/utils/activity/pgstat_database.c patching file src/backend/utils/activity/pgstat_relation.c patching file src/backend/utils/activity/pgstat_tablespace.c patching file src/backend/utils/adt/pgstatfuncs.c patching file src/include/catalog/pg_proc.dat patching file src/include/pgstat.h patching file src/include/utils/backend_status.h patching file src/include/utils/pgstat_internal.h patching file src/include/utils/pgstat_kind.h patching file src/test/regress/expected/rules.out patching file src/test/regress/expected/stats.out patching file src/test/regress/sql/stats.sql Unstaged changes after reset: M doc/src/sgml/monitoring.sgml M src/backend/catalog/system_views.sql M src/backend/commands/tablespace.c M src/backend/storage/buffer/bufmgr.c M src/backend/storage/file/fd.c M src/backend/utils/activity/Makefile M src/backend/utils/activity/meson.build M src/backend/utils/activity/pgstat.c M src/backend/utils/activity/pgstat_database.c M src/backend/utils/activity/pgstat_relation.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/include/pgstat.h M src/include/utils/backend_status.h M src/include/utils/pgstat_internal.h M src/include/utils/pgstat_kind.h M src/test/regress/expected/rules.out M src/test/regress/expected/stats.out M src/test/regress/sql/stats.sql Removing src/backend/storage/buffer/bufmgr.c.rej Removing src/backend/utils/activity/pgstat_tablespace.c === using 'git apply' to apply patch ./pg_stat_tablespace_final_v3.patch === Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/commands/tablespace.c' cleanly. Applied patch to 'src/backend/storage/buffer/bufmgr.c' with conflicts. Applied patch to 'src/backend/storage/file/fd.c' cleanly. Applied patch to 'src/backend/utils/activity/Makefile' cleanly. Applied patch to 'src/backend/utils/activity/meson.build' cleanly. Applied patch to 'src/backend/utils/activity/pgstat.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_database.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_relation.c' cleanly. Falling back to direct application... Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/pgstat.h' cleanly. Applied patch to 'src/include/utils/backend_status.h' cleanly. Applied patch to 'src/include/utils/pgstat_internal.h' cleanly. Applied patch to 'src/include/utils/pgstat_kind.h' cleanly. Applied patch to 'src/test/regress/expected/rules.out' cleanly. Applied patch to 'src/test/regress/expected/stats.out' cleanly. Applied patch to 'src/test/regress/sql/stats.sql' cleanly. U src/backend/storage/buffer/bufmgr.c diff --cc src/backend/storage/buffer/bufmgr.c index cd21ae3fc36,f4a3c99a726..00000000000 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@@ -1926,8 -1927,7 +1933,12 @@@ AsyncReadBuffers(ReadBuffersOperation * void *io_pages[MAX_IO_COMBINE_LIMIT]; IOContext io_context; IOObject io_object; ++<<<<<<< ours + instr_time io_start; + StartBufferIOResult status; ++======= + instr_time io_start, io_time; ++>>>>>>> theirs if (persistence == RELPERSISTENCE_TEMP) { @@@ -4485,8 -4459,9 +4510,8 @@@ FlushBuffer(BufferDesc *buf, SMgrRelati { XLogRecPtr recptr; ErrorContextCallback errcallback; - instr_time io_start; + instr_time io_start, io_time; Block bufBlock; - char *bufToWrite; Assert(BufferLockHeldByMeInMode(buf, BUFFER_LOCK_EXCLUSIVE) || BufferLockHeldByMeInMode(buf, BUFFER_LOCK_SHARE_EXCLUSIVE));