falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pall...@apache.org
Subject falcon git commit: FALCON-1579 post-processing action fails with javax.servlet.jsp.el.ELException (Ajay Yadava)
Date Tue, 03 Nov 2015 08:20:23 GMT
Repository: falcon
Updated Branches:
  refs/heads/0.8 0adc53fe9 -> f68f7e20d


FALCON-1579 post-processing action fails with javax.servlet.jsp.el.ELException (Ajay Yadava)


Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/f68f7e20
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/f68f7e20
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/f68f7e20

Branch: refs/heads/0.8
Commit: f68f7e20dbc9deaa5b813923b3a9edd266dcb6ba
Parents: 0adc53f
Author: Pallavi Rao <pallavi.rao@inmobi.com>
Authored: Tue Nov 3 13:50:16 2015 +0530
Committer: Pallavi Rao <pallavi.rao@inmobi.com>
Committed: Tue Nov 3 13:50:16 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/f68f7e20/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 195b218..4e1593f 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -79,6 +79,8 @@ Release version: 0.8
     FALCON-1403 Revisit IT cleanup and teardown(Narayan Periwal via Pallavi Rao)
 
   BUG FIXES
+    FALCON-1579 post-processing action fails with javax.servlet.jsp.el.ELException (Ajay
Yadava via Pallavi Rao)
+
     FALCON-1560 Lifecycle does not allow feed with frequency greater than days(1) (Ajay Yadava)
 
     FALCON-1556 Falcon build fails when building with hivedr profile(Sowmya Ramesh)

http://git-wip-us.apache.org/repos/asf/falcon/blob/f68f7e20/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/f68f7e20/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 acb49ef..0786ac3 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) {
@@ -113,8 +110,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;


Mime
View raw message