Merge pull request #1612 from jakesmith/slavenum-pid

Add slavenum to pid

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

initfiles/componentfiles/thor/start_slave

@@ -16,24 +16,21 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-prog=$1
-master=$2
-logpth=$3
-instancedir=$4
-slaveport=$5
-hpcc_compname=$6
-hpcc_setenv=$7
-logredirect=$8
+slavenum=$1
+prog=$2
+master=$3
+logpth=$4
+instancedir=$5
+slaveport=$6
+hpcc_compname=$7
+hpcc_setenv=$8
+logredirect=$9
 
 source ${hpcc_setenv}
-PID_NAME="$PID/${hpcc_compname}_slave.pid"
+PID_NAME="$PID/${hpcc_compname}_slave_${slavenum}.pid"
 
-INSTALL_DIR=`dirname ${hpcc_setenv}`/..
-source  ${INSTALL_DIR}/etc/init.d/hpcc_common
-which_pidof
-
-if [ $# -lt 8 ]; then
-  echo usage: prog master logdir workingdir slaveport hpcc_compname hpcc_setenv logredirect
+if [ $# -lt 9 ]; then
+  echo usage: slavenum prog master logdir workingdir slaveport hpcc_compname hpcc_setenv logredirect
   exit 1
 fi
 

initfiles/componentfiles/thor/start_slaves

@@ -24,12 +24,12 @@ if [ "$localthor" = "true" ]; then
         ulimit -n 8192
         let "n = 1";
         for slave in $(cat $instancedir/thorgroup); do
-        slaveport=${slave/*:/}
-        if [ "$slaveport" = "" ]; then
-            slaveport=$THORSLAVEPORT
-        fi
-        $deploydir/start_slave thorslave${LCR} $THORMASTER:$THORMASTERPORT $logdir $instancedir $slaveport $THORNAME $PATH_PRE $logdir/start_slave_$logpthtail.$n.log
-        let "n += 1";
+            slaveport=${slave/*:/}
+            if [ "$slaveport" = "" ]; then
+                slaveport=$THORSLAVEPORT
+            fi
+            $deploydir/start_slave $n thorslave${LCR} $THORMASTER:$THORMASTERPORT $logdir $instancedir $slaveport $THORNAME $PATH_PRE $logdir/start_slave_$logpthtail.$n.log
+            let "n += 1";
         done
 else
         ## multislaves for bkwd compat. with old environments
@@ -42,7 +42,7 @@ else
                     slaveport=$THORSLAVEPORT
                 fi
                 logredirect="$logdir/start_slave_$logpthtail.$n.log"
-                frunssh $ip "/bin/sh -c '$deploydir/start_slave thorslave${LCR} $THORMASTER:$THORMASTERPORT $logdir $instancedir $slaveport $THORNAME $PATH_PRE $logredirect'" -i:$SSHidentityfile -u:$SSHusername -pe:$SSHpassword -t:$SSHtimeout -a:$SSHretries 2>&1
+                frunssh $ip "/bin/sh -c '$deploydir/start_slave $n thorslave${LCR} $THORMASTER:$THORMASTERPORT $logdir $instancedir $slaveport $THORNAME $PATH_PRE $logredirect'" -i:$SSHidentityfile -u:$SSHusername -pe:$SSHpassword -t:$SSHtimeout -a:$SSHretries 2>&1
                 let "n += 1";
             done
         else
@@ -50,7 +50,7 @@ else
                 mv $instancedir/thorgroup $instancedir/thorgroup.local
             fi
             logredirect="$logdir/start_slave_$logpthtail.log"
-            frunssh $instancedir/slaves "/bin/sh -c '$deploydir/start_slave thorslave${LCR} $THORMASTER:$THORMASTERPORT $logdir $instancedir $THORSLAVEPORT $THORNAME $PATH_PRE $logredirect'" -i:$SSHidentityfile -u:$SSHusername -pe:$SSHpassword -t:$SSHtimeout -a:$SSHretries 2>&1
+            frunssh $instancedir/slaves "/bin/sh -c '$deploydir/start_slave %n thorslave${LCR} $THORMASTER:$THORMASTERPORT $logdir $instancedir $THORSLAVEPORT $THORNAME $PATH_PRE $logredirect'" -i:$SSHidentityfile -u:$SSHusername -pe:$SSHpassword -t:$SSHtimeout -a:$SSHretries 2>&1
         fi
 fi
 echo thorslaves started