Avoid catalog read via superuser() call in DecrementSharedConnectionCounter

marcoslot · marcoslot · commit 6d6e44166f58 · 2022-07-29T14:05:41.000+02:00
diff --git a/src/backend/distributed/connection/shared_connection_stats.c b/src/backend/distributed/connection/shared_connection_stats.c
@@ -420,7 +420,7 @@ IncrementSharedConnectionCounter(const char *hostname, int port)
 {
 	SharedConnStatsHashKey connKey;
 
-	if (GetMaxSharedPoolSize() == DISABLE_CONNECTION_THROTTLING)
+	if (MaxSharedPoolSize == DISABLE_CONNECTION_THROTTLING)
 	{
 		/* connection throttling disabled */
 		return;
@@ -484,7 +484,11 @@ DecrementSharedConnectionCounter(const char *hostname, int port)
 {
 	SharedConnStatsHashKey connKey;
 
-	if (GetMaxSharedPoolSize() == DISABLE_CONNECTION_THROTTLING)
+	/*
+	 * Do not call GetMaxSharedPoolSize() here, since it may read from
+	 * the catalog and we may be in the process exit handler.
+	 */
+	if (MaxSharedPoolSize == DISABLE_CONNECTION_THROTTLING)
 	{
 		/* connection throttling disabled */
 		return;

Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ IncrementSharedConnectionCounter(const char *hostname, int port)`
`420`	`420`	`{`
`421`	`421`	`SharedConnStatsHashKey connKey;`
`422`	`422`
`423`		`- if (GetMaxSharedPoolSize() == DISABLE_CONNECTION_THROTTLING)`
	`423`	`+ if (MaxSharedPoolSize == DISABLE_CONNECTION_THROTTLING)`
`424`	`424`	`{`
`425`	`425`	`/* connection throttling disabled */`
`426`	`426`	`return;`
`@@ -484,7 +484,11 @@ DecrementSharedConnectionCounter(const char *hostname, int port)`
`484`	`484`	`{`
`485`	`485`	`SharedConnStatsHashKey connKey;`
`486`	`486`
`487`		`- if (GetMaxSharedPoolSize() == DISABLE_CONNECTION_THROTTLING)`
	`487`	`+ /*`
	`488`	`+ * Do not call GetMaxSharedPoolSize() here, since it may read from`
	`489`	`+ * the catalog and we may be in the process exit handler.`
	`490`	`+ */`
	`491`	`+ if (MaxSharedPoolSize == DISABLE_CONNECTION_THROTTLING)`
`488`	`492`	`{`
`489`	`493`	`/* connection throttling disabled */`
`490`	`494`	`return;`