You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2014/07/18 19:48:24 UTC
[1/3] git commit: HBASE-11534 Remove broken JAVA_HOME autodetection
in hbase-config.sh (Esteban Gutierrez)
Repository: hbase
Updated Branches:
refs/heads/0.98 562756c72 -> 1627b1616
refs/heads/branch-1 4fb32de39 -> f6fad0a2b
refs/heads/master 15815791a -> a030b17ba
HBASE-11534 Remove broken JAVA_HOME autodetection in hbase-config.sh (Esteban Gutierrez)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1627b161
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1627b161
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1627b161
Branch: refs/heads/0.98
Commit: 1627b16160be8619922defefefad1761f20d9b5b
Parents: 562756c
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Jul 18 10:46:22 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Jul 18 10:46:22 2014 -0700
----------------------------------------------------------------------
bin/hbase-config.sh | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1627b161/bin/hbase-config.sh
----------------------------------------------------------------------
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 0300fc5..36982f8 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -122,22 +122,8 @@ fi
# memory usage to explode. Tune the variable down to prevent vmem explosion.
export MALLOC_ARENA_MAX=${MALLOC_ARENA_MAX:-4}
+# Now having JAVA_HOME defined is required
if [ -z "$JAVA_HOME" ]; then
- for candidate in \
- /usr/lib/jvm/java-6-sun \
- /usr/lib/jvm/java-1.6.0-sun-1.6.0.*/jre \
- /usr/lib/jvm/java-1.6.0-sun-1.6.0.* \
- /usr/lib/j2sdk1.6-sun \
- /usr/java/jdk1.6* \
- /usr/java/jre1.6* \
- /Library/Java/Home ; do
- if [ -e $candidate/bin/java ]; then
- export JAVA_HOME=$candidate
- break
- fi
- done
- # if we didn't set it
- if [ -z "$JAVA_HOME" ]; then
cat 1>&2 <<EOF
+======================================================================+
| Error: JAVA_HOME is not set and Java could not be found |
@@ -151,5 +137,4 @@ if [ -z "$JAVA_HOME" ]; then
+======================================================================+
EOF
exit 1
- fi
fi
[2/3] git commit: HBASE-11534 Remove broken JAVA_HOME autodetection
in hbase-config.sh (Esteban Gutierrez)
Posted by ap...@apache.org.
HBASE-11534 Remove broken JAVA_HOME autodetection in hbase-config.sh (Esteban Gutierrez)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f6fad0a2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f6fad0a2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f6fad0a2
Branch: refs/heads/branch-1
Commit: f6fad0a2b971fc70f48618e18811c3de4909d5a7
Parents: 4fb32de
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Jul 18 10:46:22 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Jul 18 10:46:30 2014 -0700
----------------------------------------------------------------------
bin/hbase-config.sh | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f6fad0a2/bin/hbase-config.sh
----------------------------------------------------------------------
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 0300fc5..36982f8 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -122,22 +122,8 @@ fi
# memory usage to explode. Tune the variable down to prevent vmem explosion.
export MALLOC_ARENA_MAX=${MALLOC_ARENA_MAX:-4}
+# Now having JAVA_HOME defined is required
if [ -z "$JAVA_HOME" ]; then
- for candidate in \
- /usr/lib/jvm/java-6-sun \
- /usr/lib/jvm/java-1.6.0-sun-1.6.0.*/jre \
- /usr/lib/jvm/java-1.6.0-sun-1.6.0.* \
- /usr/lib/j2sdk1.6-sun \
- /usr/java/jdk1.6* \
- /usr/java/jre1.6* \
- /Library/Java/Home ; do
- if [ -e $candidate/bin/java ]; then
- export JAVA_HOME=$candidate
- break
- fi
- done
- # if we didn't set it
- if [ -z "$JAVA_HOME" ]; then
cat 1>&2 <<EOF
+======================================================================+
| Error: JAVA_HOME is not set and Java could not be found |
@@ -151,5 +137,4 @@ if [ -z "$JAVA_HOME" ]; then
+======================================================================+
EOF
exit 1
- fi
fi
[3/3] git commit: HBASE-11534 Remove broken JAVA_HOME autodetection
in hbase-config.sh (Esteban Gutierrez)
Posted by ap...@apache.org.
HBASE-11534 Remove broken JAVA_HOME autodetection in hbase-config.sh (Esteban Gutierrez)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a030b17b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a030b17b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a030b17b
Branch: refs/heads/master
Commit: a030b17ba7e4061215f6e2f6d6f9de54ba950bed
Parents: 1581579
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Jul 18 10:46:22 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Jul 18 10:46:34 2014 -0700
----------------------------------------------------------------------
bin/hbase-config.sh | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a030b17b/bin/hbase-config.sh
----------------------------------------------------------------------
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 0300fc5..36982f8 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -122,22 +122,8 @@ fi
# memory usage to explode. Tune the variable down to prevent vmem explosion.
export MALLOC_ARENA_MAX=${MALLOC_ARENA_MAX:-4}
+# Now having JAVA_HOME defined is required
if [ -z "$JAVA_HOME" ]; then
- for candidate in \
- /usr/lib/jvm/java-6-sun \
- /usr/lib/jvm/java-1.6.0-sun-1.6.0.*/jre \
- /usr/lib/jvm/java-1.6.0-sun-1.6.0.* \
- /usr/lib/j2sdk1.6-sun \
- /usr/java/jdk1.6* \
- /usr/java/jre1.6* \
- /Library/Java/Home ; do
- if [ -e $candidate/bin/java ]; then
- export JAVA_HOME=$candidate
- break
- fi
- done
- # if we didn't set it
- if [ -z "$JAVA_HOME" ]; then
cat 1>&2 <<EOF
+======================================================================+
| Error: JAVA_HOME is not set and Java could not be found |
@@ -151,5 +137,4 @@ if [ -z "$JAVA_HOME" ]; then
+======================================================================+
EOF
exit 1
- fi
fi