=== Applying patches on top of PostgreSQL commit ID 792094a5ce89f9953d913c835e4530e56b63026a === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Sep 2 22:57:26 UTC 2026 On branch cf/7242 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-Don-t-let-a-larger-autovacuum-freeze-weight-lower-th.patch === Applying: Don't let a larger autovacuum freeze weight lower the freeze score Using index info to reconstruct a base tree... M src/backend/postmaster/autovacuum.c Falling back to patching base and 3-way merge... Auto-merging src/backend/postmaster/autovacuum.c CONFLICT (content): Merge conflict in src/backend/postmaster/autovacuum.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 Don't let a larger autovacuum freeze weight lower the freeze score 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 ./0001-Don-t-let-a-larger-autovacuum-freeze-weight-lower-th.patch === patching file src/backend/postmaster/autovacuum.c Hunk #1 FAILED at 3210. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/postmaster/autovacuum.c.rej patching file src/test/modules/test_autovacuum/meson.build patching file src/test/modules/test_autovacuum/t/003_freeze_score.pl Unstaged changes after reset: M src/test/modules/test_autovacuum/meson.build Removing src/backend/postmaster/autovacuum.c.rej Removing src/test/modules/test_autovacuum/t/003_freeze_score.pl === using 'git apply' to apply patch ./0001-Don-t-let-a-larger-autovacuum-freeze-weight-lower-th.patch === Applied patch to 'src/backend/postmaster/autovacuum.c' with conflicts. Applied patch to 'src/test/modules/test_autovacuum/meson.build' cleanly. Falling back to direct application... U src/backend/postmaster/autovacuum.c diff --cc src/backend/postmaster/autovacuum.c index 60ebe828900,480f16b5c74..00000000000 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@@ -3210,7 -3210,12 +3210,16 @@@ relation_needs_vacanalyze(Oid relid if (autovacuum_multixact_freeze_score_weight > 1.0) effective_mxid_failsafe_age /= autovacuum_multixact_freeze_score_weight; ++<<<<<<< ours + /* We must be careful to avoid lowering the score. */ ++======= + /* + * Only apply the exponent when it increases the score. Dividing the + * effective ages by the weights above can let a score below one reach this + * point, and raising that to a power shrinks it, so a larger weight could + * otherwise demote a table that is closer to wraparound. + */ ++>>>>>>> theirs if (xid_age >= effective_xid_failsafe_age && scores->xid > 1.0) scores->xid = pow(scores->xid, Max(1.0, (double) xid_age / 100000000)); if (mxid_age >= effective_mxid_failsafe_age && scores->mxid > 1.0)