OOZIE-2587 Disable SchedulerService on certain tests (pbacsko via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/7e6498f3 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/7e6498f3 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/7e6498f3 Branch: refs/heads/master Commit: 7e6498f34a799d0af547f134e902e4fdbeaa96ae Parents: 321bb52 Author: Robert Kanter <[email protected]> Authored: Tue Jul 12 17:15:22 2016 -0700 Committer: Robert Kanter <[email protected]> Committed: Tue Jul 12 17:15:22 2016 -0700 ---------------------------------------------------------------------- .../apache/oozie/command/bundle/TestBundleChangeXCommand.java | 5 ++++- .../apache/oozie/command/coord/TestAbandonedCoordChecker.java | 4 +++- .../org/apache/oozie/command/coord/TestCoordChangeXCommand.java | 3 +++ release-log.txt | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/7e6498f3/core/src/test/java/org/apache/oozie/command/bundle/TestBundleChangeXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/bundle/TestBundleChangeXCommand.java b/core/src/test/java/org/apache/oozie/command/bundle/TestBundleChangeXCommand.java index 4a406b6..f31a567 100644 --- a/core/src/test/java/org/apache/oozie/command/bundle/TestBundleChangeXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/bundle/TestBundleChangeXCommand.java @@ -38,8 +38,9 @@ import org.apache.oozie.executor.jpa.CoordJobGetJPAExecutor; import org.apache.oozie.executor.jpa.CoordJobQueryExecutor; import org.apache.oozie.executor.jpa.CoordJobQueryExecutor.CoordJobQuery; import org.apache.oozie.service.JPAService; -import org.apache.oozie.service.Services; import org.apache.oozie.service.PauseTransitService.PauseTransitRunnable; +import org.apache.oozie.service.SchedulerService; +import org.apache.oozie.service.Services; import org.apache.oozie.test.XDataTestCase; import org.apache.oozie.util.DateUtils; @@ -51,6 +52,7 @@ public class TestBundleChangeXCommand extends XDataTestCase { super.setUp(); services = new Services(); services.init(); + services.get(SchedulerService.class).destroy(); } @Override @@ -403,4 +405,5 @@ public class TestBundleChangeXCommand extends XDataTestCase { assertEquals(CoordinatorJob.Status.RUNNING, action3.getStatus()); assertEquals(action3.getPending(), 1); } + } http://git-wip-us.apache.org/repos/asf/oozie/blob/7e6498f3/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java b/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java index 0b10e3c..2af6db6 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java @@ -26,9 +26,10 @@ import org.apache.oozie.client.CoordinatorAction; import org.apache.oozie.client.CoordinatorJob; import org.apache.oozie.executor.jpa.CoordJobQueryExecutor; import org.apache.oozie.executor.jpa.CoordJobQueryExecutor.CoordJobQuery; +import org.apache.oozie.service.AbandonedCoordCheckerService.AbandonedCoordCheckerRunnable; +import org.apache.oozie.service.SchedulerService; import org.apache.oozie.service.Services; import org.apache.oozie.test.XDataTestCase; -import org.apache.oozie.service.AbandonedCoordCheckerService.AbandonedCoordCheckerRunnable; public class TestAbandonedCoordChecker extends XDataTestCase { private Services services; @@ -38,6 +39,7 @@ public class TestAbandonedCoordChecker extends XDataTestCase { super.setUp(); services = new Services(); services.init(); + services.get(SchedulerService.class).destroy(); } @Override http://git-wip-us.apache.org/repos/asf/oozie/blob/7e6498f3/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java index 1834c85..8034bbe 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java @@ -46,6 +46,7 @@ import org.apache.oozie.executor.jpa.SLASummaryQueryExecutor; import org.apache.oozie.executor.jpa.SLASummaryQueryExecutor.SLASummaryQuery; import org.apache.oozie.service.CallableQueueService; import org.apache.oozie.service.JPAService; +import org.apache.oozie.service.SchedulerService; import org.apache.oozie.service.Service; import org.apache.oozie.service.Services; import org.apache.oozie.service.StatusTransitService; @@ -90,6 +91,7 @@ public class TestCoordChangeXCommand extends XDataTestCase { services = new Services(); services.init(); services.setService(FakeCallableQueueService.class); + services.get(SchedulerService.class).destroy(); } @Override @@ -594,6 +596,7 @@ public class TestCoordChangeXCommand extends XDataTestCase { setSystemProperty(StatusTransitService.CONF_BACKWARD_SUPPORT_FOR_STATES_WITHOUT_ERROR, "false"); services = new Services(); services.init(); + services.get(SchedulerService.class).destroy(); Date startTime = new Date(); Date endTime = new Date(startTime.getTime() + (20 * 60 * 1000)); http://git-wip-us.apache.org/repos/asf/oozie/blob/7e6498f3/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index e0a1841..2d40dea 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2587 Disable SchedulerService on certain tests (pbacsko via rkanter) OOZIE-2603 Give thread pools a meaningful name in CallableQueueService and SchedulerService (pbacsko via rkanter) OOZIE-2436 Fork/join workflow fails with "oozie.action.yarn.tag must not be null" (puru) OOZIE-2578 Oozie example distcp job fails to run within an encrypted zone with checksum match error (pbacsko via rkanter)
