Repository: flink Updated Branches: refs/heads/release-1.3 866306b35 -> 7095be5d7
[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/7095be5d Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7095be5d Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7095be5d Branch: refs/heads/release-1.3 Commit: 7095be5d770d3fd4c536bb2b79f05555578020e2 Parents: 866306b Author: zjureel <zjur...@gmail.com> Authored: Thu Aug 10 16:52:43 2017 +0800 Committer: Aljoscha Krettek <aljoscha.kret...@gmail.com> Committed: Fri Aug 11 15:49:04 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/7095be5d/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 66f0d5b..92908fb 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
