Remove dead code

There was a lot of unused code in the gpMgmt bash code that hasn't
been running for quite some time. On top of really dead code, some
codepaths were reachable, but useless (like printing a non-existing
version string). Remove the dead code and replace the version print
with working code which pulls the version from the canonical source.

configure

@@ -5489,6 +5489,12 @@ if grep '\$\$' $GP_VERSION_IN > /dev/null 2>&1 ; then
     sed "s,\\$.*\\$\\$,$GP_VERSION," $GP_VERSION_IN > $GP_VERSION_HEADER
 fi
 
+GP_BASH_VERSION_IN="gpMgmt/bin/lib/gp_bash_version.sh.in"
+GP_BASH_VERSION_SH="gpMgmt/bin/lib/gp_bash_version.sh"
+if grep '##' $GP_BASH_VERSION_IN > /dev/null 2>&1 ; then
+    sed "s,##.*##,$GP_VERSION," $GP_BASH_VERSION_IN > $GP_BASH_VERSION_SH
+fi
+
 # Create compiler version string
 if test x"$GCC" = x"yes" ; then
   cc_string="GCC `${CC} --version | sed q`"

configure.in

@@ -580,6 +580,12 @@ if grep '\$\$' $GP_VERSION_IN > /dev/null 2>&1 ; then
     sed "s,\\$.*\\$\\$,$GP_VERSION," $GP_VERSION_IN > $GP_VERSION_HEADER
 fi
 
+GP_BASH_VERSION_IN="gpMgmt/bin/lib/gp_bash_version.sh.in"
+GP_BASH_VERSION_SH="gpMgmt/bin/lib/gp_bash_version.sh"
+if grep '##' $GP_BASH_VERSION_IN > /dev/null 2>&1 ; then
+    sed "s,##.*##,$GP_VERSION," $GP_BASH_VERSION_IN > $GP_BASH_VERSION_SH
+fi
+
 # Create compiler version string
 if test x"$GCC" = x"yes" ; then
   cc_string="GCC `${CC} --version | sed q`"

gpMgmt/bin/gpinitsystem

@@ -28,6 +28,7 @@ WORKDIR=`dirname $0`
 FUNCTIONS=$WORKDIR/lib/gp_bash_functions.sh
 if [ -f $FUNCTIONS ]; then
     . $FUNCTIONS
+    . $WORKDIR/lib/gp_bash_version.sh
 else
     echo "[FATAL]:-Cannot source $FUNCTIONS file Script Exits!"
     exit 2
@@ -99,7 +100,7 @@ DCA_SEGMENT_RESQUEUE_PRIORITY_SWEEPER_INTERVAL_VAL=1000
 # Functions
 #******************************************************************************
 USAGE () {
-	if [ -f ${GPDOCDIR}/$HELP_DOC_NAME ] && [ x"" == x"$SCRIPT_USAGE" ];then
+	if [ "$1" == "print_doc" ] && [ -f ${GPDOCDIR}/$HELP_DOC_NAME ]; then
 		$LESSCMD ${GPDOCDIR}/$HELP_DOC_NAME
 		exit 0
 	else
@@ -110,7 +111,6 @@ USAGE () {
 		$ECHO "      segment instance hosts."
 		$ECHO
 		$ECHO "      General options:"
-		$ECHO "      -?, display this help message & exit"
 		$ECHO "      -v, display version information & exit"
 		$ECHO
 		$ECHO "      Logging options:"
@@ -136,7 +136,6 @@ USAGE () {
 		$ECHO "      -s, standby_hostname [optional]"
 		$ECHO "      -P, standby_port [optional]"
 		$ECHO "      -F, standby_filespaces [optiona]"
-		$ECHO "      -i, do not initialize standby sync process [default:- start process]"
 		$ECHO "      -m, maximum number of connections for master instance [default ${DEFAULT_QD_MAX_CONNECT}]"
 		$ECHO "      -b, shared_buffers per instance [default $DEFAULT_BUFFERS]"
 		$ECHO "          Specify either the number of database I/O buffers (without suffix) or the"
@@ -846,14 +845,6 @@ CHK_SEG () {
 	   ERROR_EXIT "Postgres version does not match" 2
 	fi
 	
-	# since this is from the input config file we only check our one datadir
-	#CHK_DIR $GP_DIR $QE_ID
-	#if [ $EXISTS -ne 0 ]; then
-	#	ERROR_EXIT "[FATAL]:-No $GP_DIR on segment instance $QE_ID" 2
-	#else
-	#	LOG_MSG "[INFO]:-$QE_ID $GP_DIR checked"
-	#fi
-	
 	#make sure we can write to it.
 	# Check that we can write to the QE directory
     W_DIR=`$DIRNAME $GP_DIR`
@@ -1915,13 +1906,10 @@ SET_DCA_CONFIG_SETTINGS () {
 # Main Section
 #******************************************************************************
 trap 'ERROR_EXIT "[FATAL]:-Received INT or TERM signal" 2' INT TERM
-while getopts ":v'?'aiqe:c:l:-:p:m:h:on:s:P:F:b:!DB:SI:O:" opt
+while getopts ":vaqe:c:l:-:p:m:h:n:s:P:F:b:DB:SI:O:" opt
 		do
 		case $opt in
-				v ) VERSION_INFO ;;
-				'?' ) USAGE ;;
-				! ) SCRIPT_USAGE=1
-				    USAGE ;;
+				v ) print_version ;;
 				a ) unset INTERACTIVE ;;
 				q ) unset VERBOSE ;;
 				c ) CLUSTER_CONFIG=$OPTARG ;;
@@ -1954,13 +1942,15 @@ while getopts ":v'?'aiqe:c:l:-:p:m:h:on:s:P:F:b:!DB:SI:O:" opt
 						"lc-monetary"     ) LCMONETARY=$VAL ;;
 						"lc-numeric"      ) LCNUMERIC=$VAL ;;
 						"lc-time"         ) LCTIME=$VAL ;;
-						* ) LOG_MSG "[ERROR]:-Unknown option $NAME" 1; USAGE ;;
+						"help"            ) USAGE "print_doc" ;;
+						"version"         ) print_version ;;
+						* ) LOG_MSG "[ERROR]:-Unknown option --$NAME" 1; USAGE ;;
 					esac
 
 					# Check if we are missing the long option value.  Currently all
 					# long options require a value so we can just do the check once.
 					if [ x"$NAME" == x"$VAL" ]; then
-						LOG_MSG "[FATAL]:-Missing value for option $NAME" 1;
+						LOG_MSG "[FATAL]:-Missing value for option --$NAME" 1;
 						USAGE;
 					fi
 					;;

gpMgmt/bin/lib/.gitignore

@@ -6,3 +6,4 @@ paramiko
 stream
 Crypto
 paramiko
+gp_bash_version.sh

gpMgmt/bin/lib/gp_bash_version.sh.in

+gp_version="##version##"
+
+print_version ()
+{
+	progname="$(basename $0)"
+	echo "${progname} ${gp_version}"
+	exit 0
+}

gpMgmt/bin/lib/gpcreateseg.sh

@@ -58,14 +58,6 @@ TMP_PG_HBA=/tmp/pg_hba_conf_master.$$
 #******************************************************************************
 # Functions
 #******************************************************************************
-USAGE () {
-    $ECHO
-    $ECHO "      `basename $0`"
-    $ECHO
-    $ECHO "      Script called by gpinitsystem, this should not"
-    $ECHO "      be run directly"
-    exit $EXIT_STATUS
-}
 
 CHK_CALL () {
 	FILE_PREFIX=`$ECHO $PARALLEL_STATUS_FILE|$CUT -d"." -f1`
@@ -253,16 +245,15 @@ START_QE() {
 # Main Section
 #******************************************************************************
 trap '$ECHO "KILLED:$SEGMENT_LINE" >> $PARALLEL_STATUS_FILE;ERROR_EXIT "[FATAL]:-[$INST_COUNT]-Recieved INT or TERM signal" 2' INT TERM
-while getopts ":v'?'aiqe:c:l:p:m:h:on:s:" opt
+while getopts ":qp:" opt
 do
 	case $opt in
-		v ) VERSION_INFO ;;
-		'?' ) USAGE ;;
 		q ) unset VERBOSE ;;
-	        p ) PG_CONF_ADD_FILE=$OPTARG
+		p ) PG_CONF_ADD_FILE=$OPTARG
 		    shift
 		    shift ;;
-		* ) USAGE 
+		\? ) echo "Invalid option: -$OPTARG"
+			 exit 1 ;;
 	esac
 done
 

gpMgmt/bin/lib/gpsegdelete.sh

@@ -45,14 +45,6 @@ EXIT_STATUS=0
 #******************************************************************************
 # Functions
 #******************************************************************************
-USAGE () {
-		$ECHO
-		$ECHO "      `basename $0`"
-		$ECHO
-		$ECHO "      Script called by gpdeletesystem, this should not be run directly"
-		exit $EXIT_STATUS
-}
-
 CHK_CALL () {
 	FILE_PREFIX=`$ECHO $PARALLEL_STATUS_FILE|$CUT -d"." -f1`
 	if [ ! -f ${FILE_PREFIX}.$PARENT_PID ];then
@@ -109,14 +101,6 @@ DEL_SEGMENT () {
 # Main Section
 #******************************************************************************
 trap '$ECHO "KILLED|${QE_LINE}" >> $PARALLEL_STATUS_FILE;ERROR_EXIT "[FATAL]:-[$INST_COUNT]-Recieved INT or TERM signal" 2' INT TERM
-while getopts ":v'?'" opt
-	do
-	case $opt in
-		v ) VERSION_INFO ;;
-		'?' ) USAGE ;;
-		* ) USAGE 
-	esac
-done
 #Now process supplied call parameters
 PARENT_PID=$1;shift		#PID of gpstate process calling this script
 CHK_CALL

gpMgmt/bin/lib/gpseginitsb.sh

@@ -45,14 +45,6 @@ EXIT_STATUS=0
 #******************************************************************************
 # Functions
 #******************************************************************************
-USAGE () {
-		$ECHO
-		$ECHO "      `basename $0`"
-		$ECHO
-		$ECHO "      Script called by gpinitstandby, this should not be run directly"
-		exit $EXIT_STATUS
-}
-
 CHK_CALL () {
 	FILE_PREFIX=`$ECHO $PARALLEL_STATUS_FILE|$CUT -d"." -f1`
 	if [ ! -f ${FILE_PREFIX}.$PARENT_PID ];then
@@ -88,14 +80,6 @@ UPDATE_PGHBA () {
 # Main Section
 #******************************************************************************
 trap '$ECHO "KILLED:${QE_NAME}:${QE_BASE_DIR}" >> $PARALLEL_STATUS_FILE;ERROR_EXIT "[FATAL]:-[$INST_COUNT]-Recieved INT or TERM signal" 2' INT TERM
-while getopts ":v'?'" opt
-	do
-	case $opt in
-		v ) VERSION_INFO ;;
-		'?' ) USAGE ;;
-		* ) USAGE 
-	esac
-done
 #Now process supplied call parameters
 PARENT_PID=$1;shift		#PID of gpstate process calling this script
 CHK_CALL

gpMgmt/bin/lib/gpsegstate.sh

@@ -45,14 +45,6 @@ EXIT_STATUS=0
 #******************************************************************************
 # Functions
 #******************************************************************************
-USAGE () {
-		$ECHO
-		$ECHO "      `basename $0`"
-		$ECHO
-		$ECHO "      Script called by gpstate, this should not be run directly"
-		exit $EXIT_STATUS
-}
-
 CHK_CALL () {
 	FILE_PREFIX=`$ECHO $PARALLEL_STATUS_FILE|$CUT -d"." -f1`
 	if [ ! -f ${FILE_PREFIX}.$PARENT_PID ];then
@@ -151,14 +143,6 @@ GET_SEGMENT_STATUS () {
 # Main Section
 #******************************************************************************
 trap '$ECHO "KILLED:${QE_LINE}" >> $PARALLEL_STATUS_FILE;ERROR_EXIT "[FATAL]:-[$INST_COUNT]-Recieved INT or TERM signal" 2' INT TERM
-while getopts ":v'?'" opt
-	do
-	case $opt in
-		v ) VERSION_INFO ;;
-		'?' ) USAGE ;;
-		* ) USAGE 
-	esac
-done
 #Now process supplied call parameters
 PARENT_PID=$1;shift		#PID of gpstate process calling this script
 CHK_CALL

gpMgmt/doc/gpinitsystem_help

@@ -21,8 +21,6 @@ gpinitsystem -c <gpinitsystem_config>
             [--lc-time=<locale>] [--su_password=<password>] 
             [-S] [-a] [-q] [-l <logfile_directory>] [-D]
 
-gpinitsystem -? 
-
 gpinitsystem -v
 
 
@@ -234,12 +232,12 @@ OPTIONS
  than the number of segment instances).
 
 
--v
+-v | --version
 
  Displays the version of this utility.
 
 
--?
+--help
 
  Displays the online help.
 

gpdb-doc/dita/utility_guide/admin_utilities/gpinitsystem.xml

@@ -21,8 +21,6 @@
             [<b>--lc-time</b>=<varname>locale</varname>] [<b>--su_password</b>=<varname>password</varname>] 
             [<b>-S</b>] [<b>-a</b>] [<b>-q</b>] [<b>-l</b> <varname>logfile_directory</varname>] [<b>-D</b>]
 
-<b>gpinitsystem</b> <b>-?</b>
-
 <b>gpinitsystem</b> <b>-v</b></codeblock>
         </section>
         <section id="section3">
@@ -209,11 +207,11 @@
                         than the number of segment instances.</pd>
                 </plentry>
                 <plentry>
-                    <pt>-v (show utility version)</pt>
+                    <pt>-v | --version</pt>
                     <pd>Displays the version of this utility.</pd>
                 </plentry>
                 <plentry>
-                    <pt>-? (help)</pt>
+                    <pt>--help</pt>
                     <pd>Displays the online help.</pd>
                 </plentry>
             </parml>