Repository: oozie Updated Branches: refs/heads/master c93f94835 -> 6ac2679e9
OOZIE-3307 amend [core] Limit heap usage of LauncherAM (andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/6ac2679e Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/6ac2679e Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/6ac2679e Branch: refs/heads/master Commit: 6ac2679e9f69e0d0619a6a179ed3849bb59d1b24 Parents: c93f948 Author: Andras Piros <andras.pi...@cloudera.com> Authored: Wed Sep 26 12:25:49 2018 +0200 Committer: Andras Piros <andras.pi...@cloudera.com> Committed: Wed Sep 26 12:25:49 2018 +0200 ---------------------------------------------------------------------- .../oozie/action/hadoop/LauncherMainTester.java | 18 +++++++++--------- release-log.txt | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/6ac2679e/core/src/test/java/org/apache/oozie/action/hadoop/LauncherMainTester.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/LauncherMainTester.java b/core/src/test/java/org/apache/oozie/action/hadoop/LauncherMainTester.java index bcab80c..c220a5f 100644 --- a/core/src/test/java/org/apache/oozie/action/hadoop/LauncherMainTester.java +++ b/core/src/test/java/org/apache/oozie/action/hadoop/LauncherMainTester.java @@ -64,21 +64,21 @@ public class LauncherMainTester { throw new RuntimeException("Failing on purpose"); } - final String firstArgument = args[0]; + final String firstArgument = args.length > 0 ? args[0] : null; if (args.length == 1) { - if (firstArgument.equals("throwable")) { + if ("throwable".equals(firstArgument)) { throw new Throwable("throwing throwable"); } - if (firstArgument.equals("exception")) { + if ("exception".equals(firstArgument)) { throw new IOException("throwing exception"); } - if (firstArgument.equals("exit0")) { + if ("exit0".equals(firstArgument)) { System.exit(0); } - if (firstArgument.equals("exit1")) { + if ("exit1".equals(firstArgument)) { System.exit(1); } - if (firstArgument.equals("out")) { + if ("out".equals(firstArgument)) { File file = new File(System.getProperty("oozie.action.output.properties")); Properties props = new Properties(); props.setProperty("a", "A"); @@ -87,7 +87,7 @@ public class LauncherMainTester { os.close(); System.out.println(file.getAbsolutePath()); } - if (firstArgument.equals("id")) { + if ("id".equals(firstArgument)) { File file = new File(System.getProperty("oozie.action.newId")); Properties props = new Properties(); props.setProperty("id", "IDSWAP"); @@ -96,7 +96,7 @@ public class LauncherMainTester { os.close(); System.out.println(file.getAbsolutePath()); } - if (firstArgument.equals("securityManager")) { + if ("securityManager".equals(firstArgument)) { SecurityManager sm = System.getSecurityManager(); if (sm == null) { throw new Throwable("no security manager"); @@ -113,7 +113,7 @@ public class LauncherMainTester { } } if(args.length == 3) { - if(firstArgument.equals("javamapreduce")) { + if ("javamapreduce".equals(firstArgument)) { executeJavaMapReduce(args); } } http://git-wip-us.apache.org/repos/asf/oozie/blob/6ac2679e/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 89d1e0d..3f24a84 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3307 amend [core] Limit heap usage of LauncherAM (andras.piros) OOZIE-3343 [build] [tests] Add the first five test errors per module to the report (kmarton via andras.piros) OOZIE-3307 [core] Limit heap usage of LauncherAM (andras.piros) OOZIE-3352 [tests] TestCallableQueueService#testPriorityExecutionOrder() is flaky (pbacsko)