Author: eyang
Date: Fri Mar 5 17:50:52 2010
New Revision: 919519
URL: http://svn.apache.org/viewvc?rev=919519&view=rev
Log:
CHUKWA-446. Clean up improper reference in start-*, stop-* script.
Modified:
hadoop/chukwa/trunk/bin/chukwa-daemon.sh
hadoop/chukwa/trunk/bin/start-agents.sh
hadoop/chukwa/trunk/bin/start-collectors.sh
hadoop/chukwa/trunk/bin/start-data-processors.sh
hadoop/chukwa/trunk/bin/stop-agents.sh
hadoop/chukwa/trunk/bin/stop-collectors.sh
hadoop/chukwa/trunk/bin/stop-data-processors.sh
Modified: hadoop/chukwa/trunk/bin/chukwa-daemon.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/chukwa-daemon.sh?rev=919519&r1=919518&r2=919519&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/chukwa-daemon.sh (original)
+++ hadoop/chukwa/trunk/bin/chukwa-daemon.sh Fri Mar 5 17:50:52 2010
@@ -121,22 +121,7 @@
(stop)
- if [ -f $CHUKWA_HOME/bin/$command ]; then
- $CHUKWA_HOME/bin/chukwa --config $CHUKWA_CONF_DIR $command stop
- rm -f $pid
- else
- if [ -f $pid ]; then
- if kill -0 `cat $pid` > /dev/null 2>&1; then
- echo stopping $command
- kill `cat $pid`
- rm -f $pid
- else
- echo no $command to stop
- fi
- else
- echo no $command to stop
- fi
- fi
+ $CHUKWA_HOME/bin/chukwa --config $CHUKWA_CONF_DIR $command stop
;;
(*)
Modified: hadoop/chukwa/trunk/bin/start-agents.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/start-agents.sh?rev=919519&r1=919518&r2=919519&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/start-agents.sh (original)
+++ hadoop/chukwa/trunk/bin/start-agents.sh Fri Mar 5 17:50:52 2010
@@ -28,4 +28,4 @@
. "$bin"/chukwa-config.sh
# start chukwa agents
-"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts agents start chukwa agent
+"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts agents start agent
Modified: hadoop/chukwa/trunk/bin/start-collectors.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/start-collectors.sh?rev=919519&r1=919518&r2=919519&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/start-collectors.sh (original)
+++ hadoop/chukwa/trunk/bin/start-collectors.sh Fri Mar 5 17:50:52 2010
@@ -28,4 +28,4 @@
. "$bin"/chukwa-config.sh
# start jetty collectors
-"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts collectors start "$bin"/chukwa collector
+"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts collectors start collector
Modified: hadoop/chukwa/trunk/bin/start-data-processors.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/start-data-processors.sh?rev=919519&r1=919518&r2=919519&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/start-data-processors.sh (original)
+++ hadoop/chukwa/trunk/bin/start-data-processors.sh Fri Mar 5 17:50:52 2010
@@ -22,6 +22,6 @@
. "$bin"/chukwa-config.sh
# start data processors
-"$bin"/chukwa-daemon.sh --config $CHUKWA_CONF_DIR start chukwa archive
-"$bin"/chukwa-daemon.sh --config $CHUKWA_CONF_DIR start chukwa demux
-"$bin"/chukwa-daemon.sh --config $CHUKWA_CONF_DIR start chukwa dataloader
+"$bin"/chukwa-daemon.sh --config $CHUKWA_CONF_DIR start archive
+"$bin"/chukwa-daemon.sh --config $CHUKWA_CONF_DIR start demux
+"$bin"/chukwa-daemon.sh --config $CHUKWA_CONF_DIR start dp
Modified: hadoop/chukwa/trunk/bin/stop-agents.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/stop-agents.sh?rev=919519&r1=919518&r2=919519&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/stop-agents.sh (original)
+++ hadoop/chukwa/trunk/bin/stop-agents.sh Fri Mar 5 17:50:52 2010
@@ -23,4 +23,4 @@
. "$bin"/chukwa-config.sh
-"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts agents stop "$bin"/chukwa agent stop
+"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts agents stop agent
Modified: hadoop/chukwa/trunk/bin/stop-collectors.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/stop-collectors.sh?rev=919519&r1=919518&r2=919519&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/stop-collectors.sh (original)
+++ hadoop/chukwa/trunk/bin/stop-collectors.sh Fri Mar 5 17:50:52 2010
@@ -23,4 +23,4 @@
. "$bin"/chukwa-config.sh
-"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts collectors stop "$bin"/chukwa stop collector
+"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts collectors stop collector
Modified: hadoop/chukwa/trunk/bin/stop-data-processors.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/stop-data-processors.sh?rev=919519&r1=919518&r2=919519&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/stop-data-processors.sh (original)
+++ hadoop/chukwa/trunk/bin/stop-data-processors.sh Fri Mar 5 17:50:52 2010
@@ -21,10 +21,10 @@
. "$bin"/chukwa-config.sh
-# stop demux.sh
+# stop demux
pidFile=$CHUKWA_PID_DIR/DemuxManager.pid
if [ -f $pidFile ]; then
- echo -n "Shutting down demux.sh.."
+ echo -n "Shutting down demux.."
DEMUX_PID=`head ${pidFile}`
kill -TERM ${DEMUX_PID} > /dev/null 2>&1
for i in 1 2 5; do
@@ -48,10 +48,10 @@
fi
-# stop postProcess.sh
+# stop postProcess
pidFile=$CHUKWA_PID_DIR/PostProcessorManager.pid
if [ -f $pidFile ]; then
- echo -n "Shutting down postProcess.sh ..."
+ echo -n "Shutting down dp ..."
POST_PROCESS_PID=`head ${pidFile}`
kill -TERM ${POST_PROCESS_PID} > /dev/null 2>&1
for i in 1 2 5; do
@@ -74,10 +74,10 @@
echo " no $pidFile"
fi
-# stop archive.sh
+# stop archive
pidFile=$CHUKWA_PID_DIR/ArchiveManager.pid
if [ -f $pidFile ]; then
- echo -n "Shutting down archive.sh ..."
+ echo -n "Shutting down archive ..."
POST_PROCESS_PID=`head ${pidFile}`
kill -TERM ${POST_PROCESS_PID} > /dev/null 2>&1
for i in 1 2 5; do
@@ -100,29 +100,3 @@
echo " no $pidFile"
fi
-# stop dbAdmin.sh
-pidFile=$CHUKWA_PID_DIR/dbAdmin.pid
-if [ -f $pidFile ]; then
- echo -n "Shutting down Database Admin.."
- DBADMIN_PID=`head ${pidFile}`
- kill -TERM ${DBADMIN_PID} > /dev/null 2>&1
- for i in 1 2 5; do
- test_pid=`ps ax | grep ${DBADMIN_PID} | grep -v grep | grep dbAdmin.sh | wc -l`
- if [ $test_pid -ge 1 ]; then
- sleep $i
- kill -TERM ${DBADMIN_PID} > /dev/null 2>&1
- else
- break
- fi
- done
- test_pid=`ps ax | grep ${DBADMIN_PID} | grep -v grep | grep dbAdmin.sh | wc -l`
- if [ $test_pid -ge 1 ]; then
- kill -9 ${DBADMIN_PID} > /dev/null 2>&1
- fi
- rm -f ${pidFile}
- rm -f $CHUKWA_PID_DIR/chukwa-$CHUKWA_IDENT_STRING-dbAdmin.sh.pid
- echo "done"
-else
- echo " no $pidFile"
-fi
-