Merge pull request #2376 from citusdata/fix_crash

Relax assertion on transaction abort on PREPARE step
pull/2386/head
Önder Kalacı 2018-09-17 22:57:06 +03:00 committed by GitHub
commit f16ae31ef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions

View File

@ -528,8 +528,20 @@ FinishRemoteTransactionPrepare(struct MultiConnection *connection)
transaction->transactionState = REMOTE_TRANS_PREPARED;
}
result = GetRemoteCommandResult(connection, raiseErrors);
Assert(!result);
/*
* Try to consume results of PREPARE TRANSACTION command. If we don't
* succeed, rollback the transaction. Note that we've not committed on
* any node yet, and we're not sure about the state of the worker node.
* So rollbacking seems to be the safest action if the worker is
* in a state where it can actually rollback.
*/
if (!ClearResults(connection, raiseErrors))
{
ereport(ERROR, (errmsg("failed to prepare transaction '%s' on host %s:%d",
transaction->preparedName, connection->hostname,
connection->port),
errhint("Try re-running the command.")));
}
}