You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by aj...@apache.org on 2016/04/06 10:42:29 UTC
falcon git commit: FALCON-1845 Retries fix when entity was deleted
during instance rerun
Repository: falcon
Updated Branches:
refs/heads/master 78da26e27 -> 08399d038
FALCON-1845 Retries fix when entity was deleted during instance rerun
Author: pavankumar526 <pa...@gmail.com>
Reviewers: Ajay Yadava <aj...@apache.org>, Sandeep Samudrala, Pallavi Rao
Closes #62 from pavankumar526/FALCON-1845
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/08399d03
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/08399d03
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/08399d03
Branch: refs/heads/master
Commit: 08399d03858f5c9ee03ed9c4f445fe723e3bfa52
Parents: 78da26e
Author: pavankumar526 <pa...@gmail.com>
Authored: Wed Apr 6 14:11:49 2016 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Wed Apr 6 14:11:49 2016 +0530
----------------------------------------------------------------------
.../org/apache/falcon/rerun/handler/AbstractRerunConsumer.java | 2 +-
.../main/java/org/apache/falcon/rerun/handler/RetryHandler.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/08399d03/rerun/src/main/java/org/apache/falcon/rerun/handler/AbstractRerunConsumer.java
----------------------------------------------------------------------
diff --git a/rerun/src/main/java/org/apache/falcon/rerun/handler/AbstractRerunConsumer.java b/rerun/src/main/java/org/apache/falcon/rerun/handler/AbstractRerunConsumer.java
index 61ca8c0..000fd55 100644
--- a/rerun/src/main/java/org/apache/falcon/rerun/handler/AbstractRerunConsumer.java
+++ b/rerun/src/main/java/org/apache/falcon/rerun/handler/AbstractRerunConsumer.java
@@ -88,7 +88,7 @@ public abstract class AbstractRerunConsumer<T extends RerunEvent, M extends Abst
LOG.warn("Entity {} of type {} doesn't exist in config store. Rerun "
+ "cannot be done for workflow ", message.getEntityName(),
message.getEntityType(), message.getWfId());
- return;
+ continue;
}
LOG.error("Error in rerun consumer", e);
}
http://git-wip-us.apache.org/repos/asf/falcon/blob/08399d03/rerun/src/main/java/org/apache/falcon/rerun/handler/RetryHandler.java
----------------------------------------------------------------------
diff --git a/rerun/src/main/java/org/apache/falcon/rerun/handler/RetryHandler.java b/rerun/src/main/java/org/apache/falcon/rerun/handler/RetryHandler.java
index 48d5ce7..c691922 100644
--- a/rerun/src/main/java/org/apache/falcon/rerun/handler/RetryHandler.java
+++ b/rerun/src/main/java/org/apache/falcon/rerun/handler/RetryHandler.java
@@ -112,6 +112,8 @@ public class RetryHandler<M extends DelayedQueue<RetryEvent>> extends
public void onFailure(WorkflowExecutionContext context) throws FalconException {
// Re-run does not make sense when killed by user.
if (context.isWorkflowKilledManually()) {
+ LOG.debug("Workflow: {} Instance: {} Entity: {}, killed manually by user. Will not retry.",
+ context.getWorkflowId(), context.getNominalTimeAsISO8601(), context.getEntityName());
return;
} else if (context.hasWorkflowTimedOut()) {
Entity entity = EntityUtil.getEntity(context.getEntityType(), context.getEntityName());