You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sa...@apache.org on 2014/08/12 11:16:06 UTC
git commit: FALCON 584 Fix of
ProcessInstanceRerunTest#testProcessInstanceRerunTimedOut contributed by Paul
Isaychuk
Repository: incubator-falcon
Updated Branches:
refs/heads/master 30b83d21a -> 839d44d60
FALCON 584 Fix of ProcessInstanceRerunTest#testProcessInstanceRerunTimedOut contributed by Paul Isaychuk
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/839d44d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/839d44d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/839d44d6
Branch: refs/heads/master
Commit: 839d44d604d3361da8517864b18ce205786e624c
Parents: 30b83d2
Author: Samarth Gupta <sa...@inmobi.com>
Authored: Tue Aug 12 14:45:46 2014 +0530
Committer: Samarth Gupta <sa...@inmobi.com>
Committed: Tue Aug 12 14:45:46 2014 +0530
----------------------------------------------------------------------
.../apache/falcon/regression/core/util/InstanceUtil.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/839d44d6/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
index 7b4accd..ec4801c 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
@@ -1054,8 +1054,7 @@ public final class InstanceUtil {
final String coordId;
final Status bundleStatus = client.getBundleJobInfo(bundleId).getStatus();
Assert.assertTrue(RUNNING_PREP_SUCCEEDED.contains(bundleStatus),
- String.format("Bundle job %s is should be prep/running but is %s", bundleId,
- bundleStatus));
+ String.format("Bundle job %s is should be prep/running but is %s", bundleId, bundleStatus));
OozieUtil.waitForCoordinatorJobCreation(client, bundleId);
List<CoordinatorJob> coords = client.getBundleJobInfo(bundleId).getCoordinators();
List<String> cIds = new ArrayList<String>();
@@ -1081,9 +1080,10 @@ public final class InstanceUtil {
LOGGER.info(String.format("Try %d of %d", (i + 1), maxTries));
CoordinatorJob coordinatorJob = client.getCoordJobInfo(coordId);
final Status coordinatorStatus = coordinatorJob.getStatus();
- Assert.assertTrue(RUNNING_PREP_SUCCEEDED.contains(coordinatorStatus),
- String.format("Coordinator %s should be running/prep but is %s.", coordId,
- coordinatorStatus));
+ if(expectedStatus != CoordinatorAction.Status.TIMEDOUT){
+ Assert.assertTrue(RUNNING_PREP_SUCCEEDED.contains(coordinatorStatus),
+ String.format("Coordinator %s should be running/prep but is %s.", coordId, coordinatorStatus));
+ }
List<CoordinatorAction> coordinatorActions = coordinatorJob.getActions();
int instanceWithStatus = 0;
for (CoordinatorAction coordinatorAction : coordinatorActions) {
@@ -1093,7 +1093,6 @@ public final class InstanceUtil {
instanceWithStatus++;
}
}
-
if (instanceWithStatus >= instancesNumber) {
return;
} else {