You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chukwa.apache.org by as...@apache.org on 2010/02/09 20:56:19 UTC
svn commit: r908181 - in /hadoop/chukwa/trunk: CHANGES.txt bin/slaves.sh
Author: asrabkin
Date: Tue Feb 9 19:56:18 2010
New Revision: 908181
URL: http://svn.apache.org/viewvc?rev=908181&view=rev
Log:
CHUKWA-451. Shouldn't use ssh to start processes locally. Contributed by Bill Graham.
Modified:
hadoop/chukwa/trunk/CHANGES.txt
hadoop/chukwa/trunk/bin/slaves.sh
Modified: hadoop/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/CHANGES.txt?rev=908181&r1=908180&r2=908181&view=diff
==============================================================================
--- hadoop/chukwa/trunk/CHANGES.txt (original)
+++ hadoop/chukwa/trunk/CHANGES.txt Tue Feb 9 19:56:18 2010
@@ -56,6 +56,8 @@
BUG FIXES
+ CHUKWA-451. Shouldn't use ssh to start processes locally. (Bill Graham via asrabkin)
+
CHUKWA-452. Fix support for using pig on final archives. (Gerrit Jansen van Vuuren via asrabkin)
CHUKWA-443. Updated HDFS metrics logging filename. (Eric Yang)
Modified: hadoop/chukwa/trunk/bin/slaves.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/slaves.sh?rev=908181&r1=908180&r2=908181&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/slaves.sh (original)
+++ hadoop/chukwa/trunk/bin/slaves.sh Tue Feb 9 19:56:18 2010
@@ -58,8 +58,12 @@
fi
for slave in `cat "$HOSTLIST"`; do
- ssh $CHUKWA_SSH_OPTS $slave $"${@// /\\ }" \
- 2>&1 | sed "s/^/$slave: /" &
+ if [ "$slave" != "localhost" -a "$slave" != "127.0.0.1" ]; then
+ ssh $CHUKWA_SSH_OPTS $slave $"${@// /\\ }" \
+ 2>&1 | sed "s/^/$slave: /" &
+ else
+ eval $"${@// /\\ }" 2>&1 | sed "s/^/$slave: /" &
+ fi
if [ "$CHUKWA_SLAVE_SLEEP" != "" ]; then
sleep $CHUKWA_SLAVE_SLEEP
fi