Seems like we should not hold off cancel/die interrupts while we are

running deferred triggers.  They are really part of the regular
transaction, and they could take awhile.

diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 92871fa5c30ae7a62e3e26c67652db3a7cd6cdf0..ae1add8ac083cccdf5f690410f0017b48033f08d 100644 (file)
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -1026,9 +1026,6 @@ CommitTransaction(void)
        if (s->state != TRANS_INPROGRESS)
                elog(NOTICE, "CommitTransaction and not in in-progress state ");
 
-       /* Prevent cancel/die interrupt while cleaning up */
-       HOLD_INTERRUPTS();
-
        /*
         * Tell the trigger manager that this transaction is about to be
         * committed. He'll invoke all trigger deferred until XACT before we
@@ -1036,6 +1033,9 @@ CommitTransaction(void)
         */
        DeferredTriggerEndXact();
 
+       /* Prevent cancel/die interrupt while cleaning up */
+       HOLD_INTERRUPTS();
+
        /*
         * set the current transaction state information appropriately during
         * the abort processing