1
0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-03-05 15:05:48 +02:00

Ignore mismatched close requests in the pq shim during error processing.

This commit is contained in:
David Steele 2021-06-12 18:00:59 -04:00
parent fba0437179
commit 80d63a5e8b

View File

@ -106,6 +106,12 @@ harnessPqScriptRun(const char *function, const VariantList *param, HarnessPq *pa
TEST_LOG_FMT(PQ_ERROR_PREFIX ": %s", harnessPqScriptError);
harnessPqScriptFail = true;
// Return without error if closing the connection and an error is currently being thrown. Errors outside of the pq shim can
// cause the connection to be cleaned up and we don't want to mask those errors. However, the failure is still logged and
// any subsequent call to the pq shim will result in an error.
if (strcmp(function, HRNPQ_FINISH) == 0 && errorType() != NULL)
return NULL;
THROW(AssertError, harnessPqScriptError);
}