Mailing-List: contact issues-help@flink.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@flink.apache.org
From: aljoscha <git@git.apache.org>
To: issues@flink.incubator.apache.org
Reply-To: issues@flink.incubator.apache.org
References: <git-pr-4511-flink@git.apache.org>
In-Reply-To: <git-pr-4511-flink@git.apache.org>
Subject: [GitHub] flink pull request #4511: [FLINK-7396] Don't put multiple directories in HAD...
Content-Type: text/plain
Message-Id: <20170810123234.DCDABE96B4@git1-us-west.apache.org>
Date: Thu, 10 Aug 2017 12:32:34 +0000 (UTC)
archived-at: Thu, 10 Aug 2017 12:32:40 -0000

Github user aljoscha commented on a diff in the pull request:

    https://github.com/apache/flink/pull/4511#discussion_r132439899
  
    --- Diff: 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_CONF_DIR:$HADOOP_HOME/conf"
    --- End diff --
    
    This is still putting multiple colon-separated directories in `HADOOP_CONF_DIR`. Simply removing `$HADOOP_CONF_DIR:` here should work. Same below.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---