hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r1079676 - in /incubator/hama/trunk: CHANGES.txt bin/hama-config.sh bin/start-bspd.sh bin/zookeepers.sh
Date Wed, 09 Mar 2011 06:34:24 GMT
Author: edwardyoon
Date: Wed Mar  9 06:34:23 2011
New Revision: 1079676

URL: http://svn.apache.org/viewvc?rev=1079676&view=rev
Log:
HAMA_MANAGES_ZK option doesn't work

Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/bin/hama-config.sh
    incubator/hama/trunk/bin/start-bspd.sh
    incubator/hama/trunk/bin/zookeepers.sh

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1079676&r1=1079675&r2=1079676&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Wed Mar  9 06:34:23 2011
@@ -200,6 +200,7 @@ Trunk (unreleased changes)
 
   BUG FIXES
   
+    HAMA-360: HAMA_MANAGES_ZK option doesn't work (edwardyoon)
     HAMA-355: Intermittent conflicts of enterBarrier() and leaveBarrier() (edwardyoon)
     HAMA-352: Can't send one more messages on to same server in bsp() method (edwardyoon)
     HAMA-350: Add task log appender and Fix log4j rootLogger (edwardyoon)

Modified: incubator/hama/trunk/bin/hama-config.sh
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/bin/hama-config.sh?rev=1079676&r1=1079675&r2=1079676&view=diff
==============================================================================
--- incubator/hama/trunk/bin/hama-config.sh (original)
+++ incubator/hama/trunk/bin/hama-config.sh Wed Mar  9 06:34:23 2011
@@ -54,6 +54,12 @@ fi
 # Allow alternate conf dir location.
 HAMA_CONF_DIR="${HAMA_CONF_DIR:-$HAMA_HOME/conf}"
 
+# Source the hama-env.sh.  
+# Will have JAVA_HOME and HAMA_MANAGES_ZK defined.
+if [ -f "${HAMA_CONF_DIR}/hama-env.sh" ]; then
+  . "${HAMA_CONF_DIR}/hama-env.sh"
+fi
+
 #check to see it is specified whether to use the grooms or the
 # masters file
 if [ $# -gt 1 ]

Modified: incubator/hama/trunk/bin/start-bspd.sh
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/bin/start-bspd.sh?rev=1079676&r1=1079675&r2=1079676&view=diff
==============================================================================
--- incubator/hama/trunk/bin/start-bspd.sh (original)
+++ incubator/hama/trunk/bin/start-bspd.sh Wed Mar  9 06:34:23 2011
@@ -23,8 +23,8 @@ bin=`cd "$bin"; pwd`
 
 . "$bin"/hama-config.sh
 
-# start mapred daemons
-# start jobtracker first to minimize connection errors at startup
+# start bsp daemons
+# start zookeeper first to minimize connection errors at startup
 "$bin"/hama-daemons.sh --config "${HAMA_CONF_DIR}" start zookeeper
 "$bin"/hama-daemon.sh --config $HAMA_CONF_DIR start bspmaster
 "$bin"/hama-daemons.sh --config $HAMA_CONF_DIR start groom

Modified: incubator/hama/trunk/bin/zookeepers.sh
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/bin/zookeepers.sh?rev=1079676&r1=1079675&r2=1079676&view=diff
==============================================================================
--- incubator/hama/trunk/bin/zookeepers.sh (original)
+++ incubator/hama/trunk/bin/zookeepers.sh Wed Mar  9 06:34:23 2011
@@ -24,12 +24,12 @@
 #
 # Environment Variables
 #
-#   HAMA_CONF_DIR  Alternate hbase conf dir. Default is ${HBASE_HOME}/conf.
+#   HAMA_CONF_DIR  Alternate hama conf dir. Default is ${HAMA_HOME}/conf.
 #   HAMA_SSH_OPTS Options passed to ssh when running remote commands.
 #
 # Modelled after $HADOOP_HOME/bin/slaves.sh.
 
-usage="Usage: zookeepers [--config <hbase-confdir>] command..."
+usage="Usage: zookeepers [--config <hama-confdir>] command..."
 
 # if no args specified, show usage
 if [ $# -le 0 ]; then



Mime
View raw message