Fix corruption of local buffer state during extend of temp relation
authorMichael Paquier <michael@paquier.xyz>
Fri, 5 Jan 2024 11:10:46 +0000 (20:10 +0900)
committerMichael Paquier <michael@paquier.xyz>
Fri, 5 Jan 2024 11:10:46 +0000 (20:10 +0900)
A typo has been introduced by 31966b151e6a when updating the state of a
local buffer when a temporary relation is extended, for the case of a
block included in the relation range extended, when it is already found
in the hash table holding the local buffers.  In this case, BM_VALID
should be cleared, but the buffer state was changed so as BM_VALID
remained while clearing the other flags.

As reported on the thread, it was possible to corrupt the state of the
local buffers on ENOSPC, but the states would be corrupted on any kind
of ERROR during the relation extend (like partial writes or some other
errno).

Reported-by: Alexander Lakhin
Author: Tender Wang
Reviewed-by: Richard Guo, Alexander Lakhin, Michael Paquier
Discussion: https://postgr.es/m/18259-6e256429825dd435@postgresql.org
Backpatch-through: 16

src/backend/storage/buffer/localbuf.c

index 567b8d15ef0aa6d4b0e223595b320e60011d4fa2..55953c3e3e8c5ac116dd1235325cbcf948131b5c 100644 (file)
@@ -377,7 +377,7 @@ ExtendBufferedRelLocal(BufferManagerRelation bmr,
            hash_search(LocalBufHash, (void *) &tag, HASH_ENTER, &found);
        if (found)
        {
-           BufferDesc *existing_hdr = GetLocalBufferDescriptor(hresult->id);
+           BufferDesc *existing_hdr;
            uint32      buf_state;
 
            UnpinLocalBuffer(BufferDescriptorGetBuffer(victim_buf_hdr));
@@ -389,7 +389,7 @@ ExtendBufferedRelLocal(BufferManagerRelation bmr,
            buf_state = pg_atomic_read_u32(&existing_hdr->state);
            Assert(buf_state & BM_TAG_VALID);
            Assert(!(buf_state & BM_DIRTY));
-           buf_state &= BM_VALID;
+           buf_state &= ~BM_VALID;
            pg_atomic_unlocked_write_u32(&existing_hdr->state, buf_state);
        }
        else