소스 검색

HADOOP-12451. Setting HADOOP_HOME explicitly should be allowed. (kasha)

Karthik Kambatla 9 년 전
부모
커밋
db145e0c9a
2개의 변경된 파일6개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 0
      hadoop-common-project/hadoop-common/CHANGES.txt
  2. 4 1
      hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh

+ 2 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -707,6 +707,8 @@ Release 2.7.2 - UNRELEASED
 
     HADOOP-12213. Interrupted exception can occur when Client#stop is called.
     (Kuhu Shukla via ozawa)
+    
+    HADOOP-12451. Setting HADOOP_HOME explicitly should be allowed. (kasha)
 
 Release 2.7.1 - 2015-07-06 
 

+ 4 - 1
hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh

@@ -250,7 +250,10 @@ TOOL_PATH="${TOOL_PATH:-$HADOOP_PREFIX/share/hadoop/tools/lib/*}"
 
 HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.log.dir=$HADOOP_LOG_DIR"
 HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.log.file=$HADOOP_LOGFILE"
-HADOOP_HOME=$HADOOP_PREFIX
+
+if [ "$HADOOP_HOME" = "" ]; then
+  HADOOP_HOME=$HADOOP_PREFIX
+fi
 if [ "$cygwin" = true ]; then
   HADOOP_HOME=$(cygpath -w "$HADOOP_HOME" 2>/dev/null)
 fi