You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by pu...@apache.org on 2016/05/27 21:17:03 UTC
oozie git commit: OOZIE-2476 When one of the action from fork fails
with transient error, WF never joins
Repository: oozie
Updated Branches:
refs/heads/master c5f5f9d6b -> 790aac020
OOZIE-2476 When one of the action from fork fails with transient error, WF never joins
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/790aac02
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/790aac02
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/790aac02
Branch: refs/heads/master
Commit: 790aac020ed492ab1be69443507c2d7ffd35524d
Parents: c5f5f9d
Author: Purshotam Shah <pu...@yahoo-inc.com>
Authored: Fri May 27 14:16:55 2016 -0700
Committer: Purshotam Shah <pu...@yahoo-inc.com>
Committed: Fri May 27 14:16:55 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/oozie/command/wf/ActionStartXCommand.java | 5 +++++
.../main/java/org/apache/oozie/command/wf/ActionXCommand.java | 5 ++++-
release-log.txt | 1 +
3 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/790aac02/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java
index 2939b60..8b0be9c 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java
@@ -400,4 +400,9 @@ public class ActionStartXCommand extends ActionXCommand<org.apache.oozie.command
}
}
+ @Override
+ protected void queueCommandForTransientFailure(long retryDelayMillis){
+ queue(new ActionStartXCommand(wfAction.getId(), wfAction.getType()), retryDelayMillis);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/790aac02/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java
index b024bd0..525ef94 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java
@@ -97,11 +97,14 @@ public abstract class ActionXCommand<T> extends WorkflowXCommand<T> {
action.setPendingAge(new Date(System.currentTimeMillis() + retryDelayMillis));
LOG.info("Next Retry, Attempt Number [{0}] in [{1}] milliseconds", actionRetryCount + 1, retryDelayMillis);
this.resetUsed();
- queue(this, retryDelayMillis);
+ queueCommandForTransientFailure(retryDelayMillis);
return true;
}
}
+ protected void queueCommandForTransientFailure(long retryDelayMillis){
+ queue(this, retryDelayMillis);
+ }
/**
* Takes care of non transient failures. The job is suspended, and the state of the action is changed to *MANUAL and
* set pending flag of action to false
http://git-wip-us.apache.org/repos/asf/oozie/blob/790aac02/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 02b3bc8..e62a6b6 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.3.0 release (trunk - unreleased)
+OOZIE-2476 When one of the action from fork fails with transient error, WF never joins (puru)
OOZIE-2475 Oozie does not cleanup action dir of killed actions (satishsaley via rohini)
OOZIE-2535 User can't disable uber mode (puru)
OOZIE-2482 Pyspark job fails with Oozie (satishsaley and gezapeti via rkanter)