svn commit: r382121 - in /lucene/hadoop/trunk: bin/slaves.sh conf/hadoop-env.sh.template

[cu...@apache.org]

Author: cutting
Date: Wed Mar  1 10:50:52 2006
New Revision: 382121

URL: http://svn.apache.org/viewcvs?rev=382121&view=rev
Log:
Permit folks to modify options passed to ssh.  For example, older versions of ssh do not support the ConnectTimeout option.

Modified:
    lucene/hadoop/trunk/bin/slaves.sh
    lucene/hadoop/trunk/conf/hadoop-env.sh.template

Modified: lucene/hadoop/trunk/bin/slaves.sh
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/bin/slaves.sh?rev=382121&r1=382120&r2=382121&view=diff
==============================================================================
--- lucene/hadoop/trunk/bin/slaves.sh (original)
+++ lucene/hadoop/trunk/bin/slaves.sh Wed Mar  1 10:50:52 2006
@@ -38,8 +38,12 @@
   export HADOOP_SLAVES="$HADOOP_HOME/conf/slaves"
 fi
 
+if [ "$HADOOP_SSH_OPTS" = "" ]; then
+  export HADOOP_SSH_OPTS="-o ConnectTimeout=1"
+fi
+
 for slave in `cat "$HADOOP_SLAVES"`; do
- ssh -o ConnectTimeout=1 $slave $"${@// /\\ }" \
+ ssh $HADOOP_SSH_OPTS $slave $"${@// /\\ }" \
    2>&1 | sed "s/^/$slave: /" &
 done
 

Modified: lucene/hadoop/trunk/conf/hadoop-env.sh.template
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/conf/hadoop-env.sh.template?rev=382121&r1=382120&r2=382121&view=diff
==============================================================================
--- lucene/hadoop/trunk/conf/hadoop-env.sh.template (original)
+++ lucene/hadoop/trunk/conf/hadoop-env.sh.template Wed Mar  1 10:50:52 2006
@@ -1,6 +1,11 @@
 # Set Hadoop-specific environment variables here.
 
-# The java implementation to use.
+# The only required environment variable is JAVA_HOME.  All others are
+# optional.  When running a distributed configuration it is best to
+# set JAVA_HOME in this file, so that it is correctly defined on
+# remote nodes.
+
+# The java implementation to use.  Required.
 # export JAVA_HOME=/usr/bin/java
 
 # The maximum amount of heap to use, in MB. Default is 1000.
@@ -8,6 +13,9 @@
 
 # Extra Java runtime options.  Empty by default.
 # export HADOOP_OPTS=-server
+
+# Extra ssh options.  Default is '-o ConnectTimeout=1'.
+# export HADOOP_SSH_OPTS="-o ConnectTimeout=1"
 
 # Where log files are stored.  $HADOOP_HOME/logs by default.
 # export HADOOP_LOG_DIR=${HADOOP_HOME}/logs