You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2015/03/23 16:36:38 UTC
falcon git commit: FALCON-1103 RetentionTest stabilization - remove
check of all retention job actions. Contributed by Paul Isaychuk
Repository: falcon
Updated Branches:
refs/heads/master 36df77a32 -> 969d10e96
FALCON-1103 RetentionTest stabilization - remove check of all retention job actions. Contributed by Paul Isaychuk
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/969d10e9
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/969d10e9
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/969d10e9
Branch: refs/heads/master
Commit: 969d10e96c96b05c1ab98d02c5455f91a4175b60
Parents: 36df77a
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Mon Mar 23 17:34:18 2015 +0200
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Mon Mar 23 17:34:18 2015 +0200
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../falcon/regression/core/util/OozieUtil.java | 33 ++++++++------------
2 files changed, 15 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/969d10e9/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 3a8ab9d..5a897fc 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -63,6 +63,8 @@ Trunk (Unreleased)
via Samarth Gupta)
IMPROVEMENTS
+ FALCON-1103 RetentionTest stabilization - remove check of all retention job actions
+ (Paul Isaychuk via Ruslan Ostafiychuk)
FALCON-1010 Add documentation in falcon-regression's README.md, making it easy for
contributors to add tests to falcon-regression(Karishma G via Samarth )
http://git-wip-us.apache.org/repos/asf/falcon/blob/969d10e9/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java
index 53a9001..baa69c7 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java
@@ -142,30 +142,23 @@ public final class OozieUtil {
Assert.assertFalse(oozieClient.getCoordJobInfo(coordinatorId).getActions().isEmpty(),
"Coordinator actions should have got created by now.");
- final List<CoordinatorAction> actions =
- oozieClient.getCoordJobInfo(coordinatorId).getActions();
- LOGGER.info("actions: " + actions);
-
- for (CoordinatorAction action : actions) {
- for (int i = 0; i < 180; ++i) {
- CoordinatorAction actionInfo = oozieClient.getCoordActionInfo(action.getId());
- LOGGER.info("actionInfo: " + actionInfo);
- if (EnumSet.of(CoordinatorAction.Status.SUCCEEDED, CoordinatorAction.Status.KILLED,
- CoordinatorAction.Status.FAILED).contains(actionInfo.getStatus())) {
- break;
- }
- TimeUtil.sleepSeconds(10);
+ CoordinatorAction action = oozieClient.getCoordJobInfo(coordinatorId).getActions().get(0);
+ for (int i = 0; i < 180; ++i) {
+ CoordinatorAction actionInfo = oozieClient.getCoordActionInfo(action.getId());
+ LOGGER.info("actionInfo: " + actionInfo);
+ if (EnumSet.of(CoordinatorAction.Status.SUCCEEDED, CoordinatorAction.Status.KILLED,
+ CoordinatorAction.Status.FAILED).contains(actionInfo.getStatus())) {
+ break;
}
- Assert.assertEquals(
- oozieClient.getCoordActionInfo(action.getId()).getStatus(),
- CoordinatorAction.Status.SUCCEEDED,
- "Action did not succeed.");
- jobIds.add(action.getId());
-
+ TimeUtil.sleepSeconds(10);
}
+ Assert.assertEquals(
+ oozieClient.getCoordActionInfo(action.getId()).getStatus(),
+ CoordinatorAction.Status.SUCCEEDED,
+ "Action did not succeed.");
+ jobIds.add(action.getId());
return jobIds;
-
}
public static void waitForCoordinatorJobCreation(OozieClient oozieClient, String bundleID)