Avoid scribbling of VACUUM options

This fixes two issues with the handling of VacuumParams in vacuum_rel().
This code path has the idea to change the passed-in pointer of
VacuumParams for the "truncate" and "index_cleanup" options for the
relation worked on, impacting the two following scenarios where
incorrect options may be used because a VacuumParams pointer is shared
across multiple relations:
- Multiple relations in a single VACUUM command.
- TOAST relations vacuumed with their main relation.

The problem is avoided by providing to the two callers of vacuum_rel()
copies of VacuumParams, before the pointer is updated for the "truncate"
and "index_cleanup" options.

The refactoring of the VACUUM option and parameters done in 0d83138974
did not introduce an issue, but it has encouraged the problem we are
dealing with in this commit, with b84dbc8eb8 for "truncate" and
a96c41feec for "index_cleanup" that have been added a couple of years
after the initial refactoring.  HEAD will be improved with a different
patch that hardens the uses of VacuumParams across the tree.  This
cannot be backpatched as it introduces an ABI breakage.

The backend portion of the patch has been authored by Nathan, while I
have implemented the tests.  The tests rely on injection points to check
the option values, making them faster, more reliable than the tests
originally proposed by Shihao, and they also provide more coverage.
This part can only be backpatched down to v17.

Reported-by: Shihao Zhong <zhong950419@gmail.com>
Author: Nathan Bossart <nathandbossart@gmail.com>
Co-authored-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://postgr.es/m/CAGRkXqTo+aK=GTy5pSc-9cy8H2F2TJvcrZ-zXEiNJj93np1UUw@mail.gmail.com
Backpatch-through: 13
master
Michael Paquier 3 days ago
parent 82015fd9bd
commit 661643deda
  1. 39
      src/backend/commands/vacuum.c
  2. 2
      src/test/modules/injection_points/Makefile
  3. 122
      src/test/modules/injection_points/expected/vacuum.out
  4. 1
      src/test/modules/injection_points/meson.build
  5. 47
      src/test/modules/injection_points/sql/vacuum.sql

@ -56,6 +56,7 @@
#include "utils/fmgroids.h"
#include "utils/guc.h"
#include "utils/guc_hooks.h"
#include "utils/injection_point.h"
#include "utils/memutils.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
@ -634,7 +635,15 @@ vacuum(List *relations, VacuumParams *params, BufferAccessStrategy bstrategy,
if (params->options & VACOPT_VACUUM)
{
if (!vacuum_rel(vrel->oid, vrel->relation, params, bstrategy))
VacuumParams params_copy;
/*
* vacuum_rel() scribbles on the parameters, so give it a copy
* to avoid affecting other relations.
*/
memcpy(&params_copy, params, sizeof(VacuumParams));
if (!vacuum_rel(vrel->oid, vrel->relation, &params_copy, bstrategy))
continue;
}
@ -2008,9 +2017,16 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
Oid save_userid;
int save_sec_context;
int save_nestlevel;
VacuumParams toast_vacuum_params;
Assert(params != NULL);
/*
* This function scribbles on the parameters, so make a copy early to
* avoid affecting the TOAST table (if we do end up recursing to it).
*/
memcpy(&toast_vacuum_params, params, sizeof(VacuumParams));
/* Begin a transaction for vacuuming this relation */
StartTransactionCommand();
@ -2191,6 +2207,15 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
}
}
#ifdef USE_INJECTION_POINTS
if (params->index_cleanup == VACOPTVALUE_AUTO)
INJECTION_POINT("vacuum-index-cleanup-auto", NULL);
else if (params->index_cleanup == VACOPTVALUE_DISABLED)
INJECTION_POINT("vacuum-index-cleanup-disabled", NULL);
else if (params->index_cleanup == VACOPTVALUE_ENABLED)
INJECTION_POINT("vacuum-index-cleanup-enabled", NULL);
#endif
/*
* Check if the vacuum_max_eager_freeze_failure_rate table storage
* parameter was specified. This overrides the GUC value.
@ -2221,6 +2246,15 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
params->truncate = VACOPTVALUE_DISABLED;
}
#ifdef USE_INJECTION_POINTS
if (params->truncate == VACOPTVALUE_AUTO)
INJECTION_POINT("vacuum-truncate-auto", NULL);
else if (params->truncate == VACOPTVALUE_DISABLED)
INJECTION_POINT("vacuum-truncate-disabled", NULL);
else if (params->truncate == VACOPTVALUE_ENABLED)
INJECTION_POINT("vacuum-truncate-enabled", NULL);
#endif
/*
* Remember the relation's TOAST relation for later, if the caller asked
* us to process it. In VACUUM FULL, though, the toast table is
@ -2299,15 +2333,12 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
*/
if (toast_relid != InvalidOid)
{
VacuumParams toast_vacuum_params;
/*
* Force VACOPT_PROCESS_MAIN so vacuum_rel() processes it. Likewise,
* set toast_parent so that the privilege checks are done on the main
* relation. NB: This is only safe to do because we hold a session
* lock on the main relation that prevents concurrent deletion.
*/
memcpy(&toast_vacuum_params, params, sizeof(VacuumParams));
toast_vacuum_params.options |= VACOPT_PROCESS_MAIN;
toast_vacuum_params.toast_parent = relid;

@ -11,7 +11,7 @@ EXTENSION = injection_points
DATA = injection_points--1.0.sql
PGFILEDESC = "injection_points - facility for injection points"
REGRESS = injection_points hashagg reindex_conc
REGRESS = injection_points hashagg reindex_conc vacuum
REGRESS_OPTS = --dlpath=$(top_builddir)/src/test/regress
ISOLATION = basic inplace syscache-update-pruned

@ -0,0 +1,122 @@
-- Tests for VACUUM
CREATE EXTENSION injection_points;
SELECT injection_points_set_local();
injection_points_set_local
----------------------------
(1 row)
SELECT injection_points_attach('vacuum-index-cleanup-auto', 'notice');
injection_points_attach
-------------------------
(1 row)
SELECT injection_points_attach('vacuum-index-cleanup-disabled', 'notice');
injection_points_attach
-------------------------
(1 row)
SELECT injection_points_attach('vacuum-index-cleanup-enabled', 'notice');
injection_points_attach
-------------------------
(1 row)
SELECT injection_points_attach('vacuum-truncate-auto', 'notice');
injection_points_attach
-------------------------
(1 row)
SELECT injection_points_attach('vacuum-truncate-disabled', 'notice');
injection_points_attach
-------------------------
(1 row)
SELECT injection_points_attach('vacuum-truncate-enabled', 'notice');
injection_points_attach
-------------------------
(1 row)
-- Check state of index_cleanup and truncate in VACUUM.
CREATE TABLE vac_tab_on_toast_off(i int, j text) WITH
(autovacuum_enabled=false,
vacuum_index_cleanup=true, toast.vacuum_index_cleanup=false,
vacuum_truncate=true, toast.vacuum_truncate=false);
CREATE TABLE vac_tab_off_toast_on(i int, j text) WITH
(autovacuum_enabled=false,
vacuum_index_cleanup=false, toast.vacuum_index_cleanup=true,
vacuum_truncate=false, toast.vacuum_truncate=true);
-- Multiple relations should use their options in isolation.
VACUUM vac_tab_on_toast_off, vac_tab_off_toast_on;
NOTICE: notice triggered for injection point vacuum-index-cleanup-enabled
NOTICE: notice triggered for injection point vacuum-truncate-enabled
NOTICE: notice triggered for injection point vacuum-index-cleanup-disabled
NOTICE: notice triggered for injection point vacuum-truncate-disabled
NOTICE: notice triggered for injection point vacuum-index-cleanup-disabled
NOTICE: notice triggered for injection point vacuum-truncate-disabled
NOTICE: notice triggered for injection point vacuum-index-cleanup-enabled
NOTICE: notice triggered for injection point vacuum-truncate-enabled
-- Check "auto" case of index_cleanup and "truncate" controlled by
-- its GUC.
CREATE TABLE vac_tab_auto(i int, j text) WITH
(autovacuum_enabled=false,
vacuum_index_cleanup=auto, toast.vacuum_index_cleanup=auto);
SET vacuum_truncate = false;
VACUUM vac_tab_auto;
NOTICE: notice triggered for injection point vacuum-index-cleanup-auto
NOTICE: notice triggered for injection point vacuum-truncate-disabled
NOTICE: notice triggered for injection point vacuum-index-cleanup-auto
NOTICE: notice triggered for injection point vacuum-truncate-disabled
SET vacuum_truncate = true;
VACUUM vac_tab_auto;
NOTICE: notice triggered for injection point vacuum-index-cleanup-auto
NOTICE: notice triggered for injection point vacuum-truncate-enabled
NOTICE: notice triggered for injection point vacuum-index-cleanup-auto
NOTICE: notice triggered for injection point vacuum-truncate-enabled
RESET vacuum_truncate;
DROP TABLE vac_tab_auto;
DROP TABLE vac_tab_on_toast_off;
DROP TABLE vac_tab_off_toast_on;
-- Cleanup
SELECT injection_points_detach('vacuum-index-cleanup-auto');
injection_points_detach
-------------------------
(1 row)
SELECT injection_points_detach('vacuum-index-cleanup-disabled');
injection_points_detach
-------------------------
(1 row)
SELECT injection_points_detach('vacuum-index-cleanup-enabled');
injection_points_detach
-------------------------
(1 row)
SELECT injection_points_detach('vacuum-truncate-auto');
injection_points_detach
-------------------------
(1 row)
SELECT injection_points_detach('vacuum-truncate-disabled');
injection_points_detach
-------------------------
(1 row)
SELECT injection_points_detach('vacuum-truncate-enabled');
injection_points_detach
-------------------------
(1 row)
DROP EXTENSION injection_points;

@ -37,6 +37,7 @@ tests += {
'injection_points',
'hashagg',
'reindex_conc',
'vacuum',
],
'regress_args': ['--dlpath', meson.build_root() / 'src/test/regress'],
# The injection points are cluster-wide, so disable installcheck

@ -0,0 +1,47 @@
-- Tests for VACUUM
CREATE EXTENSION injection_points;
SELECT injection_points_set_local();
SELECT injection_points_attach('vacuum-index-cleanup-auto', 'notice');
SELECT injection_points_attach('vacuum-index-cleanup-disabled', 'notice');
SELECT injection_points_attach('vacuum-index-cleanup-enabled', 'notice');
SELECT injection_points_attach('vacuum-truncate-auto', 'notice');
SELECT injection_points_attach('vacuum-truncate-disabled', 'notice');
SELECT injection_points_attach('vacuum-truncate-enabled', 'notice');
-- Check state of index_cleanup and truncate in VACUUM.
CREATE TABLE vac_tab_on_toast_off(i int, j text) WITH
(autovacuum_enabled=false,
vacuum_index_cleanup=true, toast.vacuum_index_cleanup=false,
vacuum_truncate=true, toast.vacuum_truncate=false);
CREATE TABLE vac_tab_off_toast_on(i int, j text) WITH
(autovacuum_enabled=false,
vacuum_index_cleanup=false, toast.vacuum_index_cleanup=true,
vacuum_truncate=false, toast.vacuum_truncate=true);
-- Multiple relations should use their options in isolation.
VACUUM vac_tab_on_toast_off, vac_tab_off_toast_on;
-- Check "auto" case of index_cleanup and "truncate" controlled by
-- its GUC.
CREATE TABLE vac_tab_auto(i int, j text) WITH
(autovacuum_enabled=false,
vacuum_index_cleanup=auto, toast.vacuum_index_cleanup=auto);
SET vacuum_truncate = false;
VACUUM vac_tab_auto;
SET vacuum_truncate = true;
VACUUM vac_tab_auto;
RESET vacuum_truncate;
DROP TABLE vac_tab_auto;
DROP TABLE vac_tab_on_toast_off;
DROP TABLE vac_tab_off_toast_on;
-- Cleanup
SELECT injection_points_detach('vacuum-index-cleanup-auto');
SELECT injection_points_detach('vacuum-index-cleanup-disabled');
SELECT injection_points_detach('vacuum-index-cleanup-enabled');
SELECT injection_points_detach('vacuum-truncate-auto');
SELECT injection_points_detach('vacuum-truncate-disabled');
SELECT injection_points_detach('vacuum-truncate-enabled');
DROP EXTENSION injection_points;
Loading…
Cancel
Save