diff options
| -rw-r--r-- | contrib/postgres_fdw/connection.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index ce0164e9d23..4aff315b7c3 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -1137,6 +1137,11 @@ pgfdw_reject_incomplete_xact_state_change(ConnCacheEntry *entry) * and ignore the result. Returns true if we successfully cancel the query * and discard any pending result, and false if not. * + * It's not a huge problem if we throw an ERROR here, but if we get into error + * recursion trouble, we'll end up slamming the connection shut, which will + * necessitate failing the entire toplevel transaction even if subtransactions + * were used. Try to use WARNING where we can. + * * XXX: if the query was one sent by fetch_more_data_begin(), we could get the * query text from the pendingAreq saved in the per-connection state, then * report the query using it. @@ -1187,6 +1192,11 @@ pgfdw_cancel_query(PGconn *conn) * If the query is executed successfully but returns an error, the return * value is true if and only if ignore_errors is set. If the query can't be * sent or times out, the return value is false. + * + * It's not a huge problem if we throw an ERROR here, but if we get into error + * recursion trouble, we'll end up slamming the connection shut, which will + * necessitate failing the entire toplevel transaction even if subtransactions + * were used. Try to use WARNING where we can. */ static bool pgfdw_exec_cleanup_query(PGconn *conn, const char *query, bool ignore_errors) @@ -1233,11 +1243,6 @@ pgfdw_exec_cleanup_query(PGconn *conn, const char *query, bool ignore_errors) * be a query that was initiated as part of transaction abort to get the remote * side back to the appropriate state. * - * It's not a huge problem if we throw an ERROR here, but if we get into error - * recursion trouble, we'll end up slamming the connection shut, which will - * necessitate failing the entire toplevel transaction even if subtransactions - * were used. Try to use WARNING where we can. - * * endtime is the time at which we should give up and assume the remote * side is dead. Returns true if the timeout expired, otherwise false. * Sets *result except in case of a timeout. |