database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

Accept pg_ctl timeout from the PGCTLTIMEOUT environment variable.

Browse Source 
Many automated test suites call pg_ctl.  Buildfarm members axolotl,
hornet, mandrill, shearwater, sungazer and tern have failed when server
shutdown took longer than the pg_ctl default 60s timeout.  This addition
permits slow hosts to easily raise the timeout without us editing a
--timeout argument into every test suite pg_ctl call.  Back-patch to 9.1
(all supported versions) for the sake of automated testing.

Reviewed by Tom Lane.
This commit is contained in:
Noah Misch
2016-02-10 20:34:02 -05:00
parent 51e78ab4ff
commit 2ffa869620
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
doc/src/sgml/ref/pg_ctl-ref.sgml
View File

@ -362,7 +362,9 @@ PostgreSQL documentation
<listitem>
<para>
The maximum number of seconds to wait when waiting for startup or
shutdown to complete. The default is 60 seconds.
shutdown to complete. Defaults to the value of the
<envar>PGCTLTIMEOUT</> environment variable or, if not set, to 60
seconds.
</para>
</listitem>
</varlistentry>
@ -486,6 +488,17 @@ PostgreSQL documentation
<title>Environment</title>
<variablelist>
<varlistentry>
<term><envar>PGCTLTIMEOUT</envar></term>
<listitem>
<para>
Default limit on the number of seconds to wait when waiting for startup
or shutdown to complete. If not set, the default is 60 seconds.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><envar>PGDATA</envar></term>