Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 45937 invoked from network); 1 Mar 2006 18:51:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Mar 2006 18:51:21 -0000 Received: (qmail 31028 invoked by uid 500); 1 Mar 2006 18:52:04 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 30963 invoked by uid 500); 1 Mar 2006 18:52:04 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 30652 invoked by uid 99); 1 Mar 2006 18:52:03 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Mar 2006 10:52:02 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 01 Mar 2006 10:52:01 -0800 Received: (qmail 45686 invoked by uid 65534); 1 Mar 2006 18:50:54 -0000 Message-ID: <20060301185054.45684.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r382121 - in /lucene/hadoop/trunk: bin/slaves.sh conf/hadoop-env.sh.template Date: Wed, 01 Mar 2006 18:50:53 -0000 To: hadoop-commits@lucene.apache.org From: cutting@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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