diff options
| author | Noah Misch <noah@leadboat.com> | 2020-03-21 09:38:26 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2020-03-21 09:38:35 -0700 |
| commit | 978da2a95597c97c52b14a27ba29873051ffc59d (patch) | |
| tree | 77dd257401417baa79df53b8e3736b0bb16ec145 | |
| parent | 96dffcdd5bae39fc6ffdd968a9d24b70ee8495b0 (diff) | |
| download | postgresql-978da2a95597c97c52b14a27ba29873051ffc59d.tar.gz postgresql-978da2a95597c97c52b14a27ba29873051ffc59d.zip | |
During heap rebuild, lock any TOAST index until end of transaction.
swap_relation_files() calls toast_get_valid_index() to find and lock
this index, just before swapping with the rebuilt TOAST index. The
latter function releases the lock before returning. Potential for
mischief is low; a concurrent session can issue ALTER INDEX ... SET
(fillfactor = ...), which is not alarming. Nonetheless, changing
pg_class.relfilenode without a lock is unconventional. Back-patch to
9.5 (all supported versions), because another fix needs this.
Discussion: https://postgr.es/m/20191226001521.GA1772687@rfd.leadboat.com
| -rw-r--r-- | src/backend/access/heap/tuptoaster.c | 4 | ||||
| -rw-r--r-- | src/backend/commands/cluster.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c index 0fa3c4132b3..e8eea1b9a3f 100644 --- a/src/backend/access/heap/tuptoaster.c +++ b/src/backend/access/heap/tuptoaster.c @@ -1377,8 +1377,8 @@ toast_get_valid_index(Oid toastoid, LOCKMODE lock) validIndexOid = RelationGetRelid(toastidxs[validIndex]); /* Close the toast relation and all its indexes */ - toast_close_indexes(toastidxs, num_indexes, lock); - heap_close(toastrel, lock); + toast_close_indexes(toastidxs, num_indexes, NoLock); + heap_close(toastrel, NoLock); return validIndexOid; } diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 9c91f2c31f7..1c90f8c3382 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -1614,7 +1614,7 @@ finish_heap_swap(Oid OIDOldHeap, Oid OIDNewHeap, /* Get the associated valid index to be renamed */ toastidx = toast_get_valid_index(newrel->rd_rel->reltoastrelid, - AccessShareLock); + NoLock); /* rename the toast table ... */ snprintf(NewToastName, NAMEDATALEN, "pg_toast_%u", |