From bd12d9059723209f09f9c4e63ebe136ff6994c49 Mon Sep 17 00:00:00 2001 From: Onder Kalaci Date: Wed, 8 Apr 2020 10:13:25 +0200 Subject: [PATCH] Enable compile --- src/backend/distributed/connection/connection_management.c | 4 ++++ src/backend/distributed/connection/shared_connection_stats.c | 1 - src/backend/distributed/metadata/node_metadata.c | 3 +++ src/backend/distributed/shared_library_init.c | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/backend/distributed/connection/connection_management.c b/src/backend/distributed/connection/connection_management.c index b6cb6cc29..d76a76d1c 100644 --- a/src/backend/distributed/connection/connection_management.c +++ b/src/backend/distributed/connection/connection_management.c @@ -380,6 +380,10 @@ StartNodeUserDatabaseConnection(uint32 flags, const char *hostname, int32 port, PG_END_TRY(); + /* + * Cast volatile MultiConnection pointer to MultiConnection pointer + * for ease of use. + */ MultiConnection *newConnection = (MultiConnection *) connection; dlist_push_tail(entry->connections, &newConnection->connectionNode); diff --git a/src/backend/distributed/connection/shared_connection_stats.c b/src/backend/distributed/connection/shared_connection_stats.c index 8db8f70e7..e530f3cad 100644 --- a/src/backend/distributed/connection/shared_connection_stats.c +++ b/src/backend/distributed/connection/shared_connection_stats.c @@ -23,7 +23,6 @@ #include "commands/dbcommands.h" #include "distributed/cancel_utils.h" #include "distributed/connection_management.h" -#include "distributed/hash_helpers.h" #include "distributed/listutils.h" #include "distributed/metadata_cache.h" #include "distributed/shared_connection_stats.h" diff --git a/src/backend/distributed/metadata/node_metadata.c b/src/backend/distributed/metadata/node_metadata.c index 4903edf5b..5b886789e 100644 --- a/src/backend/distributed/metadata/node_metadata.c +++ b/src/backend/distributed/metadata/node_metadata.c @@ -1027,6 +1027,9 @@ RemoveNodeFromCluster(char *nodeName, int32 nodePort) char *nodeDeleteCommand = NodeDeleteCommand(workerNode->nodeId); + /* make sure we don't have any lingering session lifespan connections */ + CloseNodeConnectionsAfterTransaction(workerNode->workerName, nodePort); + SendCommandToWorkersWithMetadata(nodeDeleteCommand); } diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c index 7e41915d8..1873a6664 100644 --- a/src/backend/distributed/shared_library_init.c +++ b/src/backend/distributed/shared_library_init.c @@ -963,7 +963,7 @@ RegisterCitusConfigVariables(void) &MaxSharedPoolSize, 0, -1, INT_MAX, PGC_SIGHUP, /* TODO: is PGC_POSTMASTER more convinient? */ - GUC_STANDARD, + GUC_SUPERUSER_ONLY, NULL, NULL, MaxSharedPoolSizeGucShowHook); DefineCustomIntVariable(