=== Applying patches on top of PostgreSQL commit ID 9d7e851a2118286f123fd8cfc699e3db9318fba8 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Nov 9 07:55:24 UTC 2025 On branch cf/5323 nothing to commit, working tree clean === using 'git am' to apply patch ./v20251105-0001-Online-enabling-and-disabling-of-data-chec.patch === Applying: Online enabling and disabling of data checksums Using index info to reconstruct a base tree... M doc/src/sgml/glossary.sgml M doc/src/sgml/monitoring.sgml M src/backend/access/transam/xlog.c M src/backend/access/transam/xlogfuncs.c M src/backend/access/transam/xlogrecovery.c M src/backend/backup/basebackup.c M src/backend/catalog/system_views.sql M src/backend/postmaster/postmaster.c M src/backend/storage/ipc/ipci.c M src/backend/utils/activity/wait_event_names.txt M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/misc/guc_tables.c M src/include/catalog/pg_proc.dat M src/include/storage/lwlocklist.h M src/test/regress/expected/rules.out M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list Auto-merging src/test/regress/expected/rules.out Auto-merging src/include/storage/lwlocklist.h CONFLICT (content): Merge conflict in src/include/storage/lwlocklist.h Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/misc/guc_tables.c Auto-merging src/backend/utils/adt/pgstatfuncs.c Auto-merging src/backend/utils/activity/wait_event_names.txt CONFLICT (content): Merge conflict in src/backend/utils/activity/wait_event_names.txt Auto-merging src/backend/storage/ipc/ipci.c CONFLICT (content): Merge conflict in src/backend/storage/ipc/ipci.c Auto-merging src/backend/postmaster/postmaster.c Auto-merging src/backend/catalog/system_views.sql Auto-merging src/backend/backup/basebackup.c Auto-merging src/backend/access/transam/xlogrecovery.c Auto-merging src/backend/access/transam/xlogfuncs.c Auto-merging src/backend/access/transam/xlog.c Auto-merging doc/src/sgml/monitoring.sgml Auto-merging doc/src/sgml/glossary.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 Online enabling and disabling of data checksums 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/func/func-admin.sgml M doc/src/sgml/glossary.sgml M doc/src/sgml/monitoring.sgml M doc/src/sgml/ref/pg_checksums.sgml M doc/src/sgml/regress.sgml M doc/src/sgml/wal.sgml M src/backend/access/rmgrdesc/xlogdesc.c M src/backend/access/transam/xlog.c M src/backend/access/transam/xlogfuncs.c M src/backend/access/transam/xlogrecovery.c M src/backend/backup/basebackup.c M src/backend/catalog/system_functions.sql M src/backend/catalog/system_views.sql M src/backend/postmaster/Makefile M src/backend/postmaster/auxprocess.c M src/backend/postmaster/bgworker.c M src/backend/postmaster/meson.build M src/backend/postmaster/postmaster.c M src/backend/replication/logical/decode.c M src/backend/storage/ipc/ipci.c M src/backend/storage/ipc/procsignal.c M src/backend/storage/page/README M src/backend/storage/page/bufpage.c M src/backend/utils/activity/pgstat_backend.c M src/backend/utils/activity/pgstat_io.c M src/backend/utils/activity/wait_event_names.txt M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/init/miscinit.c M src/backend/utils/init/postinit.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/guc_tables.c M src/bin/pg_checksums/pg_checksums.c M src/bin/pg_controldata/pg_controldata.c M src/bin/pg_upgrade/controldata.c M src/include/access/xlog.h M src/include/access/xlog_internal.h M src/include/catalog/pg_control.h M src/include/catalog/pg_proc.dat M src/include/commands/progress.h M src/include/miscadmin.h M src/include/postmaster/proctypelist.h M src/include/storage/bufpage.h M src/include/storage/checksum.h M src/include/storage/lwlocklist.h M src/include/storage/proc.h M src/include/storage/procsignal.h M src/include/utils/backend_progress.h M src/test/modules/Makefile M src/test/modules/meson.build M src/test/perl/PostgreSQL/Test/Cluster.pm M src/test/regress/expected/rules.out M src/test/regress/expected/stats.out M src/tools/pgindent/typedefs.list Removing src/backend/postmaster/datachecksumsworker.c Removing src/include/postmaster/datachecksumsworker.h Removing src/test/modules/test_checksums/ === using patch(1) to apply patch ./v20251105-0001-Online-enabling-and-disabling-of-data-chec.patch === patching file doc/src/sgml/func/func-admin.sgml patching file doc/src/sgml/glossary.sgml Hunk #1 succeeded at 199 (offset 15 lines). Hunk #2 succeeded at 590 (offset 15 lines). patching file doc/src/sgml/monitoring.sgml Hunk #1 succeeded at 3562 (offset 11 lines). Hunk #2 succeeded at 3574 (offset 11 lines). Hunk #3 succeeded at 6958 (offset 11 lines). patching file doc/src/sgml/ref/pg_checksums.sgml patching file doc/src/sgml/regress.sgml patching file doc/src/sgml/wal.sgml patching file src/backend/access/rmgrdesc/xlogdesc.c patching file src/backend/access/transam/xlog.c Hunk #1 succeeded at 287 (offset 1 line). Hunk #2 succeeded at 556 (offset 1 line). Hunk #3 succeeded at 582 (offset 1 line). Hunk #4 succeeded at 694 (offset 1 line). Hunk #5 succeeded at 792 (offset 1 line). Hunk #6 succeeded at 908 (offset 1 line). Hunk #7 succeeded at 924 (offset 1 line). Hunk #8 succeeded at 4333 (offset 1 line). Hunk #9 succeeded at 4663 (offset 1 line). Hunk #10 succeeded at 4699 (offset 1 line). Hunk #11 succeeded at 5397 (offset 1 line). Hunk #12 succeeded at 5567 (offset 1 line). Hunk #13 succeeded at 6713 (offset 1 line). Hunk #14 succeeded at 7051 (offset 7 lines). Hunk #15 succeeded at 7615 (offset 7 lines). Hunk #16 succeeded at 7876 (offset 7 lines). Hunk #17 succeeded at 8022 (offset 7 lines). Hunk #18 succeeded at 8367 (offset 7 lines). Hunk #19 succeeded at 8782 (offset 7 lines). Hunk #20 succeeded at 9236 (offset 7 lines). patching file src/backend/access/transam/xlogfuncs.c patching file src/backend/access/transam/xlogrecovery.c Hunk #1 succeeded at 783 (offset 1 line). Hunk #2 succeeded at 1670 (offset 1 line). Hunk #3 succeeded at 1681 (offset 1 line). Hunk #4 succeeded at 1700 (offset 1 line). patching file src/backend/backup/basebackup.c patching file src/backend/catalog/system_functions.sql patching file src/backend/catalog/system_views.sql patching file src/backend/postmaster/Makefile patching file src/backend/postmaster/auxprocess.c patching file src/backend/postmaster/bgworker.c patching file src/backend/postmaster/datachecksumsworker.c patching file src/backend/postmaster/meson.build patching file src/backend/postmaster/postmaster.c patching file src/backend/replication/logical/decode.c patching file src/backend/storage/ipc/ipci.c Hunk #1 succeeded at 31 (offset 1 line). Hunk #2 FAILED at 152. Hunk #3 succeeded at 318 (offset -16 lines). 1 out of 3 hunks FAILED -- saving rejects to file src/backend/storage/ipc/ipci.c.rej patching file src/backend/storage/ipc/procsignal.c patching file src/backend/storage/page/README patching file src/backend/storage/page/bufpage.c patching file src/backend/utils/activity/pgstat_backend.c patching file src/backend/utils/activity/pgstat_io.c patching file src/backend/utils/activity/wait_event_names.txt Hunk #1 succeeded at 118 (offset 2 lines). Hunk #2 FAILED at 358. 1 out of 2 hunks FAILED -- saving rejects to file src/backend/utils/activity/wait_event_names.txt.rej patching file src/backend/utils/adt/pgstatfuncs.c patching file src/backend/utils/init/miscinit.c patching file src/backend/utils/init/postinit.c patching file src/backend/utils/misc/guc_parameters.dat patching file src/backend/utils/misc/guc_tables.c patching file src/bin/pg_checksums/pg_checksums.c patching file src/bin/pg_controldata/pg_controldata.c patching file src/bin/pg_upgrade/controldata.c patching file src/include/access/xlog.h patching file src/include/access/xlog_internal.h patching file src/include/catalog/pg_control.h patching file src/include/catalog/pg_proc.dat patching file src/include/commands/progress.h patching file src/include/miscadmin.h patching file src/include/postmaster/datachecksumsworker.h patching file src/include/postmaster/proctypelist.h patching file src/include/storage/bufpage.h patching file src/include/storage/checksum.h patching file src/include/storage/lwlocklist.h Hunk #1 FAILED at 85. 1 out of 1 hunk FAILED -- saving rejects to file src/include/storage/lwlocklist.h.rej patching file src/include/storage/proc.h patching file src/include/storage/procsignal.h patching file src/include/utils/backend_progress.h patching file src/test/modules/Makefile patching file src/test/modules/meson.build patching file src/test/modules/test_checksums/.gitignore patching file src/test/modules/test_checksums/Makefile patching file src/test/modules/test_checksums/README patching file src/test/modules/test_checksums/meson.build patching file src/test/modules/test_checksums/t/001_basic.pl patching file src/test/modules/test_checksums/t/002_restarts.pl patching file src/test/modules/test_checksums/t/003_standby_restarts.pl patching file src/test/modules/test_checksums/t/004_offline.pl patching file src/test/modules/test_checksums/t/005_injection.pl patching file src/test/modules/test_checksums/t/006_pgbench_single.pl patching file src/test/modules/test_checksums/t/007_pgbench_standby.pl patching file src/test/modules/test_checksums/t/DataChecksums/Utils.pm patching file src/test/modules/test_checksums/test_checksums--1.0.sql patching file src/test/modules/test_checksums/test_checksums.c patching file src/test/modules/test_checksums/test_checksums.control patching file src/test/perl/PostgreSQL/Test/Cluster.pm patching file src/test/regress/expected/rules.out patching file src/test/regress/expected/stats.out patching file src/tools/pgindent/typedefs.list Hunk #3 succeeded at 4262 (offset 5 lines). Unstaged changes after reset: M doc/src/sgml/func/func-admin.sgml M doc/src/sgml/glossary.sgml M doc/src/sgml/monitoring.sgml M doc/src/sgml/ref/pg_checksums.sgml M doc/src/sgml/regress.sgml M doc/src/sgml/wal.sgml M src/backend/access/rmgrdesc/xlogdesc.c M src/backend/access/transam/xlog.c M src/backend/access/transam/xlogfuncs.c M src/backend/access/transam/xlogrecovery.c M src/backend/backup/basebackup.c M src/backend/catalog/system_functions.sql M src/backend/catalog/system_views.sql M src/backend/postmaster/Makefile M src/backend/postmaster/auxprocess.c M src/backend/postmaster/bgworker.c M src/backend/postmaster/meson.build M src/backend/postmaster/postmaster.c M src/backend/replication/logical/decode.c M src/backend/storage/ipc/ipci.c M src/backend/storage/ipc/procsignal.c M src/backend/storage/page/README M src/backend/storage/page/bufpage.c M src/backend/utils/activity/pgstat_backend.c M src/backend/utils/activity/pgstat_io.c M src/backend/utils/activity/wait_event_names.txt M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/init/miscinit.c M src/backend/utils/init/postinit.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/guc_tables.c M src/bin/pg_checksums/pg_checksums.c M src/bin/pg_controldata/pg_controldata.c M src/bin/pg_upgrade/controldata.c M src/include/access/xlog.h M src/include/access/xlog_internal.h M src/include/catalog/pg_control.h M src/include/catalog/pg_proc.dat M src/include/commands/progress.h M src/include/miscadmin.h M src/include/postmaster/proctypelist.h M src/include/storage/bufpage.h M src/include/storage/checksum.h M src/include/storage/proc.h M src/include/storage/procsignal.h M src/include/utils/backend_progress.h M src/test/modules/Makefile M src/test/modules/meson.build M src/test/perl/PostgreSQL/Test/Cluster.pm M src/test/regress/expected/rules.out M src/test/regress/expected/stats.out M src/tools/pgindent/typedefs.list Removing src/backend/postmaster/datachecksumsworker.c Removing src/backend/storage/ipc/ipci.c.rej Removing src/backend/utils/activity/wait_event_names.txt.rej Removing src/include/postmaster/datachecksumsworker.h Removing src/include/storage/lwlocklist.h.rej Removing src/test/modules/test_checksums/ === using 'git apply' to apply patch ./v20251105-0001-Online-enabling-and-disabling-of-data-chec.patch === Applied patch to 'doc/src/sgml/func/func-admin.sgml' cleanly. Applied patch to 'doc/src/sgml/glossary.sgml' cleanly. Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/pg_checksums.sgml' cleanly. Applied patch to 'doc/src/sgml/regress.sgml' cleanly. Applied patch to 'doc/src/sgml/wal.sgml' cleanly. Applied patch to 'src/backend/access/rmgrdesc/xlogdesc.c' cleanly. Applied patch to 'src/backend/access/transam/xlog.c' cleanly. Applied patch to 'src/backend/access/transam/xlogfuncs.c' cleanly. Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly. Applied patch to 'src/backend/backup/basebackup.c' cleanly. Applied patch to 'src/backend/catalog/system_functions.sql' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/postmaster/Makefile' cleanly. Applied patch to 'src/backend/postmaster/auxprocess.c' cleanly. Applied patch to 'src/backend/postmaster/bgworker.c' cleanly. Falling back to direct application... Applied patch to 'src/backend/postmaster/meson.build' cleanly. Applied patch to 'src/backend/postmaster/postmaster.c' cleanly. Applied patch to 'src/backend/replication/logical/decode.c' cleanly. Applied patch to 'src/backend/storage/ipc/ipci.c' with conflicts. Applied patch to 'src/backend/storage/ipc/procsignal.c' cleanly. Applied patch to 'src/backend/storage/page/README' cleanly. Applied patch to 'src/backend/storage/page/bufpage.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_backend.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_io.c' cleanly. Applied patch to 'src/backend/utils/activity/wait_event_names.txt' with conflicts. Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly. Applied patch to 'src/backend/utils/init/miscinit.c' cleanly. Applied patch to 'src/backend/utils/init/postinit.c' cleanly. Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly. Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly. Applied patch to 'src/bin/pg_checksums/pg_checksums.c' cleanly. Applied patch to 'src/bin/pg_controldata/pg_controldata.c' cleanly. Applied patch to 'src/bin/pg_upgrade/controldata.c' cleanly. Applied patch to 'src/include/access/xlog.h' cleanly. Applied patch to 'src/include/access/xlog_internal.h' cleanly. Applied patch to 'src/include/catalog/pg_control.h' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/commands/progress.h' cleanly. Applied patch to 'src/include/miscadmin.h' cleanly. Falling back to direct application... Applied patch to 'src/include/postmaster/proctypelist.h' cleanly. Applied patch to 'src/include/storage/bufpage.h' cleanly. Applied patch to 'src/include/storage/checksum.h' cleanly. Applied patch to 'src/include/storage/lwlocklist.h' with conflicts. Applied patch to 'src/include/storage/proc.h' cleanly. Applied patch to 'src/include/storage/procsignal.h' cleanly. Applied patch to 'src/include/utils/backend_progress.h' cleanly. Applied patch to 'src/test/modules/Makefile' cleanly. Applied patch to 'src/test/modules/meson.build' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/perl/PostgreSQL/Test/Cluster.pm' 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/tools/pgindent/typedefs.list' cleanly. U src/backend/storage/ipc/ipci.c U src/backend/utils/activity/wait_event_names.txt U src/include/storage/lwlocklist.h diff --cc src/backend/storage/ipc/ipci.c index b23d0c19360,44213d140ae..00000000000 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@@ -139,7 -152,7 +141,11 @@@ CalculateShmemSize(void size = add_size(size, InjectionPointShmemSize()); size = add_size(size, SlotSyncShmemSize()); size = add_size(size, AioShmemSize()); ++<<<<<<< ours + size = add_size(size, WaitLSNShmemSize()); ++======= + size = add_size(size, DataChecksumsWorkerShmemSize()); ++>>>>>>> theirs /* include additional requested shmem from preload libraries */ size = add_size(size, total_addin_request); diff --cc src/backend/utils/activity/wait_event_names.txt index c1ac71ff7f2,430178c699c..00000000000 --- a/src/backend/utils/activity/wait_event_names.txt +++ b/src/backend/utils/activity/wait_event_names.txt @@@ -357,7 -358,7 +360,11 @@@ DSMRegistry "Waiting to read or update InjectionPoint "Waiting to read or update information related to injection points." SerialControl "Waiting to read or update shared pg_serial state." AioWorkerSubmissionQueue "Waiting to access AIO worker submission queue." ++<<<<<<< ours +WaitLSN "Waiting to read or update shared Wait-for-LSN state." ++======= + DataChecksumsWorker "Waiting for data checksumsworker." ++>>>>>>> theirs # # END OF PREDEFINED LWLOCKS (DO NOT CHANGE THIS LINE) diff --cc src/include/storage/lwlocklist.h index 5b0ce383408,b8f7ba0be51..00000000000 --- a/src/include/storage/lwlocklist.h +++ b/src/include/storage/lwlocklist.h @@@ -85,7 -85,7 +85,11 @@@ PG_LWLOCK(50, DSMRegistry PG_LWLOCK(51, InjectionPoint) PG_LWLOCK(52, SerialControl) PG_LWLOCK(53, AioWorkerSubmissionQueue) ++<<<<<<< ours +PG_LWLOCK(54, WaitLSN) ++======= + PG_LWLOCK(54, DataChecksumsWorker) ++>>>>>>> theirs /* * There also exist several built-in LWLock tranches. As with the predefined