hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r393261 - in /lucene/hadoop/trunk: bin/slaves.sh conf/hadoop-env.sh.template
Date Tue, 11 Apr 2006 17:01:04 GMT
Author: cutting
Date: Tue Apr 11 10:01:02 2006
New Revision: 393261

URL: http://svn.apache.org/viewcvs?rev=393261&view=rev
Log:
Stop using ssh options by default that are not yet in widely used versions of ssh.  Folks
can still enable their use by uncommenting a line in conf/hadoop-env.sh.

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=393261&r1=393260&r2=393261&view=diff
==============================================================================
--- lucene/hadoop/trunk/bin/slaves.sh (original)
+++ lucene/hadoop/trunk/bin/slaves.sh Tue Apr 11 10:01:02 2006
@@ -8,6 +8,7 @@
 #     Default is ${HADOOP_CONF_DIR}/slaves.
 #   HADOOP_CONF_DIR  Alternate conf dir. Default is ${HADOOP_HOME}/conf.
 #   HADOOP_SLAVE_SLEEP Seconds to sleep between spawning remote commands.
+#   HADOOP_SSH_OPTS Options passed to ssh when running remote commands.
 ##
 
 usage="Usage: slaves.sh command..."
@@ -42,15 +43,6 @@
 
 if [ "$HADOOP_SLAVES" = "" ]; then
   export HADOOP_SLAVES="${HADOOP_CONF_DIR}/slaves"
-fi
-
-# By default, forward HADOOP_CONF_DIR environment variable to the
-# remote slave. Remote slave must have following added to its
-# /etc/ssh/sshd_config:
-#   AcceptEnv HADOOP_CONF_DIR
-# See'man ssh_config for more on SendEnv and AcceptEnv.
-if [ "$HADOOP_SSH_OPTS" = "" ]; then
-  export HADOOP_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR"
 fi
 
 for slave in `cat "$HADOOP_SLAVES"`; do

Modified: lucene/hadoop/trunk/conf/hadoop-env.sh.template
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/conf/hadoop-env.sh.template?rev=393261&r1=393260&r2=393261&view=diff
==============================================================================
--- lucene/hadoop/trunk/conf/hadoop-env.sh.template (original)
+++ lucene/hadoop/trunk/conf/hadoop-env.sh.template Tue Apr 11 10:01:02 2006
@@ -14,7 +14,7 @@
 # Extra Java runtime options.  Empty by default.
 # export HADOOP_OPTS=-server
 
-# Extra ssh options.  Default: '-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR'.
+# Extra ssh options.  Empty by default.
 # export HADOOP_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR"
 
 # Where log files are stored.  $HADOOP_HOME/logs by default.



Mime
View raw message