Repository: incubator-falcon Updated Branches: refs/heads/master 157d2cadc -> 1a6b97d76
FALCON-951 Adding wait till instance goes into running for tests in falcon trunk. Contributed by Pragya Mittal Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/1a6b97d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/1a6b97d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/1a6b97d7 Branch: refs/heads/master Commit: 1a6b97d7695e81dc6aed1d46d522bf49447d1473 Parents: 157d2ca Author: Raghav Kumar Gautam <rag...@apache.org> Authored: Mon Dec 29 17:09:33 2014 -0800 Committer: Raghav Kumar Gautam <rag...@apache.org> Committed: Mon Dec 29 17:09:33 2014 -0800 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 3 +++ .../org/apache/falcon/regression/ProcessInstanceKillsTest.java | 6 ++++-- .../org/apache/falcon/regression/ProcessInstanceRerunTest.java | 2 ++ .../apache/falcon/regression/ProcessInstanceRunningTest.java | 2 ++ .../apache/falcon/regression/ProcessInstanceStatusTest.java | 4 ++++ 5 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1a6b97d7/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index faa835f..050cbdb 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -190,6 +190,9 @@ Trunk (Unreleased) FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG) BUG FIXES + FALCON-951 Adding wait till instance goes into running for tests in falcon trunk + (Pragya Mittal via Raghav Kumar Gautam) + FALCON-955 enable and fix feedAclUpdate and processAclUpdate tests (Raghav Kumar Gautam via Ruslan Ostafiychuk) http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1a6b97d7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java index 1382cbd..64347af 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java @@ -104,7 +104,8 @@ public class ProcessInstanceKillsTest extends BaseTestClass { bundles[0].submitFeedsScheduleProcess(prism); InstanceUtil.waitTillInstancesAreCreated(cluster, bundles[0].getProcessData(), 0); OozieUtil.createMissingDependencies(cluster, EntityType.PROCESS, processName, 0); - TimeUtil.sleepSeconds(30); + InstanceUtil.waitTillInstanceReachState(clusterOC, processName, 1, + CoordinatorAction.Status.RUNNING, EntityType.PROCESS, 5); InstancesResult r = prism.getProcessHelper().getProcessInstanceKill(processName, "?start=2010-01-02T01:00Z&end=2010-01-02T01:01Z"); InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.KILLED); @@ -281,7 +282,8 @@ public class ProcessInstanceKillsTest extends BaseTestClass { bundles[0].submitFeedsScheduleProcess(prism); InstanceUtil.waitTillInstancesAreCreated(cluster, bundles[0].getProcessData(), 0); OozieUtil.createMissingDependencies(cluster, EntityType.PROCESS, processName, 0); - TimeUtil.sleepSeconds(30); + InstanceUtil.waitTillInstanceReachState(clusterOC, processName, 1, + CoordinatorAction.Status.RUNNING, EntityType.PROCESS, 5); prism.getProcessHelper().getProcessInstanceSuspend(processName, "?start=2010-01-02T01:00Z&end=2010-01-02T01:04Z"); InstancesResult r = prism.getProcessHelper().getProcessInstanceKill(processName, http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1a6b97d7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java index c9bf4a9..bab17c2 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java @@ -204,6 +204,8 @@ public class ProcessInstanceRerunTest extends BaseTestClass { String process = bundles[0].getProcessData(); InstanceUtil.waitTillInstancesAreCreated(cluster, process, 0); OozieUtil.createMissingDependencies(cluster, EntityType.PROCESS, processName, 0); + InstanceUtil.waitTillInstanceReachState(clusterOC, processName, 1, + CoordinatorAction.Status.RUNNING, EntityType.PROCESS, 5); String wfID = InstanceUtil.getWorkflows(cluster, processName, Status.RUNNING, Status.SUCCEEDED).get(0); InstanceUtil.waitTillInstanceReachState(clusterOC, processName, 0, CoordinatorAction http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1a6b97d7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java index 3155930..d161a82 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java @@ -145,6 +145,8 @@ public class ProcessInstanceRunningTest extends BaseTestClass { bundles[0].submitFeedsScheduleProcess(prism); InstanceUtil.waitTillInstancesAreCreated(cluster, bundles[0].getProcessData(), 0); OozieUtil.createMissingDependencies(cluster, EntityType.PROCESS, processName, 0); + InstanceUtil.waitTillInstanceReachState(clusterOC, processName, 1, + CoordinatorAction.Status.RUNNING, EntityType.PROCESS, 5); InstancesResult r = prism.getProcessHelper().getRunningInstance(processName); InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.RUNNING); } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1a6b97d7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java index 24079ea..08a88a3 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java @@ -188,6 +188,10 @@ public class ProcessInstanceStatusTest extends BaseTestClass { @Test(groups = {"singleCluster"}) public void testProcessInstanceStatusStartAndEnd() throws Exception { bundles[0].submitFeedsScheduleProcess(prism); + InstanceUtil.waitTillInstancesAreCreated(cluster, bundles[0].getProcessData(), 0); + OozieUtil.createMissingDependencies(cluster, EntityType.PROCESS, processName, 0); + InstanceUtil.waitTillInstanceReachState(serverOC.get(0), processName, 1 , + CoordinatorAction.Status.RUNNING, EntityType.PROCESS); InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName, "?start=2010-01-02T01:00Z&end=2010-01-02T01:20Z"); InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.RUNNING);
