hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject incubator-hawq git commit: HAWQ-378. Move command 'gpcheckperf' to 'hawq checkperf'.
Date Mon, 01 Feb 2016 06:36:19 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master ee7d00482 -> 263fe46e7


HAWQ-378. Move command 'gpcheckperf' to 'hawq checkperf'.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/263fe46e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/263fe46e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/263fe46e

Branch: refs/heads/master
Commit: 263fe46e7a567a101651187e521da130f5b186f9
Parents: ee7d004
Author: rlei <rlei@pivotal.io>
Authored: Mon Feb 1 11:32:21 2016 +0800
Committer: rlei <rlei@pivotal.io>
Committed: Mon Feb 1 14:29:07 2016 +0800

----------------------------------------------------------------------
 tools/bin/gpcheckperf            |  8 ++++----
 tools/bin/hawq                   |  3 +++
 tools/bin/hawqpylib/HAWQ_HELP.py |  1 +
 tools/bin/lib/hawqinit.sh        |  6 +++---
 tools/doc/gpcheck_help           |  2 +-
 tools/doc/gpcheckperf_help       | 38 +++++++++++++++++------------------
 tools/doc/gpsys1_help            |  2 +-
 7 files changed, 32 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/263fe46e/tools/bin/gpcheckperf
----------------------------------------------------------------------
diff --git a/tools/bin/gpcheckperf b/tools/bin/gpcheckperf
index 1949e45..f933c90 100755
--- a/tools/bin/gpcheckperf
+++ b/tools/bin/gpcheckperf
@@ -17,9 +17,9 @@
 # under the License.
 
 """
-gpcheckperf -- Check the hardware for Greenplum Database
+hawq checkperf -- Check the hardware for Greenplum Database
 
-Usage: gpcheckperf <options>
+Usage: hawq checkperf <options>
 
     --version  : print version information
     -d segdir  : where segdir is a directory on which to test I/O performance. 
@@ -360,14 +360,14 @@ def runSetup():
 		     +"        verify PATH variables on the hosts")
 
 	#mkdir cperf
-	if GV.opt['-v']: print '[Info] making gpcheckperf directory on all hosts ... '
+	if GV.opt['-v']: print '[Info] making hawq checkperf directory on all hosts ... '
 	dirs = ''
 	for d in GV.opt['-d']: dirs = '%s %s/gpcheckperf_$USER' % (dirs, d)
 
         cmd = 'rm -rf %s ; mkdir -p %s' % (dirs, dirs)
 	(ok, out) = gpssh(cmd)
 	if not ok: 
-	    sys.exit("[Error] unable to make gpcheckperf directory. \n"
+	    sys.exit("[Error] unable to make hawq checkperf directory. \n"
 		   + "        command failed: " + cmd)
 
     except:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/263fe46e/tools/bin/hawq
----------------------------------------------------------------------
diff --git a/tools/bin/hawq b/tools/bin/hawq
index 5254608..1339447 100755
--- a/tools/bin/hawq
+++ b/tools/bin/hawq
@@ -104,6 +104,9 @@ def main():
     elif hawq_command == "check":
         cmd = "%s; gpcheck %s" % (source_hawq_env, sub_args)
         result = local_ssh(cmd)
+    elif hawq_command == "checkperf":
+        cmd = "%s; gpcheckperf %s" % (source_hawq_env, sub_args)
+        result = local_ssh(cmd)
     elif hawq_command == "load":
         cmd = "%s; gpload %s" % (source_hawq_env, sub_args)
         result = local_ssh(cmd)

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/263fe46e/tools/bin/hawqpylib/HAWQ_HELP.py
----------------------------------------------------------------------
diff --git a/tools/bin/hawqpylib/HAWQ_HELP.py b/tools/bin/hawqpylib/HAWQ_HELP.py
index 357e869..fff607a 100755
--- a/tools/bin/hawqpylib/HAWQ_HELP.py
+++ b/tools/bin/hawqpylib/HAWQ_HELP.py
@@ -36,6 +36,7 @@ The most commonly used hawq "commands" are:
    ssh           Provides ssh access to multiple hosts at once.
    ssh-exkeys    Exchanges SSH public keys between hosts.
    check         Verifies and validates HAWQ settings.
+   checkperf     Verifies the baseline hardware performance of hosts.
 
 See 'hawq <command> help' for more information on a specific command.
 """

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/263fe46e/tools/bin/lib/hawqinit.sh
----------------------------------------------------------------------
diff --git a/tools/bin/lib/hawqinit.sh b/tools/bin/lib/hawqinit.sh
index 2f3cd0c..808cb5f 100755
--- a/tools/bin/lib/hawqinit.sh
+++ b/tools/bin/lib/hawqinit.sh
@@ -102,14 +102,14 @@ get_all_ip_address() {
     fi
 
     master_ip_address_all=`${SSH} ${master_host_name} "${cmd_str}"`
-    if [ -z ${master_ip_address_all} ];then
+    if [ -z "${master_ip_address_all}" ];then
         ${ECHO} "Failed to get master ip addresses"
         exit 1
     fi
 
     if [ "${standby_host_lowercase}" != "none" ] && [ -n "${standby_host_lowercase}"
];then
         standby_ip_address_all=`${SSH} ${standby_host_name} "${cmd_str}"`
-        if [ -z ${standby_ip_address_all} ];then
+        if [ -z "${standby_ip_address_all}" ];then
             ${ECHO} "Failed to get standby ip addresses"
             exit 1
         fi
@@ -117,7 +117,7 @@ get_all_ip_address() {
 
     segment_ip_address_all=`${SSH} localhost "${cmd_str}"`
 
-    if [ -z ${segment_ip_address_all} ];then
+    if [ -z "${segment_ip_address_all}" ];then
         ${ECHO} "Failed to get segment ip addresses"
         exit 1
     fi

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/263fe46e/tools/doc/gpcheck_help
----------------------------------------------------------------------
diff --git a/tools/doc/gpcheck_help b/tools/doc/gpcheck_help
index 328b7be..f57765e 100644
--- a/tools/doc/gpcheck_help
+++ b/tools/doc/gpcheck_help
@@ -136,6 +136,6 @@ View collected HAWQ platform settings:
 SEE ALSO
 *****************************************************
 
-gpcheckperf
+hawq checkperf
 
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/263fe46e/tools/doc/gpcheckperf_help
----------------------------------------------------------------------
diff --git a/tools/doc/gpcheckperf_help b/tools/doc/gpcheckperf_help
index a27adc3..05ad69f 100755
--- a/tools/doc/gpcheckperf_help
+++ b/tools/doc/gpcheckperf_help
@@ -1,4 +1,4 @@
-COMMAND NAME: gpcheckperf
+COMMAND NAME: hawq checkperf
 
 Verifies the baseline hardware performance of the specified hosts.
 
@@ -6,27 +6,27 @@ Verifies the baseline hardware performance of the specified hosts.
 SYNOPSIS
 *****************************************************
 
-gpcheckperf -d <test_directory> [-d <test_directory> ...] 
-       {-f <hostfile_gpcheckperf> | -h <hostname> [-h <hostname> ...]}

+hawq checkperf -d <test_directory> [-d <test_directory> ...] 
+       {-f <hostfile_checkperf> | -h <hostname> [-h <hostname> ...]} 
        [-r ds] [-B <block_size>] [-S <file_size>] [-D] [-v|-V]
 
 
-gpcheckperf -d <temp_directory>
+hawq checkperf -d <temp_directory>
         {-f <hostfile_gpchecknet> | -h <hostname> [-h <hostname> ...]}

         [ -r n|N|M [--duration <time>] [--netperf] ] [-D] [-v|-V]
 
 
-gpcheckperf -? 
+hawq checkperf -? 
 
 
-gpcheckperf --version
+hawq checkperf --version
 
 
 *****************************************************
 DESCRIPTION
 *****************************************************
 
-The gpcheckperf utility starts a session on the specified hosts 
+The hawq checkperf utility starts a session on the specified hosts 
 and runs the following performance tests:
 
 * Disk I/O Test (dd test) - To test the sequential throughput 
@@ -74,17 +74,17 @@ network interfaces configured on different subnets, run the network
 test once for each subnet.
 
 You must also specify at least one test directory (with -d). 
-The user who runs gpcheckperf must have write access to the 
+The user who runs hawq checkperf must have write access to the 
 specified test directories on all remote hosts. For the disk 
 I/O test, the test directories should correspond to your segment 
 data directories (primary and/or mirrors). For the memory bandwidth
 and network tests, a temporary directory is required for the test 
 program files.
 
-Before using gpcheckperf, you must have a trusted host setup between
+Before using hawq checkperf, you must have a trusted host setup between
  the hosts involved in the performance test. Use the utility 
 gpssh-exkeys to update the known host files and exchange public 
-keys between hosts. Note that gpcheckperf calls to gpssh and gpscp,
+keys between hosts. Note that hawq checkperf calls to gpssh and gpscp,
 so these HAWQ utilities must also be in your $PATH.
 
 *****************************************************
@@ -126,7 +126,7 @@ OPTIONS
  minutes (m), hours (h), or days (d). The default is 15 seconds.
 
 
--f <hostfile_gpcheckperf>
+-f <hostfile_checkperf>
 
  For the disk I/O and stream tests, specifies the name of a file that 
  contains one host name per host that will participate in the performance 
@@ -185,7 +185,7 @@ OPTIONS
  Specifies the total file size to be used for the disk I/O test for 
  all directories specified with -d. file_size should equal two times 
  total RAM on the host. If not specified, the default is calculated 
- at two times the total RAM on the host where gpcheckperf is executed. 
+ at two times the total RAM on the host where hawq checkperf is executed. 
  This ensures that the test is truly testing disk I/O and not using 
  the memory cache. You can specify sizing in KB, MB, or GB.
 
@@ -215,22 +215,22 @@ EXAMPLES
 Run the disk I/O and memory bandwidth tests on all the hosts 
 in the file host_file using the test directory of /data1 and /data2:
 
-$ gpcheckperf -f hostfile_gpcheckperf -d /data1 -d /data2 -r ds
+$ hawq checkperf -f hostfile_checkperf -d /data1 -d /data2 -r ds
 
 
 Run only the disk I/O test on the hosts named sdw1 and sdw2 
 using the test directory of /data1. Show individual host 
 results and run in verbose mode:
 
-$ gpcheckperf -h sdw1 -h sdw2 -d /data1 -r d -D -v
+$ hawq checkperf -h sdw1 -h sdw2 -d /data1 -r d -D -v
 
 
 Run the parallel network test using the test directory of /tmp, 
 where host_file_subnet* specifies all network interface host 
 names within the same subnet:
 
-$ gpcheckperf -f hostfile_gpchecknet_ic1 -r N -d /tmp
-$ gpcheckperf -f hostfile_gpchecknet_ic2 -r N -d /tmp
+$ hawq checkperf -f hostfile_gpchecknet_ic1 -r N -d /tmp
+$ hawq checkperf -f hostfile_gpchecknet_ic2 -r N -d /tmp
 
 
 Run the same test as above, but use netperf instead of the 
@@ -238,13 +238,13 @@ HAWQ network test (note that netperf must be installed
 in $GPHOME/bin/lib on all HAWQ hosts):
 
 
-$ gpcheckperf -f hostfile_gpchecknet_ic1 -r N --netperf -d /tmp
-$ gpcheckperf -f hostfile_gpchecknet_ic2 -r N --netperf -d /tmp
+$ hawq checkperf -f hostfile_gpchecknet_ic1 -r N --netperf -d /tmp
+$ hawq checkperf -f hostfile_gpchecknet_ic2 -r N --netperf -d /tmp
 
 
 *****************************************************
 SEE ALSO
 *****************************************************
 
-gpssh, gpscp, gpcheck
+hawq ssh, hawq scp, hawq check
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/263fe46e/tools/doc/gpsys1_help
----------------------------------------------------------------------
diff --git a/tools/doc/gpsys1_help b/tools/doc/gpsys1_help
index 50dd83e..95fd44c 100755
--- a/tools/doc/gpsys1_help
+++ b/tools/doc/gpsys1_help
@@ -69,4 +69,4 @@ gpsys1
 SEE ALSO
 *****************************************************
 
-gpcheckperf
+hawq checkperf


Mime
View raw message