Skip to content

Commit

Permalink
Don't repeatedly register cache callbacks in pgoutput plugin.
Browse files Browse the repository at this point in the history
Multiple cycles of starting up and shutting down the plugin within a
single session would eventually lead to "out of relcache_callback_list
slots", because pgoutput_startup blindly re-registered its cache
callbacks each time.  Fix it to register them only once, as all other
users of cache callbacks already take care to do.

This has been broken all along, so back-patch to all supported branches.

Shi Yu

Discussion: https://postgr.es/m/OSZPR01MB631004A78D743D68921FFAD3FDA79@OSZPR01MB6310.jpnprd01.prod.outlook.com
  • Loading branch information
tglsfdc committed Feb 23, 2023
1 parent 226da3d commit 861e9e4
Showing 1 changed file with 21 additions and 3 deletions.
24 changes: 21 additions & 3 deletions src/backend/replication/pgoutput/pgoutput.c
Expand Up @@ -182,6 +182,7 @@ pgoutput_startup(LogicalDecodingContext *ctx, OutputPluginOptions *opt,
bool is_init)
{
PGOutputData *data = palloc0(sizeof(PGOutputData));
static bool publication_callback_registered = false;

/* Create our memory context for private allocations. */
data->context = AllocSetContextCreate(ctx->context,
Expand Down Expand Up @@ -226,9 +227,18 @@ pgoutput_startup(LogicalDecodingContext *ctx, OutputPluginOptions *opt,
/* Init publication state. */
data->publications = NIL;
publications_valid = false;
CacheRegisterSyscacheCallback(PUBLICATIONOID,
publication_invalidation_cb,
(Datum) 0);

/*
* Register callback for pg_publication if we didn't already do that
* during some previous call in this process.
*/
if (!publication_callback_registered)
{
CacheRegisterSyscacheCallback(PUBLICATIONOID,
publication_invalidation_cb,
(Datum) 0);
publication_callback_registered = true;
}

/* Initialize relation schema cache. */
init_rel_sync_cache(CacheMemoryContext);
Expand Down Expand Up @@ -636,8 +646,10 @@ static void
init_rel_sync_cache(MemoryContext cachectx)
{
HASHCTL ctl;
static bool relation_callbacks_registered = false;
MemoryContext old_ctxt;

/* Nothing to do if hash table already exists */
if (RelationSyncCache != NULL)
return;

Expand All @@ -655,10 +667,16 @@ init_rel_sync_cache(MemoryContext cachectx)

Assert(RelationSyncCache != NULL);

/* No more to do if we already registered callbacks */
if (relation_callbacks_registered)
return;

CacheRegisterRelcacheCallback(rel_sync_cache_relation_cb, (Datum) 0);
CacheRegisterSyscacheCallback(PUBLICATIONRELMAP,
rel_sync_cache_publication_cb,
(Datum) 0);

relation_callbacks_registered = true;
}

/*
Expand Down

0 comments on commit 861e9e4

Please sign in to comment.