You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2017/08/11 13:48:52 UTC
flink git commit: [FLINK-7396] Fix don't put multiple directories in
HADOOP_CONF_DIR in config.sh
Repository: flink
Updated Branches:
refs/heads/master d95d20eb4 -> 1de8acc3c
[FLINK-7396] Fix don't put multiple directories in HADOOP_CONF_DIR in config.sh
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1de8acc3
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1de8acc3
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1de8acc3
Branch: refs/heads/master
Commit: 1de8acc3c89af22f10aed80d7016545db23a0ad5
Parents: d95d20e
Author: zjureel <zj...@gmail.com>
Authored: Thu Aug 10 16:52:43 2017 +0800
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Fri Aug 11 15:48:26 2017 +0200
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/bin/config.sh | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/1de8acc3/flink-dist/src/main/flink-bin/bin/config.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/config.sh b/flink-dist/src/main/flink-bin/bin/config.sh
index 5882062..69f1562 100755
--- a/flink-dist/src/main/flink-bin/bin/config.sh
+++ b/flink-dist/src/main/flink-bin/bin/config.sh
@@ -336,16 +336,18 @@ if [ -z "${JVM_ARGS}" ]; then
JVM_ARGS=""
fi
-# Check if deprecated HADOOP_HOME is set.
-if [ -n "$HADOOP_HOME" ]; then
- # HADOOP_HOME is set. Check if its a Hadoop 1.x or 2.x HADOOP_HOME path
- if [ -d "$HADOOP_HOME/conf" ]; then
- # its a Hadoop 1.x
- HADOOP_CONF_DIR="$HADOOP_CONF_DIR:$HADOOP_HOME/conf"
- fi
- if [ -d "$HADOOP_HOME/etc/hadoop" ]; then
- # Its Hadoop 2.2+
- HADOOP_CONF_DIR="$HADOOP_CONF_DIR:$HADOOP_HOME/etc/hadoop"
+# Check if deprecated HADOOP_HOME is set, and specify config path to HADOOP_CONF_DIR if it's empty.
+if [ -z "$HADOOP_CONF_DIR" ]; then
+ if [ -n "$HADOOP_HOME" ]; then
+ # HADOOP_HOME is set. Check if its a Hadoop 1.x or 2.x HADOOP_HOME path
+ if [ -d "$HADOOP_HOME/conf" ]; then
+ # its a Hadoop 1.x
+ HADOOP_CONF_DIR="$HADOOP_HOME/conf"
+ fi
+ if [ -d "$HADOOP_HOME/etc/hadoop" ]; then
+ # Its Hadoop 2.2+
+ HADOOP_CONF_DIR="$HADOOP_HOME/etc/hadoop"
+ fi
fi
fi