Author: cdouglas
Date: Fri Dec 19 17:17:25 2008
New Revision: 728211
URL: http://svn.apache.org/viewvc?rev=728211&view=rev
Log:
HADOOP-4894. Correctly parse ps output in Chukwa jettyCollector.sh. Contributed
by Ari Rabkin
Modified:
hadoop/core/branches/branch-0.20/CHANGES.txt
hadoop/core/branches/branch-0.20/src/contrib/chukwa/bin/jettyCollector.sh
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=728211&r1=728210&r2=728211&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Fri Dec 19 17:17:25 2008
@@ -469,6 +469,9 @@
HADOOP-4827. Replace Consolidator with Aggregator macros in Chukwa (Eric
Yang via cdouglas)
+ HADOOP-4894. Correctly parse ps output in Chukwa jettyCollector.sh. (Ari
+ Rabkin via cdouglas)
+
Release 0.19.1 - Unreleased
IMPROVEMENTS
Modified:
hadoop/core/branches/branch-0.20/src/contrib/chukwa/bin/jettyCollector.sh
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/chukwa/bin/jettyCollector.sh?rev=728211&r1=728210&r2=728211&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/contrib/chukwa/bin/jettyCollector.sh
(original)
+++ hadoop/core/branches/branch-0.20/src/contrib/chukwa/bin/jettyCollector.sh
Fri Dec 19 17:17:25 2008
@@ -25,7 +25,7 @@
function stop {
echo -n "Shutting down Collector..."
- ${JPS} | grep CollectorStub | grep -v grep | cut -f 1 -d" " | xargs kill
-TERM >&/dev/null
+ ${JPS} | grep CollectorStub | grep -v grep | grep -o '[^ ].*'| cut -f 1 -d"
" | xargs kill -TERM >&/dev/null
echo "done"
exit 0
}
@@ -34,4 +34,4 @@
stop
fi
-${JAVA_HOME}/bin/java -DAPP=collector
-Dlog4j.configuration=chukwa-log4j.properties -DCHUKWA_HOME=${CHUKWA_HOME}
-DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR}
-classpath
${CLASSPATH}:${CHUKWA_CORE}:${COMMON}:${HADOOP_JAR}:${CHUKWA_CONF_DIR}
org.apache.hadoop.chukwa.datacollection.collector.CollectorStub
+${JAVA_HOME}/bin/java -DAPP=collector
-Dlog4j.configuration=chukwa-log4j.properties -DCHUKWA_HOME=${CHUKWA_HOME}
-DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR}
-classpath
${CLASSPATH}:${CHUKWA_CORE}:${COMMON}:${HADOOP_JAR}:${CHUKWA_CONF_DIR}
org.apache.hadoop.chukwa.datacollection.collector.CollectorStub $@
