You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2016/01/13 00:23:47 UTC
[2/4] flink git commit: [FLINK-3218] Fix overriding of user
parameters when merging Hadoop configurations
[FLINK-3218] Fix overriding of user parameters when merging Hadoop configurations
This closes #1496
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/ee0bc131
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ee0bc131
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ee0bc131
Branch: refs/heads/master
Commit: ee0bc1310b2a9e35388bf6a7142b9541ffeb6bc7
Parents: a5b0556
Author: Greg Hogan <co...@greghogan.com>
Authored: Mon Jan 11 12:56:48 2016 -0500
Committer: Fabian Hueske <fh...@apache.org>
Committed: Tue Jan 12 22:23:18 2016 +0100
----------------------------------------------------------------------
.../apache/flink/api/java/hadoop/mapred/utils/HadoopUtils.java | 4 +++-
.../flink/api/java/hadoop/mapreduce/utils/HadoopUtils.java | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/ee0bc131/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/utils/HadoopUtils.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/utils/HadoopUtils.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/utils/HadoopUtils.java
index 9bfc09a..d279e54 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/utils/HadoopUtils.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/utils/HadoopUtils.java
@@ -47,7 +47,9 @@ public final class HadoopUtils {
public static void mergeHadoopConf(JobConf jobConf) {
org.apache.hadoop.conf.Configuration hadoopConf = getHadoopConfiguration();
for (Map.Entry<String, String> e : hadoopConf) {
- jobConf.set(e.getKey(), e.getValue());
+ if (jobConf.get(e.getKey()) == null) {
+ jobConf.set(e.getKey(), e.getValue());
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/ee0bc131/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/utils/HadoopUtils.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/utils/HadoopUtils.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/utils/HadoopUtils.java
index fd530c4..9ca3d70 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/utils/HadoopUtils.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/utils/HadoopUtils.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.mapreduce.TaskAttemptID;
/**
- * Utility class to work with next generatio of Apache Hadoop MapReduce classes.
+ * Utility class to work with next generation of Apache Hadoop MapReduce classes.
*/
public final class HadoopUtils {
@@ -39,7 +39,9 @@ public final class HadoopUtils {
Configuration hadoopConf = org.apache.flink.api.java.hadoop.mapred.utils.HadoopUtils.getHadoopConfiguration();
for (Map.Entry<String, String> e : hadoopConf) {
- configuration.set(e.getKey(), e.getValue());
+ if (configuration.get(e.getKey()) == null) {
+ configuration.set(e.getKey(), e.getValue());
+ }
}
}