You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by pa...@apache.org on 2016/01/19 18:14:40 UTC
[2/5] falcon git commit: FALCON-1723 Rerun with skip fail actions
won't work in few cases (By Pavan Kolamuri)
FALCON-1723 Rerun with skip fail actions won't work in few cases (By Pavan Kolamuri)
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/39073ff0
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/39073ff0
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/39073ff0
Branch: refs/heads/0.9
Commit: 39073ff07f970c646e1f5bbc5827a5cfc02efae9
Parents: a4fd2c1
Author: Pallavi Rao <pa...@inmobi.com>
Authored: Tue Jan 19 21:46:26 2016 +0530
Committer: Pallavi Rao <pa...@inmobi.com>
Committed: Tue Jan 19 21:46:26 2016 +0530
----------------------------------------------------------------------
.../engine/OozieWorkflowEngine.java.rej | 32 --------------------
1 file changed, 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/39073ff0/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java.rej
----------------------------------------------------------------------
diff --git a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java.rej b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java.rej
deleted file mode 100644
index 4c08ae3..0000000
--- a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java.rej
+++ /dev/null
@@ -1,32 +0,0 @@
-diff a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java (rejected hunks)
-@@ -637,8 +637,10 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine {
- return doJobAction(action, entity, start, end, props, lifeCycles, null);
- }
-
-- private InstancesResult doJobAction(JobAction action, Entity entity, Date start, Date end, Properties props,
-- List<LifeCycle> lifeCycles, Boolean allAttempts) throws FalconException {
-+ //SUSPEND CHECKSTYLE CHECK ParameterNumberCheck
-+ private InstancesResult doJobAction(JobAction action, Entity entity, Date start, Date end,
-+ Properties props, List<LifeCycle> lifeCycles,
-+ Boolean allAttempts, boolean isForced) throws FalconException {
- Map<String, List<CoordinatorAction>> actionsMap = getCoordActions(entity, start, end, lifeCycles);
- List<String> clusterList = getIncludedClusters(props, FALCON_INSTANCE_ACTION_CLUSTERS);
- List<String> sourceClusterList = getIncludedClusters(props, FALCON_INSTANCE_SOURCE_CLUSTERS);
-@@ -669,7 +671,7 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine {
- instance.sourceCluster = sourceCluster;
- if (action.equals(JobAction.STATUS) && Boolean.TRUE.equals(allAttempts)) {
- try {
-- performAction(cluster, action, coordinatorAction, props, instance);
-+ performAction(cluster, action, coordinatorAction, props, instance, isForced);
- if (instance.getRunId() > 0) {
- instanceList = getAllInstances(cluster, coordinatorAction, nominalTimeStr);
- } else {
-@@ -687,7 +689,7 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine {
- }
- } else {
- try {
-- performAction(cluster, action, coordinatorAction, props, instance);
-+ performAction(cluster, action, coordinatorAction, props, instance, isForced);
- } catch (FalconException e) {
- LOG.warn("Unable to perform action {} on cluster", action, e);
- instance.status = WorkflowStatus.ERROR;