Skip to content

Commit e935696

Browse files
committed
Avoid returning stale attribute bitmaps in RelationGetIndexAttrBitmap().
The problem with the original coding here is that we might receive (and clear) a relcache invalidation signal for the target relation down inside one of the index_open calls we're doing. Since the target is open, we would not drop the relcache entry, just reset its rd_indexvalid and rd_indexlist fields. But RelationGetIndexAttrBitmap() kept going, and would eventually cache and return potentially-obsolete attribute bitmaps. The case where this matters is where the inval signal was from a CREATE INDEX CONCURRENTLY telling us about a new index on a formerly-unindexed column. (In all other cases, the lock we hold on the target rel should prevent any concurrent change in index state.) Even just returning the stale attribute bitmap is not such a problem, because it shouldn't matter during the transaction in which we receive the signal. What hurts is caching the stale data, because it can survive into later transactions, breaking CREATE INDEX CONCURRENTLY's expectation that later transactions will not create new broken HOT chains. The upshot is that there's a window for building corrupted indexes during CREATE INDEX CONCURRENTLY. This patch fixes the problem by rechecking that the set of index OIDs is still the same at the end of RelationGetIndexAttrBitmap() as it was at the start. If not, we loop back and try again. That's a little more than is strictly necessary to fix the bug --- in principle, we could return the stale data but not cache it --- but it seems like a bad idea on general principles for relcache to return data it knows is stale. There might be more hazards of the same ilk, or there might be a better way to fix this one, but this patch definitely improves matters and seems unlikely to make anything worse. So let's push it into today's releases even as we continue to study the problem. Pavan Deolasee and myself Discussion: https://postgr.es/m/CABOikdM2MUq9cyZJi1KyLmmkCereyGp5JQ4fuwKoyKEde_mzkQ@mail.gmail.com
1 parent a7eddfa commit e935696

File tree

1 file changed

+33
-6
lines changed

1 file changed

+33
-6
lines changed

src/backend/utils/cache/relcache.c

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4191,8 +4191,10 @@ RelationGetIndexPredicate(Relation relation)
41914191
* we can include system attributes (e.g., OID) in the bitmap representation.
41924192
*
41934193
* Caller had better hold at least RowExclusiveLock on the target relation
4194-
* to ensure that it has a stable set of indexes. This also makes it safe
4195-
* (deadlock-free) for us to take locks on the relation's indexes.
4194+
* to ensure it is safe (deadlock-free) for us to take locks on the relation's
4195+
* indexes. Note that since the introduction of CREATE INDEX CONCURRENTLY,
4196+
* that lock level doesn't guarantee a stable set of indexes, so we have to
4197+
* be prepared to retry here in case of a change in the set of indexes.
41964198
*
41974199
* The returned result is palloc'd in the caller's memory context and should
41984200
* be bms_free'd when not needed anymore.
@@ -4204,6 +4206,7 @@ RelationGetIndexAttrBitmap(Relation relation, IndexAttrBitmapKind attrKind)
42044206
Bitmapset *uindexattrs; /* columns in unique indexes */
42054207
Bitmapset *idindexattrs; /* columns in the replica identity */
42064208
List *indexoidlist;
4209+
List *newindexoidlist;
42074210
Oid relreplindex;
42084211
ListCell *l;
42094212
MemoryContext oldcxt;
@@ -4229,8 +4232,9 @@ RelationGetIndexAttrBitmap(Relation relation, IndexAttrBitmapKind attrKind)
42294232
return NULL;
42304233

42314234
/*
4232-
* Get cached list of index OIDs
4235+
* Get cached list of index OIDs. If we have to start over, we do so here.
42334236
*/
4237+
restart:
42344238
indexoidlist = RelationGetIndexList(relation);
42354239

42364240
/* Fall out if no indexes (but relhasindex was set) */
@@ -4241,8 +4245,7 @@ RelationGetIndexAttrBitmap(Relation relation, IndexAttrBitmapKind attrKind)
42414245
* Copy the rd_replidindex value computed by RelationGetIndexList before
42424246
* proceeding. This is needed because a relcache flush could occur inside
42434247
* index_open below, resetting the fields managed by RelationGetIndexList.
4244-
* (The values we're computing will still be valid, assuming that caller
4245-
* has a sufficient lock on the relation.)
4248+
* We need to do the work with a stable value for relreplindex.
42464249
*/
42474250
relreplindex = relation->rd_replidindex;
42484251

@@ -4310,7 +4313,31 @@ RelationGetIndexAttrBitmap(Relation relation, IndexAttrBitmapKind attrKind)
43104313
index_close(indexDesc, AccessShareLock);
43114314
}
43124315

4313-
list_free(indexoidlist);
4316+
/*
4317+
* During one of the index_opens in the above loop, we might have received
4318+
* a relcache flush event on this relcache entry, which might have been
4319+
* signaling a change in the rel's index list. If so, we'd better start
4320+
* over to ensure we deliver up-to-date attribute bitmaps.
4321+
*/
4322+
newindexoidlist = RelationGetIndexList(relation);
4323+
if (equal(indexoidlist, newindexoidlist) &&
4324+
relreplindex == relation->rd_replidindex)
4325+
{
4326+
/* Still the same index set, so proceed */
4327+
list_free(newindexoidlist);
4328+
list_free(indexoidlist);
4329+
}
4330+
else
4331+
{
4332+
/* Gotta do it over ... might as well not leak memory */
4333+
list_free(newindexoidlist);
4334+
list_free(indexoidlist);
4335+
bms_free(uindexattrs);
4336+
bms_free(idindexattrs);
4337+
bms_free(indexattrs);
4338+
4339+
goto restart;
4340+
}
43144341

43154342
/* Don't leak the old values of these bitmaps, if any */
43164343
bms_free(relation->rd_indexattr);

0 commit comments

Comments
 (0)