From bf8bf6d0bddbbaa9dc6c27b383f026273064d2a2 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 23 Aug 2023 18:08:40 +0300 Subject: [PATCH] Fix _bt_allequalimage() call within critical section. _bt_allequalimage() does complicated things, so it's not OK to call it in a critical section. Per buildfarm failure on 'prion', which uses -DRELCACHE_FORCE_RELEASE -DCATCACHE_FORCE_RELEASE options. Discussion: https://www.postgresql.org/message-id/6e5bbc08-cdfc-b2b3-9e23-1a914b9850a9@iki.fi Backpatch-through: 16, like commit ccadf73163 that introduced this --- src/backend/access/nbtree/nbtree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index ad07b80f75..62bc9917f1 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -151,6 +151,7 @@ bthandler(PG_FUNCTION_ARGS) void btbuildempty(Relation index) { + bool allequalimage = _bt_allequalimage(index, false); Buffer metabuf; Page metapage; @@ -169,7 +170,7 @@ btbuildempty(Relation index) START_CRIT_SECTION(); metapage = BufferGetPage(metabuf); - _bt_initmetapage(metapage, P_NONE, 0, _bt_allequalimage(index, false)); + _bt_initmetapage(metapage, P_NONE, 0, allequalimage); MarkBufferDirty(metabuf); log_newpage_buffer(metabuf, true);