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

Merge pull request #2772 from citusdata/cancel 

Use SendCancelationRequest() in ShutdownConnection()
pull/2757/head
Hadi Moshayedi 2019-06-18 12:16:40 +02:00 committed by GitHub
parent ee37e3da89 b240854b8c
commit 04abc1137f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,15 +456,7 @@ ShutdownConnection(MultiConnection *connection)
if (PQstatus(connection->pgConn) == CONNECTION_OK && if (PQstatus(connection->pgConn) == CONNECTION_OK &&
PQtransactionStatus(connection->pgConn) == PQTRANS_ACTIVE) PQtransactionStatus(connection->pgConn) == PQTRANS_ACTIVE)
{ {
char errorMessage[ERROR_BUFFER_SIZE] = { 0 }; SendCancelationRequest(connection);
PGcancel *cancel = PQgetCancel(connection->pgConn);
if (!PQcancel(cancel, errorMessage, sizeof(errorMessage)))
{
ereport(WARNING, (errmsg("could not cancel connection: %s",
errorMessage)));
}
PQfreeCancel(cancel);
} }
PQfinish(connection->pgConn); PQfinish(connection->pgConn);
connection->pgConn = NULL; connection->pgConn = NULL;