HADOOP-4825. Use ps instead of jps for querying process status in Chukwa. Contributed by Eric Yang.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@725832 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -343,6 +343,9 @@ Trunk (unreleased changes)
     HADOOP-4837. Move HADOOP_CONF_DIR configuration to chukwa-env.sh (Jerome
     Boulon via cdouglas)
 
+    HADOOP-4825. Use ps instead of jps for querying process status in Chukwa.
+    (Eric Yang via cdouglas)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

src/contrib/chukwa/bin/agent.sh

@@ -22,11 +22,11 @@ bin=`cd "$bin"; pwd`
 . "$bin"/chukwa-config.sh
 
 echo "hadoop jar for agent is " ${HADOOP_JAR}
-trap '${JPS} | grep ChukwaAgent | cut -f 1 -d" " | xargs kill -TERM ; exit 0' 1 2 15
+trap '${JPS} | grep ChukwaAgent | grep -v grep | cut -f 1 -d" " | xargs kill -TERM ; exit 0' 1 2 15
 
 if [ "X$1" = "Xstop" ]; then
   echo -n "Shutting down agent..."
-  JETTY_PID=`${JPS} | grep ChukwaAgent | cut -f 1 -d" "`
+  JETTY_PID=`${JPS} | grep ChukwaAgent | grep -v grep | cut -f 1 -d" "`
   kill -TERM ${JETTY_PID} >&/dev/null
   echo "done"
   exit 0

src/contrib/chukwa/bin/chukwa-config.sh

@@ -98,8 +98,8 @@ fi
 export DATACONFIG=${CHUKWA_CONF_DIR}/mdl.xml
 COMMON=`ls ${CHUKWA_HOME}/lib/*.jar ${CHUKWA_HOME}/hadoopjars/commons*.jar`
 export COMMON=`echo ${COMMON} | sed 'y/ /:/'`
-export CHUKWA_CORE=${CHUKWA_HOME}/build/chukwa-core-${CHUKWA_VERSION}.jar
-export CHUKWA_AGENT=${CHUKWA_HOME}/build/chukwa-agent-${CHUKWA_VERSION}.jar
+export CHUKWA_CORE=${CHUKWA_HOME}/chukwa-core-${CHUKWA_VERSION}.jar
+export CHUKWA_AGENT=${CHUKWA_HOME}/chukwa-agent-${CHUKWA_VERSION}.jar
 export CURRENT_DATE=`date +%Y%m%d%H%M`
 
 if [ -z ${HADOOP_JAR} ]; then
@@ -107,9 +107,9 @@ if [ -z ${HADOOP_JAR} ]; then
         export HADOOP_HOME=../../..
     fi
     if [ -d ${HADOOP_HOME} ]; then
-        export HADOOP_JAR=`ls ${HADOOP_HOME}/build/hadoop-*-core.jar`
+        export HADOOP_JAR=`ls ${HADOOP_HOME}/hadoop-*-core.jar`
         if [ -z ${HADOOP_JAR} ]; then
-            echo "Please make sure hadoop-*-core.jar exists in ${HADOOP_HOME}/build"
+            echo "Please make sure hadoop-*-core.jar exists in ${HADOOP_HOME}"
             exit -1
         fi
     else
@@ -127,5 +127,5 @@ if [ -z "$JAVA_HOME" ] ; then
   echo ERROR! You forgot to set JAVA_HOME in conf/chukwa-env.sh   
 fi
 
-export JPS=${JAVA_HOME}/bin/jps
+export JPS="ps ax"
 

src/contrib/chukwa/bin/jettyCollector.sh

@@ -25,7 +25,7 @@ trap 'stop; exit 0' 1 2 15
 
 function stop {
   echo -n "Shutting down Collector..."
-  ${JPS} | grep CollectorStub | cut -f 1 -d" " | xargs kill -TERM >&/dev/null
+  ${JPS} | grep CollectorStub | grep -v grep | cut -f 1 -d" " | xargs kill -TERM >&/dev/null
   echo "done"
   exit 0
 }