rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow pg_terminate_backend() to be used on backends with matching role. 

A similar change was made previously for pg_cancel_backend, so now it
all matches again.

Dan Farina, reviewed by Fujii Masao, Noah Misch, and Jeff Davis,
with slight kibitzing on the doc changes by me.
This commit is contained in:
Robert Haas 2012-06-26 16:16:52 -04:00
parent b79ab00144
commit c60ca19de9
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/src/sgml/func.sgml
View File

@ -14393,7 +14393,11 @@ SELECT set_config('log_statement_stats', 'off', false);
<literal><function>pg_terminate_backend(<parameter>pid</parameter> <type>int</>)</function></literal>
</entry>
<entry><type>boolean</type></entry>
<entry>Terminate a backend</entry>
<entry>Terminate a backend. You can execute this against
another backend that has exactly the same role as the user
calling the function. In all other cases, you must be a
superuser.
</entry>
</row>
</tbody>
</tgroup>
@ -14414,9 +14418,8 @@ SELECT set_config('log_statement_stats', 'off', false);
<command>postgres</command> processes on the server (using
<application>ps</> on Unix or the <application>Task
Manager</> on <productname>Windows</>).
For the less restrictive <function>pg_cancel_backend</>, the role of an
active backend can be found from
the <structfield>usename</structfield> column of the
The role of an active backend can be found from the
<structfield>usename</structfield> column of the
<structname>pg_stat_activity</structname> view.
</para>

16
doc/src/sgml/high-availability.sgml
View File

@ -1969,13 +1969,15 @@ LOG: database system is ready to accept read only connections
</para>
<para>
<function>pg_cancel_backend()</> will work on user backends, but not the
Startup process, which performs recovery. <structname>pg_stat_activity</structname> does not
show an entry for the Startup process, nor do recovering transactions
show as active. As a result, <structname>pg_prepared_xacts</structname> is always empty during
recovery. If you wish to resolve in-doubt prepared transactions,
view <literal>pg_prepared_xacts</> on the primary and issue commands to
resolve transactions there.
<function>pg_cancel_backend()</>
and <function>pg_terminate_backend()</> will work on user backends,
but not the Startup process, which performs
recovery. <structname>pg_stat_activity</structname> does not show an
entry for the Startup process, nor do recovering transactions show
as active. As a result, <structname>pg_prepared_xacts</structname>
is always empty during recovery. If you wish to resolve in-doubt
prepared transactions, view <literal>pg_prepared_xacts</> on the
primary and issue commands to resolve transactions there.
</para>
<para>

12
src/backend/utils/adt/misc.c
View File

@ -162,18 +162,20 @@ pg_cancel_backend(PG_FUNCTION_ARGS)
}
/*
* Signal to terminate a backend process. Only allowed by superuser.
* Signal to terminate a backend process. This is allowed if you are superuser
* or have the same role as the process being terminated.
*/
Datum
pg_terminate_backend(PG_FUNCTION_ARGS)
{
if (!superuser())
int r = pg_signal_backend(PG_GETARG_INT32(0), SIGTERM);
if (r == SIGNAL_BACKEND_NOPERMISSION)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
errmsg("must be superuser to terminate other server processes"),
errhint("You can cancel your own processes with pg_cancel_backend().")));
(errmsg("must be superuser or have the same role to terminate backends running in other server processes"))));
PG_RETURN_BOOL(pg_signal_backend(PG_GETARG_INT32(0), SIGTERM) == SIGNAL_BACKEND_SUCCESS);
PG_RETURN_BOOL(r == SIGNAL_BACKEND_SUCCESS);
}
/*