Repository: hbase Updated Branches: refs/heads/master d1619bceb -> ec877959d
HBASE-13120 Allow disabling hadoop classpath and native library lookup (Siddharth Wagle) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ec877959 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ec877959 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ec877959 Branch: refs/heads/master Commit: ec877959d7611ed8edfb15d67f5a662080c2e6da Parents: d1619bc Author: Enis Soztutar <[email protected]> Authored: Fri Feb 27 16:27:40 2015 -0800 Committer: Enis Soztutar <[email protected]> Committed: Fri Feb 27 16:27:40 2015 -0800 ---------------------------------------------------------------------- bin/hbase | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ec877959/bin/hbase ---------------------------------------------------------------------- diff --git a/bin/hbase b/bin/hbase index 8713837..3aebfa5 100755 --- a/bin/hbase +++ b/bin/hbase @@ -214,14 +214,17 @@ if [ "$HBASE_LIBRARY_PATH" != "" ]; then fi #If avail, add Hadoop to the CLASSPATH and to the JAVA_LIBRARY_PATH -HADOOP_IN_PATH=$(PATH="${HADOOP_HOME:-${HADOOP_PREFIX}}/bin:$PATH" which hadoop 2>/dev/null) -if [ -f ${HADOOP_IN_PATH} ]; then - HADOOP_JAVA_LIBRARY_PATH=$(HADOOP_CLASSPATH="$CLASSPATH" ${HADOOP_IN_PATH} \ - org.apache.hadoop.hbase.util.GetJavaProperty java.library.path 2>/dev/null) - if [ -n "$HADOOP_JAVA_LIBRARY_PATH" ]; then - JAVA_LIBRARY_PATH=$(append_path "${JAVA_LIBRARY_PATH}" "$HADOOP_JAVA_LIBRARY_PATH") +# Allow this functionality to be disabled +if [ "$HBASE_DISABLE_HADOOP_CLASSPATH_LOOKUP" != "true" ] ; then + HADOOP_IN_PATH=$(PATH="${HADOOP_HOME:-${HADOOP_PREFIX}}/bin:$PATH" which hadoop 2>/dev/null) + if [ -f ${HADOOP_IN_PATH} ]; then + HADOOP_JAVA_LIBRARY_PATH=$(HADOOP_CLASSPATH="$CLASSPATH" ${HADOOP_IN_PATH} \ + org.apache.hadoop.hbase.util.GetJavaProperty java.library.path 2>/dev/null) + if [ -n "$HADOOP_JAVA_LIBRARY_PATH" ]; then + JAVA_LIBRARY_PATH=$(append_path "${JAVA_LIBRARY_PATH}" "$HADOOP_JAVA_LIBRARY_PATH") + fi + CLASSPATH=$(append_path "${CLASSPATH}" `${HADOOP_IN_PATH} classpath 2>/dev/null`) fi - CLASSPATH=$(append_path "${CLASSPATH}" `${HADOOP_IN_PATH} classpath 2>/dev/null`) fi # Add user-specified CLASSPATH last
