Add RelationOpenSmgr() calls to ensure rd_smgr is valid when we try to

use it.  While it normally has been opened earlier during btree index
build, testing shows that it's possible for the link to be closed again
if an sinval reset occurs while the index is being built.

diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index a717591fff9dd42e00ded10830d0e0a55a6e2f45..383b5676ea1dc334ac9e3fe7ad0f90b079839ae1 100644 (file)
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -271,6 +271,9 @@ _bt_blnewpage(uint32 level)
 static void
 _bt_blwritepage(BTWriteState *wstate, Page page, BlockNumber blkno)
 {
+       /* Ensure rd_smgr is open (could have been closed by relcache flush!) */
+       RelationOpenSmgr(wstate->index);
+
        /* XLOG stuff */
        if (wstate->btws_use_wal)
        {
@@ -818,5 +821,8 @@ _bt_load(BTWriteState *wstate, BTSpool *btspool, BTSpool *btspool2)
         * occurs.
         */
        if (!wstate->index->rd_istemp)
+       {
+               RelationOpenSmgr(wstate->index);
                smgrimmedsync(wstate->index->rd_smgr);
+       }
 }