Repository: incubator-hawq-docs
Updated Branches:
  refs/heads/develop f6e8b8a23 -> 86ef7009f


Remove init from Starting/Stopping HAWQ and update hawq init


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/ee774fb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/tree/ee774fb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/diff/ee774fb3

Branch: refs/heads/develop
Commit: ee774fb30a08aed4e9a7de9ef022475c8f3ec1e5
Parents: e169704
Author: Jane Beckman <[email protected]>
Authored: Mon Oct 17 15:11:36 2016 -0700
Committer: Jane Beckman <[email protected]>
Committed: Mon Oct 17 15:11:36 2016 -0700

----------------------------------------------------------------------
 admin/startstop.html.md.erb                     | 21 +++-----------------
 .../cli/admin_utilities/hawqinit.html.md.erb    | 12 ++++++++---
 2 files changed, 12 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/ee774fb3/admin/startstop.html.md.erb
----------------------------------------------------------------------
diff --git a/admin/startstop.html.md.erb b/admin/startstop.html.md.erb
index 5c07f96..d109d4b 100644
--- a/admin/startstop.html.md.erb
+++ b/admin/startstop.html.md.erb
@@ -6,7 +6,9 @@ In a HAWQ DBMS, the database server instances \(the master and 
all segments\) ar
 
 Because a HAWQ system is distributed across many machines, the process for 
starting and stopping a HAWQ system is different than the process for starting 
and stopping a regular PostgreSQL DBMS.
 
-Use the `hawq start `*`object`* and `hawq stop `*`object`* commands to start 
and stop HAWQ, respectively. These management tools are located in the 
$GPHOME/bin directory on your HAWQ master host. Initializing a HAWQ system also 
starts it.
+Use the `hawq start `*`object`* and `hawq stop `*`object`* commands to start 
and stop HAWQ, respectively. These management tools are located in the 
$GPHOME/bin directory on your HAWQ master host. 
+
+Initializing a HAWQ system also starts it.
 
 **Important:**
 
@@ -14,23 +16,6 @@ Do not issue a `KILL` command to end any Postgres process. 
Instead, use the data
 
 For information about [hawq 
start](../reference/cli/admin_utilities/hawqstart.html) and [hawq 
stop](../reference/cli/admin_utilities/hawqstop.html), see the appropriate 
pages in the HAWQ Management Utility Reference or enter `hawq start -h` or 
`hawq stop -h` on the command line.
 
-## <a id="task_g1y_xtm_s5"></a>Initialize HAWQ 
-
-Initialize and start the HAWQ system using configuration parameters defined in 
`$GPHOME/etc/hawq-site.xml`.
-
-The `hawq init` command with the appropriate cluster or node command 
initializes and starts a HAWQ cluster. The master or segment nodes can be 
individually initialized by using `hawq init master` and `hawq init segment` 
commands, respectively. Format options can also be specified at this time.
-
-The `hawq init <object>` utility will create a HAWQ instance using 
configuration parameters defined in `$GPHOME/etc/hawq-site.xml` A single node 
cluster can be started without any user-defined changes to the default 
`hawq-site.xml` file. Use the template-hawq-site.xml file to specify the 
configuration for larger clusters.
-
-When using the template for initializing a new cluster configuration, replace 
the items contained within the % markers, for example in: 
*`value`*`%master.host%`*`value`*, `%master.host%` would be replaced with the 
master host name. After modification, rename the file to the name of the 
default configuration file: `hawq-site.xml`.
-
--   Before initializing HAWQ, set the `$GPHOME` environment variable to point 
to the location of your HAWQ installation on the master host and exchange SSH 
keys between all host addresses in the array, using `hawq ssh-exkeys`.
--   To initialize and start a HAWQ cluster, enter the following command on the 
master host:
-
-    ```shell
-    $ hawq init cluster
-    ```
-
 
 ## <a id="task_hkd_gzv_fp"></a>Starting HAWQ 
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/ee774fb3/reference/cli/admin_utilities/hawqinit.html.md.erb
----------------------------------------------------------------------
diff --git a/reference/cli/admin_utilities/hawqinit.html.md.erb 
b/reference/cli/admin_utilities/hawqinit.html.md.erb
index 579d729..e3a7951 100644
--- a/reference/cli/admin_utilities/hawqinit.html.md.erb
+++ b/reference/cli/admin_utilities/hawqinit.html.md.erb
@@ -4,7 +4,7 @@ title: hawq init
 
 The `hawq init cluster` command initializes a HAWQ system and starts it.
 
-The master or segment nodes can be individually initialized by using `hawq 
init master` and `hawq init segment` commands, respectively. The `hawq init 
standby` command initializes a standby master host for a HAWQ system.
+The master or segment nodes can be individually initialized by using `hawq 
init master` and `hawq init segment` commands, respectively.  Format options 
can also be specified at this time. The `hawq init standby` command initializes 
a standby master host for a HAWQ system.
 
 The `hawq init <object> --standby-host` option allows defining the host for a 
standby at initialization.
 
@@ -40,11 +40,17 @@ where:
 
 The `hawq init <object>` utility will create a HAWQ instance using 
configuration parameters defined in `$GPHOME/etc/hawq-site.xml`. Before running 
this utility, make sure that you have installed the HAWQ software on all the 
hosts in the array.
 
-In a HAWQ DBMS, each database instance (the master and all segments) must be 
initialized across all of the hosts in the system in such a way that they can 
all work together as a unified DBMS. The `hawq init cluster` utility takes care 
of initializing the HAWQ master and each segment instance, and configuring the 
system as a whole. When hawq init cluster is run, the cluster comes online 
automatically without needing to explicitly start it. A single node cluster can 
be started without any user-defined changes to the default `hawq-site.xml` 
file. The template-hawq-site.xml file is used to specify the configuration for 
larger clusters.
+In a HAWQ DBMS, each database instance (the master and all segments) must be 
initialized across all of the hosts in the system in such a way that they can 
all work together as a unified DBMS. The `hawq init cluster` utility takes care 
of initializing the HAWQ master and each segment instance, and configuring the 
system as a whole. When hawq init cluster is run, the cluster comes online 
automatically without needing to explicitly start it. A single node cluster can 
be started without any user-defined changes to the default `hawq-site.xml` 
file. Use the template-hawq-site.xml file to specify the configuration for 
larger clusters.
 
 To use the template for initializing a new cluster configuration, replace the 
items contained within the % markers, for example in: 
`value%master.host%value`, `%master.host%` would be replaced with the master 
host name. After modification, rename the file to the name of the default 
configuration file: `hawq-site.xml`.
 
-Before running `hawq-site.xml`, you must set the `$GPHOME` environment 
variable to point to the location of your HAWQ installation on the master host 
and exchange SSH keys between all host addresses in the array using `hawq 
ssh-exkeys`.
+
+-   Before initializing HAWQ, set the `$GPHOME` environment variable to point 
to the location of your HAWQ installation on the master host and exchange SSH 
keys between all host addresses in the array, using `hawq ssh-exkeys`.
+-   To initialize and start a HAWQ cluster, enter the following command on the 
master host:
+
+    ```shell
+    $ hawq init cluster
+    ```
 
 This utility performs the following tasks:
 

Reply via email to