aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2023-02-23 15:40:28 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2023-02-23 15:40:28 -0500
commit861e9e48601b41ab3827ba5d22990c17ed6dcf8c (patch)
tree7e5a66f0b4027e36aa1080d097456940fb3b7ffc
parent226da3d4767083b58b9d1acf67b1402865d359bf (diff)
downloadpostgresql-861e9e48601b41ab3827ba5d22990c17ed6dcf8c.tar.gz
postgresql-861e9e48601b41ab3827ba5d22990c17ed6dcf8c.zip
Don't repeatedly register cache callbacks in pgoutput plugin.
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
-rw-r--r--src/backend/replication/pgoutput/pgoutput.c24
1 files changed, 21 insertions, 3 deletions
diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
index 799242128a2..c31af57bd42 100644
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@ -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,
@@ -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);
@@ -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;
@@ -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;
}
/*