Repository: oozie Updated Branches: refs/heads/master 34e329338 -> 6b6f42c33
OOZIE-3081 testSubmitWithLauncherQueue fails when FairScheduler is used (asasvari) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/6b6f42c3 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/6b6f42c3 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/6b6f42c3 Branch: refs/heads/master Commit: 6b6f42c33fb619a6ab4a5eb7f37becd175f5761e Parents: 34e3293 Author: Attila Sasvari <asasv...@cloudera.com> Authored: Wed Oct 11 14:12:19 2017 +0200 Committer: Attila Sasvari <asasv...@cloudera.com> Committed: Wed Oct 11 14:12:19 2017 +0200 ---------------------------------------------------------------------- .../action/hadoop/TestJavaActionExecutor.java | 23 ++++++++++++++++++-- release-log.txt | 1 + 2 files changed, 22 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/6b6f42c3/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java index 5c24c24..a7bd357 100644 --- a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java +++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java @@ -31,7 +31,15 @@ import java.io.Writer; import java.net.URI; import java.security.PrivilegedExceptionAction; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.examples.SleepJob; @@ -49,6 +57,7 @@ import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.hadoop.yarn.client.api.YarnClient; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.oozie.WorkflowActionBean; import org.apache.oozie.WorkflowJobBean; @@ -2518,7 +2527,17 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase { final ApplicationId appId = ConverterUtils.toApplicationId(context.getAction().getExternalId()); Configuration conf = getHadoopAccessorService().createConfiguration(getJobTrackerUri()); String queue = getHadoopAccessorService().createYarnClient(getTestUser(), conf).getApplicationReport(appId).getQueue(); - assertEquals("test", queue); + + if (isFairSchedulerUsed(conf)) { + assertEquals("root.test", queue); + } + else { + assertEquals("test", queue); + } + } + + private boolean isFairSchedulerUsed(Configuration conf) { + return conf.get(org.apache.hadoop.yarn.conf.YarnConfiguration.RM_SCHEDULER).contains(FairScheduler.class.getName()); } private HadoopAccessorService getHadoopAccessorService() { http://git-wip-us.apache.org/repos/asf/oozie/blob/6b6f42c3/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index f7adedd..762f761 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3081 testSubmitWithLauncherQueue fails when FairScheduler is used (asasvari) OOZIE-3082 Move org.apache.oozie.action.hadoop.ActionStats to Oozie ShareLib (asasvari) OOZIE-3077 SLA documentation fixes (satishsaley) OOZIE-3031 Coord job with only unresolved dependencies doesn't timeout (puru via satishsaley)