8000 Avoid scribbling of VACUUM options · postgres/postgres@c079ba3 · GitHub
[go: up one dir, main page]

Skip to content

Commit c079ba3

Browse files
committed
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 0d83138 did not introduce an issue, but it has encouraged the problem we are dealing with in this commit, with b84dbc8 for "truncate" and a96c41f 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
1 parent af2c086 commit c079ba3

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

src/backend/commands/vacuum.c

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,14 @@ vacuum(List *relations, VacuumParams *params,
473473

474474
if (params->options & VACOPT_VACUUM)
475475
{
476-
if (!vacuum_rel(vrel->oid, vrel->relation, params))
476+
VacuumParams params_copy;
477+
478+
/*
479+
* vacuum_rel() scribbles on the parameters, so give it a copy
480+
* to avoid affecting other relations.
481+
*/
482+
memcpy(&params_copy, params, sizeof(VacuumParams));
483+
if (!vacuum_rel(vrel->oid, vrel->relation, &params_copy))
477484
continue;
478485
}
479486

@@ -1839,9 +1846,16 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params)
18391846
Oid save_userid;
18401847
int save_sec_context;
18411848
int save_nestlevel;
1849+
VacuumParams toast_vacuum_params;
18421850

18431851
Assert(params != NULL);
18441852

1853+
/*
1854+
* This function scribbles on the parameters, so make a copy early to
1855+
* avoid affecting the TOAST table (if we do end up recursing to it).
1856+
*/
1857+
memcpy(&toast_vacuum_params, params, sizeof(VacuumParams));
1858+
18451859
/* Begin a transaction for vacuuming this relation */
18461860
StartTransactionCommand();
18471861

@@ -2092,7 +2106,7 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params)
20922106
* totally unimportant for toast relations.
20932107
*/
20942108
if (toast_relid != InvalidOid)
2095-
vacuum_rel(toast_relid, NULL, params);
2109+
vacuum_rel(toast_relid, NULL, &toast_vacuum_params);
20962110

20972111
/*
20982112
* Now release the session-level lock on the main table.

0 commit comments

Comments
 (0)
0