Permit folks to modify options passed to ssh. For example, older versions of ssh do not support the ConnectTimeout option.

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

bin/slaves.sh

@@ -38,8 +38,12 @@ if [ "$HADOOP_SLAVES" = "" ]; then
   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
 

conf/hadoop-env.sh.template

@@ -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.
@@ -9,6 +14,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