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

Reorder commands as Marco noted: 

```
This could throw an OOM. We should do:

Create MultiConnection (can error)
dlist_push_tail (can error)
sharedCounterIncremented = true (cannot error)
increment the shared memory counter (cannot error)
any error after this will be handled correctly in the abort handler
```
preventConflictingFlags
Onder Kalaci 2020-04-08 17:39:07 +02:00
parent eadb18e758
commit af587edea1
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,6 +320,14 @@ StartNodeUserDatabaseConnection(uint32 flags, const char *hostname, int32 port,
}
/*
* Either no caching desired, or no pre-established, non-claimed,
* connection present. Initiate connection establishment.
*/
MultiConnection *connection = MemoryContextAllocZero(ConnectionContext,
sizeof(MultiConnection));
dlist_push_tail(entry->connections, &connection->connectionNode);
if (flags & WAIT_FOR_CONNECTION)
{
WaitLoopForSharedConnection(hostname, port);
@ -351,18 +359,13 @@ StartNodeUserDatabaseConnection(uint32 flags, const char *hostname, int32 port,
IncrementSharedConnectionCounter(hostname, port);
}
/*
* Either no caching desired, or no pre-established, non-claimed,
* connection present. Initiate connection establishment.
* We've already incremented the counter above, so we should decrement
* when we're done with the connection.
*/
MultiConnection *connection = MemoryContextAllocZero(ConnectionContext,
sizeof(MultiConnection));
/* we've already incremented the counter above */
connection->sharedCounterIncremented = true;
dlist_push_tail(entry->connections, &connection->connectionNode);
StartConnectionEstablishment(connection, &key);
ResetShardPlacementAssociation(connection);