diff options
| author | Noah Misch | 2016-02-11 01:34:02 +0000 |
|---|---|---|
| committer | Noah Misch | 2016-02-11 01:34:48 +0000 |
| commit | f97664cf54a2e1bf7d727b1c86b1d9b41e1eaba6 (patch) | |
| tree | e819f0847548c3963da134dd3a9d641717d78393 /doc | |
| parent | e56acbe2a3d942e0f029ecdb1eb8b11f7b9e99b2 (diff) | |
Accept pg_ctl timeout from the PGCTLTIMEOUT environment variable.
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.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/sgml/ref/pg_ctl-ref.sgml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml index 07836e718f7..d6953252f9b 100644 --- a/doc/src/sgml/ref/pg_ctl-ref.sgml +++ b/doc/src/sgml/ref/pg_ctl-ref.sgml @@ -351,7 +351,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> @@ -438,6 +440,17 @@ PostgreSQL documentation <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> <listitem> |