*** a/doc/src/sgml/func.sgml --- b/doc/src/sgml/func.sgml *************** *** 12899,12905 **** SELECT set_config('log_statement_stats', 'off', false); pg_cancel_backend(pid int) boolean ! Cancel a backend's current query --- 12899,12905 ---- pg_cancel_backend(pid int) boolean ! Cancel a backend's current query or abort an idle transaction *** a/doc/src/sgml/monitoring.sgml --- b/doc/src/sgml/monitoring.sgml *************** *** 55,60 **** postgres 965 0.0 1.1 6152 1512 pts/1 SN 13:17 0:00 postgres: stats c --- 55,61 ---- postgres 998 0.0 2.3 6532 2992 pts/1 SN 13:18 0:00 postgres: tgl runbug 127.0.0.1 idle postgres 1003 0.0 2.4 6532 3128 pts/1 SN 13:19 0:00 postgres: tgl regression [local] SELECT waiting postgres 1016 0.1 2.4 6532 3080 pts/1 SN 13:19 0:00 postgres: tgl regression [local] idle in transaction + postgres 1066 0.1 2.4 6532 3080 pts/1 SN 13:19 0:00 postgres: tgl regression [local] idle in transaction (aborted) (The appropriate invocation of ps varies across different *************** *** 77,82 **** postgres: user database host idle (i.e., waiting for a client command), idle in transaction (waiting for client inside a BEGIN block), + idle in transaction (aborted) (waiting for client to ROLLBACK), or a command type name such as SELECT. Also, waiting is attached if the server process is presently waiting on a lock held by another server process. In the above example we can infer *** a/src/backend/access/transam/xact.c --- b/src/backend/access/transam/xact.c *************** *** 313,320 **** IsTransactionState(void) /* * IsAbortedTransactionBlockState * ! * This returns true if we are currently running a query ! * within an aborted transaction block. */ bool IsAbortedTransactionBlockState(void) --- 313,319 ---- /* * IsAbortedTransactionBlockState * ! * This returns true if we are within an aborted transaction block. */ bool IsAbortedTransactionBlockState(void) *************** *** 2692,2697 **** AbortCurrentTransaction(void) --- 2691,2737 ---- } /* + * AbortTransactionAndAnySubtransactions + * + * Similar to AbortCurrentTransaction but if any subtransactions + * in progress we abort them and all of their parents. So this is + * used when the caller wishes to make the abort untrappable by the user. + */ + void + AbortTransactionAndAnySubtransactions(void) + { + TransactionState s = CurrentTransactionState; + + switch (s->blockState) + { + case TBLOCK_DEFAULT: + case TBLOCK_STARTED: + case TBLOCK_BEGIN: + case TBLOCK_INPROGRESS: + case TBLOCK_END: + case TBLOCK_ABORT: + case TBLOCK_SUBABORT: + case TBLOCK_ABORT_END: + case TBLOCK_ABORT_PENDING: + case TBLOCK_PREPARE: + case TBLOCK_SUBABORT_END: + case TBLOCK_SUBABORT_RESTART: + AbortCurrentTransaction(); + break; + + case TBLOCK_SUBINPROGRESS: + case TBLOCK_SUBBEGIN: + case TBLOCK_SUBEND: + case TBLOCK_SUBABORT_PENDING: + case TBLOCK_SUBRESTART: + AbortSubTransaction(); + CleanupSubTransaction(); + AbortTransactionAndAnySubtransactions(); + break; + } + } + + /* * PreventTransactionChain * * This routine is to be called by statements that must not run inside *** a/src/backend/tcop/postgres.c --- b/src/backend/tcop/postgres.c *************** *** 2637,2651 **** StatementCancelHandler(SIGNAL_ARGS) if (!proc_exit_inprogress) { InterruptPending = true; ! QueryCancelPending = true; /* ! * If it's safe to interrupt, and we're waiting for a lock, service ! * the interrupt immediately. No point in interrupting if we're ! * waiting for input, however. */ ! if (InterruptHoldoffCount == 0 && CritSectionCount == 0 && ! (DoingCommandRead || ImmediateInterruptOK)) { /* bump holdoff count to make ProcessInterrupts() a no-op */ /* until we are done getting ready for it */ --- 2637,2653 ---- if (!proc_exit_inprogress) { InterruptPending = true; ! ! if (!DoingCommandRead) ! QueryCancelPending = true; ! else if (IsTransactionOrTransactionBlock()) ! TransactionCancelPending = true; /* ! * If it's safe to interrupt, service the interrupt immediately. */ ! if (InterruptHoldoffCount == 0 && CritSectionCount == 0 && ImmediateInterruptOK && ! (TransactionCancelPending || QueryCancelPending)) { /* bump holdoff count to make ProcessInterrupts() a no-op */ /* until we are done getting ready for it */ *************** *** 2789,2794 **** ProcessInterrupts(void) --- 2791,2820 ---- errmsg("canceling statement due to user request"))); } } + if (TransactionCancelPending) + { + TransactionCancelPending = false; + ImmediateInterruptOK = false; /* not idle anymore */ + + if (IsAbortedTransactionBlockState()) + return; + + DisableNotifyInterrupt(); + DisableCatchupInterrupt(); + + ereport(NOTICE, + (errcode(ERRCODE_QUERY_CANCELED), + errmsg("canceling idle transaction due to administrator request"))); + + AbortTransactionAndAnySubtransactions(); + + /* + * Set the display correctly now, rather than wait for client wait loop + * to cycle round and reset display at some later time. + */ + set_ps_display("idle in transaction (aborted)", false); + pgstat_report_activity(" in transaction (aborted)"); + } /* If we get here, do nothing (probably, QueryCancelPending was reset) */ } *************** *** 3603,3609 **** PostgresMain(int argc, char *argv[], const char *username) */ if (send_ready_for_query) { ! if (IsTransactionOrTransactionBlock()) { set_ps_display("idle in transaction", false); pgstat_report_activity(" in transaction"); --- 3629,3640 ---- */ if (send_ready_for_query) { ! if (IsAbortedTransactionBlockState()) ! { ! set_ps_display("idle in transaction (aborted)", false); ! pgstat_report_activity(" in transaction (aborted)"); ! } ! else if (IsTransactionOrTransactionBlock()) { set_ps_display("idle in transaction", false); pgstat_report_activity(" in transaction"); *** a/src/backend/utils/init/globals.c --- b/src/backend/utils/init/globals.c *************** *** 27,32 **** ProtocolVersion FrontendProtocol; --- 27,33 ---- volatile bool InterruptPending = false; volatile bool QueryCancelPending = false; + volatile bool TransactionCancelPending = false; volatile bool ProcDiePending = false; volatile bool ImmediateInterruptOK = false; volatile uint32 InterruptHoldoffCount = 0; *** a/src/include/access/xact.h --- b/src/include/access/xact.h *************** *** 204,209 **** extern bool IsTransactionBlock(void); --- 204,210 ---- extern bool IsTransactionOrTransactionBlock(void); extern char TransactionBlockStatusCode(void); extern void AbortOutOfAnyTransaction(void); + extern void AbortTransactionAndAnySubtransactions(void); extern void PreventTransactionChain(bool isTopLevel, const char *stmtType); extern void RequireTransactionChain(bool isTopLevel, const char *stmtType); extern bool IsInTransactionChain(bool isTopLevel); *** a/src/include/miscadmin.h --- b/src/include/miscadmin.h *************** *** 68,73 **** --- 68,74 ---- /* these are marked volatile because they are set by signal handlers: */ extern PGDLLIMPORT volatile bool InterruptPending; extern volatile bool QueryCancelPending; + extern volatile bool TransactionCancelPending; extern volatile bool ProcDiePending; /* these are marked volatile because they are examined by signal handlers: */