Merge pull request #6105 from citusdata/marcocitus/fix-process-exit

Fixes a crash that can happen due to catalog read in shmem_exit
citusdata · Jul 29, 2022 · ccc3b1b · ccc3b1b
2 parents 51a43dc + 6d6e441
commit ccc3b1b
Showing 1 changed file with 6 additions and 2 deletions.
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;