Repository: falcon Updated Branches: refs/heads/master 15771e863 -> 9ae20e025
FALCON-1579 post-processing action fails with javax.servlet.jsp.el.ELException (by Sowmya Ramesh) Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/9ae20e02 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/9ae20e02 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/9ae20e02 Branch: refs/heads/master Commit: 9ae20e025c74f44236b66c7c48df87a6c0939d3d Parents: 15771e8 Author: Pallavi Rao <[email protected]> Authored: Tue Nov 3 15:02:07 2015 +0530 Committer: Pallavi Rao <[email protected]> Committed: Tue Nov 3 15:02:07 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../lifecycle/engine/oozie/utils/OozieBuilderUtils.java | 5 +++-- .../java/org/apache/falcon/oozie/OozieCoordinatorBuilder.java | 7 ++----- 3 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/9ae20e02/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b7b4dc9..142d7dd 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -21,6 +21,8 @@ Trunk (Unreleased) OPTIMIZATIONS BUG FIXES + FALCON-1579 post-processing action fails with javax.servlet.jsp.el.ELException (Sowmya Ramesh via Pallavi Rao) + FALCON-1553 Flaky test in SchedulerUtilTest (Balu Vellanki via Pallavi Rao) FALCON-1554 Fix Changes.txt after 0.8 branch cut(Sowmya Ramesh) http://git-wip-us.apache.org/repos/asf/falcon/blob/9ae20e02/lifecycle/src/main/java/org/apache/falcon/lifecycle/engine/oozie/utils/OozieBuilderUtils.java ---------------------------------------------------------------------- diff --git a/lifecycle/src/main/java/org/apache/falcon/lifecycle/engine/oozie/utils/OozieBuilderUtils.java b/lifecycle/src/main/java/org/apache/falcon/lifecycle/engine/oozie/utils/OozieBuilderUtils.java index be9175e..1aeb149 100644 --- a/lifecycle/src/main/java/org/apache/falcon/lifecycle/engine/oozie/utils/OozieBuilderUtils.java +++ b/lifecycle/src/main/java/org/apache/falcon/lifecycle/engine/oozie/utils/OozieBuilderUtils.java @@ -81,7 +81,6 @@ public final class OozieBuilderUtils { private static final String POSTPROCESS_TEMPLATE = "/action/post-process.xml"; public static final String HIVE_CREDENTIAL_NAME = "falconHiveAuth"; - private static final String USER_JMS_NOTIFICATION_ENABLED = "userJMSNotificationEnabled"; public static final String MR_QUEUE_NAME = "queueName"; public static final String MR_JOB_PRIORITY = "jobPriority"; private static final String NOMINAL_TIME_EL = "${coord:formatTime(coord:nominalTime(), 'yyyy-MM-dd-HH-mm')}"; @@ -495,7 +494,9 @@ public final class OozieBuilderUtils { props.put(OozieClient.EXTERNAL_ID, new ExternalId(entity.getName(), EntityUtil.getWorkflowNameTag(coordName, entity), "${coord:nominalTime()}").getId()); - props.put(USER_JMS_NOTIFICATION_ENABLED, "true"); + props.put(WorkflowExecutionArgs.USER_JMS_NOTIFICATION_ENABLED.getName(), "true"); + props.put(WorkflowExecutionArgs.SYSTEM_JMS_NOTIFICATION_ENABLED.getName(), + RuntimeProperties.get().getProperty("falcon.jms.notification.enabled", "true")); //props in entity override the set props. props.putAll(EntityUtil.getEntityProperties(entity)); return props; http://git-wip-us.apache.org/repos/asf/falcon/blob/9ae20e02/oozie/src/main/java/org/apache/falcon/oozie/OozieCoordinatorBuilder.java ---------------------------------------------------------------------- diff --git a/oozie/src/main/java/org/apache/falcon/oozie/OozieCoordinatorBuilder.java b/oozie/src/main/java/org/apache/falcon/oozie/OozieCoordinatorBuilder.java index 497fc8f..b1db186 100644 --- a/oozie/src/main/java/org/apache/falcon/oozie/OozieCoordinatorBuilder.java +++ b/oozie/src/main/java/org/apache/falcon/oozie/OozieCoordinatorBuilder.java @@ -50,9 +50,6 @@ public abstract class OozieCoordinatorBuilder<T extends Entity> extends OozieEnt protected static final String NOMINAL_TIME_EL = "${coord:formatTime(coord:nominalTime(), 'yyyy-MM-dd-HH-mm')}"; protected static final String ACTUAL_TIME_EL = "${coord:formatTime(coord:actualTime(), 'yyyy-MM-dd-HH-mm')}"; - private static final String USER_JMS_NOTIFICATION_ENABLED = "userJMSNotificationEnabled"; - private static final String SYSTEM_JMS_NOTIFICATION_ENABLED = "systemJMSNotificationEnabled"; - protected final LifeCycle lifecycle; public OozieCoordinatorBuilder(T entity, LifeCycle lifecycle) { @@ -116,8 +113,8 @@ public abstract class OozieCoordinatorBuilder<T extends Entity> extends OozieEnt props.put(OozieClient.EXTERNAL_ID, new ExternalId(entity.getName(), EntityUtil.getWorkflowNameTag(coordName, entity), "${coord:nominalTime()}").getId()); - props.put(USER_JMS_NOTIFICATION_ENABLED, "true"); - props.put(SYSTEM_JMS_NOTIFICATION_ENABLED, + props.put(WorkflowExecutionArgs.USER_JMS_NOTIFICATION_ENABLED.getName(), "true"); + props.put(WorkflowExecutionArgs.SYSTEM_JMS_NOTIFICATION_ENABLED.getName(), RuntimeProperties.get().getProperty("falcon.jms.notification.enabled", "true")); return props;
