external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Fixes a crash that can happen due to catalog read in shmem_exit
pull/6097/head^2
Marco Slot 2022-07-29 14:22:20 +02:00 committed by GitHub
parent 51a43dce4b 6d6e44166f
commit ccc3b1bacf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/distributed/connection/shared_connection_stats.c
View File

@ -420,7 +420,7 @@ IncrementSharedConnectionCounter(const char *hostname, int port)
{ {
SharedConnStatsHashKey connKey; SharedConnStatsHashKey connKey;
if (GetMaxSharedPoolSize() == DISABLE_CONNECTION_THROTTLING) if (MaxSharedPoolSize == DISABLE_CONNECTION_THROTTLING)
{ {
/* connection throttling disabled */ /* connection throttling disabled */
return; return;
@ -484,7 +484,11 @@ DecrementSharedConnectionCounter(const char *hostname, int port)
{ {
SharedConnStatsHashKey connKey; 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 */ /* connection throttling disabled */
return; return;