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

Merge pull request #2031 from citusdata/fix_immediate_shut_down_issue 

Improve error handling on failures
pull/2038/head
Önder Kalacı 2018-03-02 10:04:12 +03:00 committed by GitHub
parent 76f6883d5d 7dc9589b56
commit e7b28dd469
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/backend/distributed/connection/remote_commands.c
View File

@ -65,24 +65,7 @@ IsResponseOK(PGresult *result)
void void
ForgetResults(MultiConnection *connection) ForgetResults(MultiConnection *connection)
{ {
while (true) ClearResults(connection, false);
{
PGresult *result = NULL;
const bool dontRaiseErrors = false;
result = GetRemoteCommandResult(connection, dontRaiseErrors);
if (result == NULL)
{
break;
}
if (PQresultStatus(result) == PGRES_COPY_IN)
{
PQputCopyEnd(connection->pgConn, NULL);
/* TODO: mark transaction as failed, once we can. */
}
PQclear(result);
}
} }
@ -123,6 +106,14 @@ ClearResults(MultiConnection *connection, bool raiseErrors)
MarkRemoteTransactionFailed(connection, raiseErrors); MarkRemoteTransactionFailed(connection, raiseErrors);
success = false; success = false;
/* an error happened, there is nothing we can do more */
if (PQresultStatus(result) == PGRES_FATAL_ERROR)
{
PQclear(result);
break;
}
} }
PQclear(result); PQclear(result);
@ -550,6 +541,12 @@ GetRemoteCommandResult(MultiConnection *connection, bool raiseInterrupts)
if (!FinishConnectionIO(connection, raiseInterrupts)) if (!FinishConnectionIO(connection, raiseInterrupts))
{ {
/* some error(s) happened while doing the I/O, signal the callers */
if (PQstatus(pgConn) == CONNECTION_BAD)
{
return PQmakeEmptyPGresult(pgConn, PGRES_FATAL_ERROR);
}
return NULL; return NULL;
} }

12
src/backend/distributed/executor/multi_router_executor.c
View File

@ -1446,6 +1446,12 @@ StoreQueryResult(CitusScanState *scanState, MultiConnection *connection,
commandFailed = true; commandFailed = true;
/* an error happened, there is nothing we can do more */
if (resultStatus == PGRES_FATAL_ERROR)
{
break;
}
/* continue, there could be other lingering results due to row mode */ /* continue, there could be other lingering results due to row mode */
continue; continue;
} }
@ -1565,6 +1571,12 @@ ConsumeQueryResult(MultiConnection *connection, bool failOnError, int64 *rows)
commandFailed = true; commandFailed = true;
/* an error happened, there is nothing we can do more */
if (status == PGRES_FATAL_ERROR)
{
break;
}
/* continue, there could be other lingering results due to row mode */ /* continue, there could be other lingering results due to row mode */
continue; continue;
} }

4
src/test/regress/expected/multi_extension.out
View File

@ -369,8 +369,8 @@ SELECT create_distributed_table('t1', 'a');
WARNING: function assign_distributed_transaction_id(integer, integer, unknown) does not exist WARNING: function assign_distributed_transaction_id(integer, integer, unknown) does not exist
HINT: No function matches the given name and argument types. You might need to add explicit type casts. HINT: No function matches the given name and argument types. You might need to add explicit type casts.
CONTEXT: while executing command on localhost:57637 CONTEXT: while executing command on localhost:57637
ERROR: current transaction is aborted, commands ignored until end of transaction block ERROR: connection error: localhost:57637
CONTEXT: while executing command on localhost:57637 DETAIL: another command is already in progress
\c regression \c regression
\c - - - :worker_1_port \c - - - :worker_1_port
DROP DATABASE another; DROP DATABASE another;