Repository: oozie Updated Branches: refs/heads/master 32db01818 -> 19f87e24f
OOZIE-3221 Rename DEFAULT_LAUNCHER_MAX_ATTEMPS (dbist13 via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/19f87e24 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/19f87e24 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/19f87e24 Branch: refs/heads/master Commit: 19f87e24fd5ed953cff82ef96fb63ef739fa4f4f Parents: 32db018 Author: Andras Piros <[email protected]> Authored: Fri Apr 20 11:24:22 2018 +0200 Committer: Andras Piros <[email protected]> Committed: Fri Apr 20 11:24:22 2018 +0200 ---------------------------------------------------------------------- .../org/apache/oozie/action/hadoop/JavaActionExecutor.java | 6 +++--- release-log.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/19f87e24/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 427f43d..0ba3cbf 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 @@ -130,7 +130,7 @@ public class JavaActionExecutor extends ActionExecutor { public static final String DEFAULT_LAUNCHER_MEMORY_MB = "oozie.launcher.default.memory.mb"; public static final String DEFAULT_LAUNCHER_PRIORITY = "oozie.launcher.default.priority"; public static final String DEFAULT_LAUNCHER_QUEUE = "oozie.launcher.default.queue"; - public static final String DEFAULT_LAUNCHER_MAX_ATTEMPS = "oozie.launcher.default.max.attempts"; + public static final String DEFAULT_LAUNCHER_MAX_ATTEMPTS = "oozie.launcher.default.max.attempts"; public static final String LAUNCER_MODIFY_ACL = "oozie.launcher.modify.acl"; public static final String LAUNCER_VIEW_ACL = "oozie.launcher.view.acl"; @@ -1180,7 +1180,7 @@ public class JavaActionExecutor extends ActionExecutor { private void setMaxAttempts(Configuration launcherJobConf, ApplicationSubmissionContext appContext) { int launcherMaxAttempts; - final int defaultLauncherMaxAttempts = ConfigurationService.getInt(DEFAULT_LAUNCHER_MAX_ATTEMPS); + final int defaultLauncherMaxAttempts = ConfigurationService.getInt(DEFAULT_LAUNCHER_MAX_ATTEMPTS); if (launcherJobConf.get(LauncherAM.OOZIE_LAUNCHER_MAX_ATTEMPTS) != null) { try { launcherMaxAttempts = launcherJobConf.getInt(LauncherAM.OOZIE_LAUNCHER_MAX_ATTEMPTS, @@ -1916,4 +1916,4 @@ public class JavaActionExecutor extends ActionExecutor { private String getActionTypeLauncherPrefix() { return "oozie.action." + getType() + ".launcher."; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/oozie/blob/19f87e24/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 35a7ecb..7b6b906 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3221 Rename DEFAULT_LAUNCHER_MAX_ATTEMPS (dbist13 via andras.piros) OOZIE-3222 The description for DAG is not accurate in the documentation (gongchuanjie via gezapeti) OOZIE-3192 OozieDBCLI does not clean up temporary files (Prabhu Joseph via gezapeti) OOZIE-3134 Potential inconsistency between the in-memory SLA map and the Oozie database (kmarton via andras.piros)
