[GitHub] flink pull request #4511: [FLINK-7396] Don't put multiple directories in HAD...

[zjureel]

Github user zjureel closed the pull request at:

https://github.com/apache/flink/pull/4511


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] flink pull request #4511: [FLINK-7396] Don't put multiple directories in HAD...

[aljoscha]

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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] flink pull request #4511: [FLINK-7396] Don't put multiple directories in HAD...

[zjureel]

GitHub user zjureel opened a pull request:

https://github.com/apache/flink/pull/4511

[FLINK-7396] Don't put multiple directories in HADOOP_CONF_DIR in config.sh

## What is the purpose of the change

Fix put multiple directories in HADOOP_CONF_DIR in config.sh


## Brief change log

*(for example:)*
  - *Check whether HADOOP_CONF_DIR before put directory to it*


## Verifying this change

*(Please pick either of the following options)*

No test case

## Does this pull request potentially affect one of the following parts:

  - Dependencies (does it add or upgrade a dependency): (no)
  - The public API, i.e., is any changed class annotated with 
`@Public(Evolving)`: (no)
  - The serializers: (no)
  - The runtime per-record code paths (performance sensitive): (no)
  - Anything that affects deployment or recovery: JobManager (and its 
components), Checkpointing, Yarn/Mesos, ZooKeeper: (no)

## Documentation

  - Does this pull request introduce a new feature? (no)
  - If yes, how is the feature documented? (not applicable / docs / 
JavaDocs / not documented)



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/zjureel/flink FLINK-7396

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/flink/pull/4511.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #4511


commit 4d25ba8abad862a5cd04812311043de7f83cac89
Author: zjureel 
Date:   2017-08-10T08:52:43Z

[FLINK-7396] Fix don't put multiple directories in HADOOP_CONF_DIR in 
config.sh




---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---