Repository: oozie Updated Branches: refs/heads/master 70f34bdd6 -> fdcd8908b
OOZIE-3370 amend Property filtering is not consistent across job submission (andras.piros) Change-Id: I107fd8991d187f728b0f3975bc4eda4883e4a9d7 Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/fdcd8908 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/fdcd8908 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/fdcd8908 Branch: refs/heads/master Commit: fdcd8908b4b29ff5c09c5bcecb313aa44c998a22 Parents: 70f34bd Author: Andras Piros <[email protected]> Authored: Thu Oct 25 12:11:03 2018 +0200 Committer: Andras Piros <[email protected]> Committed: Thu Oct 25 12:11:03 2018 +0200 ---------------------------------------------------------------------- .../apache/oozie/action/hadoop/JavaActionExecutor.java | 11 ++++------- .../src/main/java/org/apache/oozie/util/ConfigUtils.java | 4 ++-- release-log.txt | 1 + 3 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/fdcd8908/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java index 3b90268..231b38e 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java @@ -21,6 +21,7 @@ package org.apache.oozie.action.hadoop; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import com.google.common.io.Closeables; import com.google.common.primitives.Ints; @@ -166,7 +167,9 @@ public class JavaActionExecutor extends ActionExecutor { private static final String JAVA_MAIN_CLASS_NAME = "org.apache.oozie.action.hadoop.JavaMain"; private static final String HADOOP_JOB_NAME = "mapred.job.name"; - static final Set<String> DISALLOWED_PROPERTIES = new HashSet<>(); + static final Set<String> DISALLOWED_PROPERTIES = ImmutableSet.of( + OozieClient.USER_NAME, MRJobConfig.USER_NAME, HADOOP_NAME_NODE, HADOOP_YARN_RM + ); private static final String OOZIE_ACTION_NAME = "oozie.action.name"; private final static String ACTION_SHARELIB_FOR = "oozie.action.sharelib.for."; public static final String OOZIE_ACTION_DEPENDENCY_DEDUPLICATE = "oozie.action.dependency.deduplicate"; @@ -209,12 +212,6 @@ public class JavaActionExecutor extends ActionExecutor { public XConfiguration workflowConf = null; - static { - DISALLOWED_PROPERTIES.addAll(PropertiesUtils.DEFAULT_DISALLOWED_PROPERTIES); - DISALLOWED_PROPERTIES.add(HADOOP_NAME_NODE); - DISALLOWED_PROPERTIES.add(HADOOP_YARN_RM); - } - public JavaActionExecutor() { this("java"); } http://git-wip-us.apache.org/repos/asf/oozie/blob/fdcd8908/core/src/main/java/org/apache/oozie/util/ConfigUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/ConfigUtils.java b/core/src/main/java/org/apache/oozie/util/ConfigUtils.java index aa19cd3..af54145 100644 --- a/core/src/main/java/org/apache/oozie/util/ConfigUtils.java +++ b/core/src/main/java/org/apache/oozie/util/ConfigUtils.java @@ -151,8 +151,8 @@ public class ConfigUtils { final E toThrow, final boolean performWrite) throws E { Preconditions.checkNotNull(base, "base"); - Preconditions.checkNotNull(base, "newValue"); - Preconditions.checkNotNull(base, "toThrow"); + Preconditions.checkNotNull(newValue, "newValue"); + Preconditions.checkNotNull(toThrow, "toThrow"); for (final String defaultDisallowedProperty : PropertiesUtils.DEFAULT_DISALLOWED_PROPERTIES) { checkAndSetConfigValue(base, defaultDisallowedProperty, newValue, toThrow, performWrite); http://git-wip-us.apache.org/repos/asf/oozie/blob/fdcd8908/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index b8e781c..02fe7aa 100644 --- a/release-log.txt +++ b/release-log.txt @@ -7,6 +7,7 @@ OOZIE-3277 [build] Check for star imports (kmarton via andras.piros) -- Oozie 5.1.0 release +OOZIE-3370 amend Property filtering is not consistent across job submission (andras.piros) OOZIE-3370 Property filtering is not consistent across job submission (andras.piros) OOZIE-3369 [core] Upgrade guru.nidi:graphviz-java to 0.7.0 (andras.piros) OOZIE-3358 [docs] Check and fix differences between help and command line documentation for Fluent Job API (kmarton via andras.piros)
