On Tue, Mar 15, 2016 at 6:58 AM, Robert Haas <robertmh...@gmail.com> wrote: > On Sun, Mar 13, 2016 at 11:50 PM, Thomas Munro > <thomas.mu...@enterprisedb.com> wrote: >> The last patches I posted don't apply today due to changes in master, >> so here's a freshly merged patch series. > > + from the current synchronous stanbyindicates it has received the > > Uh, no.
Oops, thanks, fixed. I'll wait for some more feedback or a conflict with master before sending a new version. > - SyncRepWaitForLSN(gxact->prepare_end_lsn); > + { > + /* > + * Don't wait for the prepare to be applied remotely in remote_apply > + * mode, just wait for it to be flushed to the WAL. We will wait for > + * apply when the transaction eventuallly commits or aborts. > + */ > + if (synchronous_commit == SYNCHRONOUS_COMMIT_REMOTE_APPLY) > + assign_synchronous_commit(SYNCHRONOUS_COMMIT_REMOTE_FLUSH, NULL); > + > + SyncRepWaitForLSN(gxact->prepare_end_lsn); > + > + if (synchronous_commit == SYNCHRONOUS_COMMIT_REMOTE_APPLY) > + assign_synchronous_commit(SYNCHRONOUS_COMMIT_REMOTE_APPLY, NULL); > + } > > What's with the extra block? Yeah, that's silly, thanks. Tidied up for the next version. -- Thomas Munro http://www.enterprisedb.com -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers