Skip to content

Commit 879c117

Browse files
author
Etsuro Fujita
committed
postgres_fdw: Fix error message for PREPARE TRANSACTION.
Currently, postgres_fdw does not support preparing a remote transaction for two-phase commit even in the case where the remote transaction is read-only, but the old error message appeared to imply that that was not supported only if the remote transaction modified remote tables. Change the message so as to include the case where the remote transaction is read-only. Also fix a comment above the message. Also add a note about the lack of supporting PREPARE TRANSACTION to the postgres_fdw documentation. Reported-by: Gilles Darold Author: Gilles Darold and Etsuro Fujita Reviewed-by: Michael Paquier and Kyotaro Horiguchi Backpatch-through: 9.4 Discussion: https://postgr.es/m/08600ed3-3084-be70-65ba-279ab19618a5%40darold.net
1 parent b85e43f commit 879c117

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

contrib/postgres_fdw/connection.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -715,17 +715,17 @@ pgfdw_xact_callback(XactEvent event, void *arg)
715715
case XACT_EVENT_PRE_PREPARE:
716716

717717
/*
718-
* We disallow remote transactions that modified anything,
719-
* since it's not very reasonable to hold them open until
720-
* the prepared transaction is committed. For the moment,
721-
* throw error unconditionally; later we might allow
722-
* read-only cases. Note that the error will cause us to
723-
* come right back here with event == XACT_EVENT_ABORT, so
724-
* we'll clean up the connection state at that point.
718+
* We disallow any remote transactions, since it's not
719+
* very reasonable to hold them open until the prepared
720+
* transaction is committed. For the moment, throw error
721+
* unconditionally; later we might allow read-only cases.
722+
* Note that the error will cause us to come right back
723+
* here with event == XACT_EVENT_ABORT, so we'll clean up
724+
* the connection state at that point.
725725
*/
726726
ereport(ERROR,
727727
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
728-
errmsg("cannot prepare a transaction that modified remote tables")));
728+
errmsg("cannot PREPARE a transaction that has operated on postgres_fdw foreign tables")));
729729
break;
730730
case XACT_EVENT_PARALLEL_COMMIT:
731731
case XACT_EVENT_COMMIT:

doc/src/sgml/postgres-fdw.sgml

+6
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,12 @@
483483
COMMITTED</literal> local transaction. A future
484484
<productname>PostgreSQL</productname> release might modify these rules.
485485
</para>
486+
487+
<para>
488+
Note that it is currently not supported by
489+
<filename>postgres_fdw</filename> to prepare the remote transaction for
490+
two-phase commit.
491+
</para>
486492
</sect2>
487493

488494
<sect2>

0 commit comments

Comments
 (0)