Repository: incubator-hawq-docs Updated Branches: refs/heads/develop 67ca8cc93 -> d20f95d38
HAWQ-1352 Correct timeout value (closes #95) Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/commit/d20f95d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/tree/d20f95d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/diff/d20f95d3 Branch: refs/heads/develop Commit: d20f95d38bfe8a34cae1e977bca3bd586129216e Parents: 67ca8cc Author: Jane Beckman <[email protected]> Authored: Mon Feb 27 10:43:58 2017 -0800 Committer: David Yozie <[email protected]> Committed: Mon Feb 27 10:43:58 2017 -0800 ---------------------------------------------------------------------- markdown/reference/cli/admin_utilities/hawqactivate.html.md.erb | 4 ---- markdown/reference/cli/admin_utilities/hawqrestart.html.md.erb | 2 +- markdown/reference/cli/admin_utilities/hawqstart.html.md.erb | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/d20f95d3/markdown/reference/cli/admin_utilities/hawqactivate.html.md.erb ---------------------------------------------------------------------- diff --git a/markdown/reference/cli/admin_utilities/hawqactivate.html.md.erb b/markdown/reference/cli/admin_utilities/hawqactivate.html.md.erb index 6bbcdd4..4da008a 100644 --- a/markdown/reference/cli/admin_utilities/hawqactivate.html.md.erb +++ b/markdown/reference/cli/admin_utilities/hawqactivate.html.md.erb @@ -30,7 +30,6 @@ Activates a standby master host and makes it the active master for the HAWQ syst ``` pre hawq activate standby [-M (smart|fast|immediate) | --mode (smart|fast|immediate)] - [-t <time> | --timeout <time>] [-l <logfile_directory> | --logdir <logfile_directory>] [(-v | --verbose) | (-q | --quiet)] [--ignore-bad-hosts] @@ -75,9 +74,6 @@ Fast shut down interrupts and rolls back any transactions currently in progress. Immediate shutdown aborts transactions in progress and kills all `postgres` processes without allowing the database server to complete transaction processing or clean up any temporary or in-process work files. Because of this, immediate shutdown is not recommended. In some instances, it can cause database corruption that requires manual recovery.</dd> -<dt>-t, -\\\-timeout \<timeout\_seconds\> </dt> -<dd>Seconds to wait before discontinuing the operation. If not specified, the default timeout is 60 seconds.</dd> - <dt>-l, -\\\-logdir \<logfile\_directory\> </dt> <dd>Specifies the log directory for logs of the management tools. The default is `~/hawq/Adminlogs/`.</dd> http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/d20f95d3/markdown/reference/cli/admin_utilities/hawqrestart.html.md.erb ---------------------------------------------------------------------- diff --git a/markdown/reference/cli/admin_utilities/hawqrestart.html.md.erb b/markdown/reference/cli/admin_utilities/hawqrestart.html.md.erb index 0560d74..12fd4ec 100644 --- a/markdown/reference/cli/admin_utilities/hawqrestart.html.md.erb +++ b/markdown/reference/cli/admin_utilities/hawqrestart.html.md.erb @@ -79,7 +79,7 @@ When the `hawq restart` command runs, the utility uploads changes made to the ma <dd>Displays detailed status, progress and error messages output by the utility.</dd> <dt>-t, -\\\-timeout \<timeout\_seconds\> </dt> -<dd>Specifies a timeout in seconds to wait for a segment instance to start up. If a segment instance was shutdown abnormally (due to power failure or killing its `postgres` database listener process, for example), it may take longer to start up due to the database recovery and validation process. If not specified, the default timeout is 60 seconds.</dd> +<dd>Specifies a timeout in seconds to wait for a segment instance to start up. If a segment instance was shutdown abnormally (due to power failure or killing its `postgres` database listener process, for example), it may take longer to start up due to the database recovery and validation process. If not specified, the default timeout is 600 seconds.</dd> <dt>-M, -\\\-mode smart | fast | immediate </dt> <dd>Smart shutdown is the default. Shutdown fails with a warning message, if active connections are found. http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/d20f95d3/markdown/reference/cli/admin_utilities/hawqstart.html.md.erb ---------------------------------------------------------------------- diff --git a/markdown/reference/cli/admin_utilities/hawqstart.html.md.erb b/markdown/reference/cli/admin_utilities/hawqstart.html.md.erb index 6944dcc..fb7f1ed 100644 --- a/markdown/reference/cli/admin_utilities/hawqstart.html.md.erb +++ b/markdown/reference/cli/admin_utilities/hawqstart.html.md.erb @@ -93,7 +93,7 @@ $ PGOPTIONS='-c gp_role=utility' psql <dd>Starts HAWQ in restricted mode (only database superusers are allowed to connect).</dd> <dt>-t , -\\\-timeout \<timeout\_seconds\> </dt> -<dd>Specifies a timeout in seconds to wait for a segment instance to start up. If a segment instance was shutdown abnormally (due to power failure or killing its `postgres` database listener process, for example), it may take longer to start up due to the database recovery and validation process. If not specified, the default timeout is 60 seconds.</dd> +<dd>Specifies a timeout in seconds to wait for a segment instance to start up. If a segment instance was shutdown abnormally (due to power failure or killing its `postgres` database listener process, for example), it may take longer to start up due to the database recovery and validation process. If not specified, the default timeout is 600 seconds.</dd> <dt>-U , -\\\-special-mode maintenance </dt> <dd>(Superuser only) Start HAWQ in \[maintenance | upgrade\] mode. In maintenance mode, the `gp_maintenance_conn` parameter is set.</dd>
