diff options
author | Thomas Munro <tmunro@postgresql.org> | 2023-07-03 16:20:01 +1200 |
---|---|---|
committer | Thomas Munro <tmunro@postgresql.org> | 2023-07-04 09:10:37 +1200 |
commit | d34aa0a2f4f36e25d49d43cd1836e20f9c96899e (patch) | |
tree | 20f8f165bc948c18c13a44bf6e59e7a28752d1f8 /src/backend/access/gin/ginfast.c | |
parent | ab265e98500bfbc70b39c18a13b8ae43b34d5721 (diff) | |
download | postgresql-d34aa0a2f4f36e25d49d43cd1836e20f9c96899e.tar.gz postgresql-d34aa0a2f4f36e25d49d43cd1836e20f9c96899e.zip |
Fix race in SSI interaction with gin fast path.
The ginfast.c code previously checked for conflicts in before locking
the relevant buffer, leaving a window where a RW conflict could be
missed. Re-order.
There was also a place where buffer ID and block number were confused
while trying to predicate-lock a page, noted by visual inspection.
Back-patch to all supported releases. Fixes one more problem discovered
with the reproducer from bug #17949, in this case when Dmitry tried
other index types.
Reported-by: Artem Anisimov <artem.anisimov.255@gmail.com>
Reported-by: Dmitry Dolgov <9erthalion6@gmail.com>
Reviewed-by: Heikki Linnakangas <hlinnaka@iki.fi>
Discussion: https://postgr.es/m/17949-a0f17035294a55e2%40postgresql.org
Diffstat (limited to 'src/backend/access/gin/ginfast.c')
-rw-r--r-- | src/backend/access/gin/ginfast.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c index 7c8794bcd42..5cf150ac8e0 100644 --- a/src/backend/access/gin/ginfast.c +++ b/src/backend/access/gin/ginfast.c @@ -245,9 +245,10 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector) /* * An insertion to the pending list could logically belong anywhere in the * tree, so it conflicts with all serializable scans. All scans acquire a - * predicate lock on the metabuffer to represent that. + * predicate lock on the metabuffer to represent that. Therefore we'll + * check for conflicts in, but not until we have the page locked and are + * ready to modify the page. */ - CheckForSerializableConflictIn(index, NULL, GIN_METAPAGE_BLKNO); if (collector->sumsize + collector->ntuples * sizeof(ItemIdData) > GinListPageSize) { @@ -291,6 +292,8 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector) LockBuffer(metabuffer, GIN_EXCLUSIVE); metadata = GinPageGetMeta(metapage); + CheckForSerializableConflictIn(index, NULL, GIN_METAPAGE_BLKNO); + if (metadata->head == InvalidBlockNumber) { /* @@ -353,6 +356,8 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector) char *ptr; char *collectordata; + CheckForSerializableConflictIn(index, NULL, GIN_METAPAGE_BLKNO); + buffer = ReadBuffer(index, metadata->tail); LockBuffer(buffer, GIN_EXCLUSIVE); page = BufferGetPage(buffer); |