You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by su...@apache.org on 2014/07/08 10:58:06 UTC
git commit: FALCON-494 update feature broken. Contributed by Shwetha
GS
Repository: incubator-falcon
Updated Branches:
refs/heads/master cfd647af0 -> 49627f087
FALCON-494 update feature broken. Contributed by Shwetha GS
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/49627f08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/49627f08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/49627f08
Branch: refs/heads/master
Commit: 49627f0877dd457fc56a15d454cf0be49ef645d6
Parents: cfd647a
Author: Suhas V <su...@inmobi.com>
Authored: Tue Jul 8 14:27:53 2014 +0530
Committer: Suhas V <su...@inmobi.com>
Committed: Tue Jul 8 14:27:53 2014 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../workflow/engine/OozieWorkflowEngine.java | 2 +-
.../falcon/resource/EntityManagerJerseyIT.java | 17 ++++++++++++++++-
3 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/49627f08/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b8e22bd..94a270a 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,8 @@ Trunk (Unreleased)
OPTIMIZATIONS
BUG FIXES
+ FALCON-494 update feature broken (Shwetha GS via Suhas Vasu)
+
FALCON-496 Feed Replication with Empty Directories giving error.
(pavan kumar kolamuri via Shwetha GS)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/49627f08/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
----------------------------------------------------------------------
diff --git a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
index eb0c213..c65bed9 100644
--- a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
+++ b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
@@ -1168,7 +1168,7 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine {
String currentUser = CurrentUser.getUser();
switchUser(user);
try {
- EntityUtil.setStartDate(entity, cluster, startDate);
+ EntityUtil.setStartDate(clone, cluster, startDate);
WorkflowBuilder<Entity> builder = WorkflowBuilder.getBuilder(ENGINE, clone);
Map<String, Properties> bundleProps = builder.newWorkflowSchedule(cluster);
LOG.info("Scheduling {} on cluster {} with props {}",
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/49627f08/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java b/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java
index 3008387..e214392 100644
--- a/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java
+++ b/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java
@@ -291,7 +291,8 @@ public class EntityManagerJerseyIT {
List<BundleJob> bundles = OozieTestUtils.getBundles(context);
Assert.assertEquals(bundles.size(), 1);
ProxyOozieClient ozClient = OozieTestUtils.getOozieClient(context.getCluster().getCluster());
- String coordId = ozClient.getBundleJobInfo(bundles.get(0).getId()).getCoordinators().get(0).getId();
+ String bundle = bundles.get(0).getId();
+ String coordId = ozClient.getBundleJobInfo(bundle).getCoordinators().get(0).getId();
Process process = (Process) getDefinition(context, EntityType.PROCESS, context.processName);
@@ -320,6 +321,20 @@ public class EntityManagerJerseyIT {
CoordinatorJob coord = ozClient.getCoordJobInfo(coordId);
Assert.assertEquals(coord.getStatus(), Status.RUNNING);
Assert.assertEquals(coord.getEndTime(), endTime);
+
+ //Assert on new bundle/coord
+ String newBundle = null;
+ for (BundleJob myBundle : bundles) {
+ if (!myBundle.getId().equals(bundle)) {
+ newBundle = myBundle.getId();
+ break;
+ }
+ }
+
+ assert newBundle != null;
+ coord = ozClient.getCoordJobInfo(ozClient.getBundleJobInfo(newBundle).getCoordinators().get(0).getId());
+ Assert.assertTrue(coord.getStatus() == Status.RUNNING || coord.getStatus() == Status.PREP);
+ Assert.assertEquals(coord.getStartTime(), endTime);
}
public void testProcessEndtimeUpdate() throws Exception {