Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f56a9de

Browse files
committed
Fix inconsistency with replay of hash squeeze record for clean buffers
aa5edbe has tweaked _hash_freeovflpage() so as the write buffer's LSN is updated only when necessary, when REGBUF_NO_CHANGE is not used. The replay code was not consistent with that, causing the write buffer's LSN to be updated and its page to be marked as dirty even if the buffer was registered in a "clean" state. This was possible for the case of a squeeze record when there are no tuples to add to the write buffer, for (is_prim_bucket_same_wrt && !is_prev_bucket_same_wrt). I have performed some validation of this commit with wal_consistency_checking and a change in WAL that logs REGBUF_NO_CHANGE to a new BKPIMAGE_*. Thanks to that, it is possible to know at replay if a buffer was clean when it was registered, then cross-checked the LSN of the "clean" page copy coming from WAL with the LSN of the block once the record has been replayed. This eats one bit in bimg_info, which is not acceptable to be integrated as-is, but it could become handy in the future. I didn't spot other areas than the one fixed by this commit at the extent of what the main regression test suite covers. As this is an oversight in aa5edbe, no backpatch is required. Reported-by: Zubeyr Eryilmaz Author: Hayato Kuroda Reviewed-by: Amit Kapila, Michael Paquier Discussion: https://postgr.es/m/ZbyVVG_7eW3YD5-A@paquier.xyz
1 parent 5392dd3 commit f56a9de

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

src/backend/access/hash/hash_xlog.c

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,7 @@ hash_xlog_squeeze_page(XLogReaderState *record)
666666
char *data;
667667
Size datalen;
668668
uint16 ninserted = 0;
669+
bool mod_wbuf = false;
669670

670671
data = begin = XLogRecGetBlockData(record, 1, &datalen);
671672

@@ -695,6 +696,17 @@ hash_xlog_squeeze_page(XLogReaderState *record)
695696

696697
ninserted++;
697698
}
699+
700+
mod_wbuf = true;
701+
}
702+
else
703+
{
704+
/*
705+
* Ensure that the required flags are set when there are no
706+
* tuples. See _hash_freeovflpage().
707+
*/
708+
Assert(xldata->is_prim_bucket_same_wrt ||
709+
xldata->is_prev_bucket_same_wrt);
698710
}
699711

700712
/*
@@ -711,10 +723,15 @@ hash_xlog_squeeze_page(XLogReaderState *record)
711723
HashPageOpaque writeopaque = HashPageGetOpaque(writepage);
712724

713725
writeopaque->hasho_nextblkno = xldata->nextblkno;
726+
mod_wbuf = true;
714727
}
715728

716-
PageSetLSN(writepage, lsn);
717-
MarkBufferDirty(writebuf);
729+
/* Set LSN and mark writebuf dirty iff it is modified */
730+
if (mod_wbuf)
731+
{
732+
PageSetLSN(writepage, lsn);
733+
MarkBufferDirty(writebuf);
734+
}
718735
}
719736

720737
/* replay the record for initializing overflow buffer */

0 commit comments

Comments
 (0)