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

Allow outside tx connections freely

conn_av_fail_w
Onder Kalaci 2022-08-30 10:59:52 +02:00
parent 25d93bd69a
commit 376797be5d
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/distributed/connection/connection_management.c
View File

@ -58,7 +58,7 @@ static int ConnectionHashCompare(const void *a, const void *b, Size keysize);
static void StartConnectionEstablishment(MultiConnection *connectionn,
ConnectionHashKey *key);
static MultiConnection * FindAvailableConnection(List *connections, uint32 flags);
static List * EnsureAndGetHealthyConnections(dlist_head *connections);
static List * EnsureAndGetHealthyConnections(dlist_head *connections, uint32 flags);
static bool RemoteSocketClosed(MultiConnection *connection);
static void ErrorIfMultipleMetadataConnectionExists(List *connections);
static void FreeConnParamsHashEntryFields(ConnParamsHashEntry *entry);
@ -335,7 +335,8 @@ StartNodeUserDatabaseConnection(uint32 flags, const char *hostname, int32 port,
/* if desired, check whether there's a usable connection */
if (!(flags & FORCE_NEW_CONNECTION))
{
List *healthyConnections = EnsureAndGetHealthyConnections(entry->connections);
List *healthyConnections = EnsureAndGetHealthyConnections(entry->connections,
flags);
/* check connection cache for a connection that's not already in use */
MultiConnection *connection = FindAvailableConnection(healthyConnections, flags);
@ -538,7 +539,7 @@ FindAvailableConnection(List *connections, uint32 flags)
* that can be reused.
*/
static List *
EnsureAndGetHealthyConnections(dlist_head *connections)
EnsureAndGetHealthyConnections(dlist_head *connections, uint32 flags)
{
List *healthyConnections = NIL;
@ -577,20 +578,18 @@ EnsureAndGetHealthyConnections(dlist_head *connections)
{
healthyConnections = lappend(healthyConnections, connection);
}
else if (inRemoteTrasaction &&
else if ((inRemoteTrasaction && !(flags & OUTSIDE_TRANSACTION)) &&
(transaction->transactionCritical ||
!dlist_is_empty(&connection->referencedPlacements)))
{
CHECK_FOR_INTERRUPTS();
ReportConnectionError(connection, ERROR);
/*
* If a connection is executing a critical transaction or accessed any
* placements, we should not continue the execution.
*/
ereport(ERROR, (errmsg("failure on connection marked as essential: %s:%d",
connection->hostname, connection->port)));
ereport(WARNING, (errmsg("failure on connection marked as essential: %s:%d",
connection->hostname, connection->port)));
}
else
{
@ -733,7 +732,7 @@ ConnectionAvailableToNode(char *hostName, int nodePort, const char *userName,
}
int flags = 0;
List *healthyConnections = EnsureAndGetHealthyConnections(entry->connections);
List *healthyConnections = EnsureAndGetHealthyConnections(entry->connections, flags);
MultiConnection *connection = FindAvailableConnection(healthyConnections, flags);