Author: apurtell
Date: Thu Dec 31 20:50:56 2009
New Revision: 894938
URL: http://svn.apache.org/viewvc?rev=894938&view=rev
Log:
HBASE-2084 [EC2] JAVA_HOME handling broken
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/bin/hbase
hadoop/hbase/trunk/bin/hbase-config.sh
hadoop/hbase/trunk/bin/hbase-daemon.sh
hadoop/hbase/trunk/bin/regionservers.sh
hadoop/hbase/trunk/bin/zookeepers.sh
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=894938&r1=894937&r2=894938&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu Dec 31 20:50:56 2009
@@ -274,6 +274,7 @@
HBASE-1956 Export HDFS read and write latency as a metric
HBASE-2080 [EC2] Support multivolume local instance storage
HBASE-2083 [EC2] HDFS DataNode no longer required on master
+ HBASE-2084 [EC2] JAVA_HOME handling broken
HBASE-2036 Use Configuration instead of HBaseConfiguration (Enis Soztutar
via Stack)
NEW FEATURES
Modified: hadoop/hbase/trunk/bin/hbase
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/hbase?rev=894938&r1=894937&r2=894938&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/hbase (original)
+++ hadoop/hbase/trunk/bin/hbase Thu Dec 31 20:50:56 2009
@@ -71,22 +71,6 @@
COMMAND=$1
shift
-# Source the hbase-env.sh. Will have JAVA_HOME defined.
-if [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then
- . "${HBASE_CONF_DIR}/hbase-env.sh"
-fi
-
-# some Java parameters
-if [ "$JAVA_HOME" != "" ]; then
- #echo "run java in $JAVA_HOME"
- JAVA_HOME=$JAVA_HOME
-fi
-
-if [ "$JAVA_HOME" = "" ]; then
- echo "Error: JAVA_HOME is not set."
- exit 1
-fi
-
JAVA=$JAVA_HOME/bin/java
JAVA_HEAP_MAX=-Xmx1000m
Modified: hadoop/hbase/trunk/bin/hbase-config.sh
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/hbase-config.sh?rev=894938&r1=894937&r2=894938&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/hbase-config.sh (original)
+++ hadoop/hbase/trunk/bin/hbase-config.sh Thu Dec 31 20:50:56 2009
@@ -74,6 +74,11 @@
# List of hbase regions servers.
HBASE_REGIONSERVERS="${HBASE_REGIONSERVERS:-$HBASE_CONF_DIR/regionservers}"
+# Source the hbase-env.sh. Will have JAVA_HOME defined.
+if [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then
+ . "${HBASE_CONF_DIR}/hbase-env.sh"
+fi
+
if [ -z "$JAVA_HOME" ]; then
for candidate in \
/usr/lib/jvm/java-6-sun \
Modified: hadoop/hbase/trunk/bin/hbase-daemon.sh
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/hbase-daemon.sh?rev=894938&r1=894937&r2=894938&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/hbase-daemon.sh (original)
+++ hadoop/hbase/trunk/bin/hbase-daemon.sh Thu Dec 31 20:50:56 2009
@@ -71,10 +71,6 @@
fi
}
-if [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then
- . "${HBASE_CONF_DIR}/hbase-env.sh"
-fi
-
# get log directory
if [ "$HBASE_LOG_DIR" = "" ]; then
export HBASE_LOG_DIR="$HBASE_HOME/logs"
Modified: hadoop/hbase/trunk/bin/regionservers.sh
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/regionservers.sh?rev=894938&r1=894937&r2=894938&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/regionservers.sh (original)
+++ hadoop/hbase/trunk/bin/regionservers.sh Thu Dec 31 20:50:56 2009
@@ -51,10 +51,6 @@
# hbase-env.sh. Save it here.
HOSTLIST=$HBASE_REGIONSERVERS
-if [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then
- . "${HBASE_CONF_DIR}/hbase-env.sh"
-fi
-
if [ "$HOSTLIST" = "" ]; then
if [ "$HBASE_REGIONSERVERS" = "" ]; then
export HOSTLIST="${HBASE_CONF_DIR}/regionservers"
Modified: hadoop/hbase/trunk/bin/zookeepers.sh
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/zookeepers.sh?rev=894938&r1=894937&r2=894938&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/zookeepers.sh (original)
+++ hadoop/hbase/trunk/bin/zookeepers.sh Thu Dec 31 20:50:56 2009
@@ -43,10 +43,6 @@
. "$bin"/hbase-config.sh
-if [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then
- . "${HBASE_CONF_DIR}/hbase-env.sh"
-fi
-
if [ "$HBASE_MANAGES_ZK" = "" ]; then
HBASE_MANAGES_ZK=true
fi
