Repository: falcon Updated Branches: refs/heads/master ee5213caf -> 86fe67f53
FALCON-1022 Wait for RUNNING status of instances before killing them. Contributed by Ruslan Ostafiychuk Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/86fe67f5 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/86fe67f5 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/86fe67f5 Branch: refs/heads/master Commit: 86fe67f5370d98778a654c5de0a3bc33c7cc6c53 Parents: ee5213c Author: Ruslan Ostafiychuk <[email protected]> Authored: Thu Feb 12 14:00:58 2015 +0200 Committer: Ruslan Ostafiychuk <[email protected]> Committed: Thu Feb 12 14:18:03 2015 +0200 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ .../regression/prism/RescheduleProcessInFinalStatesTest.java | 6 ++++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/86fe67f5/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index d571441..6351efd 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -40,6 +40,8 @@ Trunk (Unreleased) IMPROVEMENTS + FALCON-1022 Wait for RUNNING status of instances before killing them (Ruslan Ostafiychuk) + FALCON-968 Remove only entities submitted by same test and baseHDFSDir usage refactored (Ruslan Ostafiychuk via Raghav Kumar Gautam) http://git-wip-us.apache.org/repos/asf/falcon/blob/86fe67f5/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java index 211de76..7e4422b 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java @@ -18,6 +18,7 @@ package org.apache.falcon.regression.prism; +import org.apache.falcon.entity.v0.EntityType; import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.entity.v0.Frequency.TimeUnit; import org.apache.falcon.regression.core.helpers.ColoHelper; @@ -33,7 +34,9 @@ import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.security.authentication.client.AuthenticationException; import org.apache.log4j.Logger; +import org.apache.oozie.client.CoordinatorAction; import org.apache.oozie.client.Job.Status; +import org.apache.oozie.client.OozieClient; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; @@ -54,6 +57,7 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass { private ColoHelper cluster = servers.get(0); private FileSystem clusterFS = serverFS.get(0); + private OozieClient clusterOC = serverOC.get(0); private String baseTestDir = cleanAndGetTestDir(); private String aggregateWorkflowDir = baseTestDir + "/aggregator"; private String inputPath = baseTestDir + "/input" + MINUTE_DATE_PATTERN; @@ -152,6 +156,8 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass { */ @Test(enabled = true) public void rescheduleDWE() throws Exception { + InstanceUtil.waitTillInstanceReachState(clusterOC, bundles[0].getProcessName(), 3, + CoordinatorAction.Status.RUNNING, EntityType.PROCESS); prism.getProcessHelper() .getProcessInstanceKill(Util.readEntityName(bundles[0].getProcessData()), "?start=2010-01-02T01:05Z&end=2010-01-02T01:11Z");
