You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sh...@apache.org on 2014/08/08 09:10:09 UTC
git commit: FALCON-514 Falcon CLI giving error when using -file
option with -rerun in instance management. Contributed by pavan kumar
kolamuri
Repository: incubator-falcon
Updated Branches:
refs/heads/master 8ed874c33 -> c8820bd5e
FALCON-514 Falcon CLI giving error when using -file option with -rerun in instance management. Contributed by pavan kumar kolamuri
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/c8820bd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/c8820bd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/c8820bd5
Branch: refs/heads/master
Commit: c8820bd5e441711c7c233676719278883338a14c
Parents: 8ed874c
Author: Shwetha GS <sh...@inmobi.com>
Authored: Fri Aug 8 12:40:00 2014 +0530
Committer: Shwetha GS <sh...@inmobi.com>
Committed: Fri Aug 8 12:40:00 2014 +0530
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../org/apache/falcon/workflow/engine/OozieWorkflowEngine.java | 4 ++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c8820bd5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 63ce166..062e318 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -28,6 +28,9 @@ Trunk (Unreleased)
OPTIMIZATIONS
BUG FIXES
+ FALCON-514 Falcon CLI giving error when using -file option with -rerun in
+ instance management. (pavan kumar kolamuri via Shwetha GS)
+
FALCON-566 update throwing null job id exception. (Shwetha GS)
FALCON-561 Falcon jenkins failure in EntityManagerJerseyIT.
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c8820bd5/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 fd62b84..ed23813 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
@@ -1243,6 +1243,10 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine {
for (Entry<Object, Object> entry : props.entrySet()) {
jobprops.put(entry.getKey(), entry.getValue());
}
+ if (!jobprops.contains(OozieClient.RERUN_FAIL_NODES)
+ && !jobprops.contains(OozieClient.RERUN_SKIP_NODES)) {
+ jobprops.put(OozieClient.RERUN_FAIL_NODES, "false");
+ }
}
jobprops.remove(OozieClient.COORDINATOR_APP_PATH);
jobprops.remove(OozieClient.BUNDLE_APP_PATH);