Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-2084 [EC2] JAVA_HOME handling broken 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@894938 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Kyle Purtell 2009-12-31 20:50:56 +00:00
parent 11049ae7e4
commit 11d2b63d1c
6 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -274,6 +274,7 @@ Release 0.21.0 - Unreleased
HBASE-1956 Export HDFS read and write latency as a metric HBASE-1956 Export HDFS read and write latency as a metric
HBASE-2080 [EC2] Support multivolume local instance storage HBASE-2080 [EC2] Support multivolume local instance storage
HBASE-2083 [EC2] HDFS DataNode no longer required on master 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) HBASE-2036 Use Configuration instead of HBaseConfiguration (Enis Soztutar via Stack)
NEW FEATURES NEW FEATURES

16
bin/hbase
View File

@ -71,22 +71,6 @@ fi
COMMAND=$1 COMMAND=$1
shift 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=$JAVA_HOME/bin/java
JAVA_HEAP_MAX=-Xmx1000m JAVA_HEAP_MAX=-Xmx1000m

5
bin/hbase-config.sh
View File

@ -74,6 +74,11 @@ HBASE_CONF_DIR="${HBASE_CONF_DIR:-$HBASE_HOME/conf}"
# List of hbase regions servers. # List of hbase regions servers.
HBASE_REGIONSERVERS="${HBASE_REGIONSERVERS:-$HBASE_CONF_DIR/regionservers}" 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 if [ -z "$JAVA_HOME" ]; then
for candidate in \ for candidate in \
/usr/lib/jvm/java-6-sun \ /usr/lib/jvm/java-6-sun \

4
bin/hbase-daemon.sh
View File

@ -71,10 +71,6 @@ hbase_rotate_log ()
fi fi
} }
if [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then
. "${HBASE_CONF_DIR}/hbase-env.sh"
fi
# get log directory # get log directory
if [ "$HBASE_LOG_DIR" = "" ]; then if [ "$HBASE_LOG_DIR" = "" ]; then
export HBASE_LOG_DIR="$HBASE_HOME/logs" export HBASE_LOG_DIR="$HBASE_HOME/logs"

4
bin/regionservers.sh
View File

@ -51,10 +51,6 @@ bin=`cd "$bin"; pwd`
# hbase-env.sh. Save it here. # hbase-env.sh. Save it here.
HOSTLIST=$HBASE_REGIONSERVERS HOSTLIST=$HBASE_REGIONSERVERS
if [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then
. "${HBASE_CONF_DIR}/hbase-env.sh"
fi
if [ "$HOSTLIST" = "" ]; then if [ "$HOSTLIST" = "" ]; then
if [ "$HBASE_REGIONSERVERS" = "" ]; then if [ "$HBASE_REGIONSERVERS" = "" ]; then
export HOSTLIST="${HBASE_CONF_DIR}/regionservers" export HOSTLIST="${HBASE_CONF_DIR}/regionservers"

4
bin/zookeepers.sh
View File

@ -43,10 +43,6 @@ bin=`cd "$bin"; pwd`
. "$bin"/hbase-config.sh . "$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 if [ "$HBASE_MANAGES_ZK" = "" ]; then
HBASE_MANAGES_ZK=true HBASE_MANAGES_ZK=true
fi fi