mirror of
https://github.com/postgres/postgres.git
synced 2025-07-31 22:04:40 +03:00
Replace RelationOpenSmgr() with RelationGetSmgr().
This is a back-patch of the v15-era commitf10f0ae42
into older supported branches. The idea is to design out bugs in which an ill-timed relcache flush clears rel->rd_smgr partway through some code sequence that wasn't expecting that. We had another report today of a corner case that reliably crashes v14 under debug_discard_caches (nee CLOBBER_CACHE_ALWAYS), and therefore would crash once in a blue moon in the field. We're unlikely to get rid of all such code paths unless we adopt the more rigorous coding rules instituted byf10f0ae42
. Therefore, even though this is a bit invasive, it's time to back-patch. Some comfort can be taken in the fact thatf10f0ae42
has been in v15 for 16 months without problems. I left the RelationOpenSmgr macro present in the back branches, even though no core code should use it anymore, in order to not break third-party extensions in minor releases. Such extensions might opt to start using RelationGetSmgr instead, to reduce their code differential between v15 and earlier branches. This carries a hazard of failing to compile against headers from existing minor releases. However, once compiled the extension should work fine even with such releases, because RelationGetSmgr is a "static inline" function so it creates no link-time dependency. So depending on distribution practices, that might be an OK tradeoff. Per report from Spyridon Dimitrios Agathos. Original patch by Amul Sul. Discussion: https://postgr.es/m/CAFM5RaqdgyusQvmWkyPYaWMwoK5gigdtW-7HcgHgOeAw7mqJ_Q@mail.gmail.com Discussion: https://postgr.es/m/CANiYTQsU7yMFpQYnv=BrcRVqK_3U3mtAzAsJCaqtzsDHfsUbdQ@mail.gmail.com
This commit is contained in:
@ -518,15 +518,13 @@ autoprewarm_database_main(Datum main_arg)
|
||||
old_blk->filenode != blk->filenode ||
|
||||
old_blk->forknum != blk->forknum)
|
||||
{
|
||||
RelationOpenSmgr(rel);
|
||||
|
||||
/*
|
||||
* smgrexists is not safe for illegal forknum, hence check whether
|
||||
* the passed forknum is valid before using it in smgrexists.
|
||||
*/
|
||||
if (blk->forknum > InvalidForkNumber &&
|
||||
blk->forknum <= MAX_FORKNUM &&
|
||||
smgrexists(rel->rd_smgr, blk->forknum))
|
||||
smgrexists(RelationGetSmgr(rel), blk->forknum))
|
||||
nblocks = RelationGetNumberOfBlocksInFork(rel, blk->forknum);
|
||||
else
|
||||
nblocks = 0;
|
||||
|
Reference in New Issue
Block a user