You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by tu...@apache.org on 2012/06/29 02:40:45 UTC
svn commit: r1355200 - in /incubator/oozie/trunk:
core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java
release-log.txt
Author: tucu
Date: Fri Jun 29 00:40:44 2012
New Revision: 1355200
URL: http://svn.apache.org/viewvc?rev=1355200&view=rev
Log:
OOZIE-882 CoordELEvaluator.createDataEvaluator doesn't set timezone for coord action (shwethags via tucu)
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java
incubator/oozie/trunk/release-log.txt
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java?rev=1355200&r1=1355199&r2=1355200&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java Fri Jun 29 00:40:44 2012
@@ -143,6 +143,9 @@ public class CoordELEvaluator {
String strNominalTime = eJob.getAttributeValue("action-nominal-time");
if (strNominalTime != null) {
appInst.setNominalTime(DateUtils.parseDateUTC(strNominalTime));
+ appInst.setTimeZone(DateUtils.getTimeZone(eJob.getAttributeValue("timezone")));
+ appInst.setFrequency(Integer.parseInt(eJob.getAttributeValue("frequency")));
+ appInst.setTimeUnit(TimeUnit.valueOf(eJob.getAttributeValue("freq_timeunit")));
appInst.setActionId(actionId);
appInst.setName(eJob.getAttributeValue("name"));
}
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java?rev=1355200&r1=1355199&r2=1355200&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java Fri Jun 29 00:40:44 2012
@@ -123,7 +123,8 @@ public class TestCoordELEvaluator extend
}
public void testCreateDataEvaluator() throws Exception {
- String jobXml = "<coordinator-app name=\"mycoordinator-app\" start=\"2009-02-01T01:00GMT\" end=\"2009-02-03T23:59GMT\" frequency=\"720\"";
+ String jobXml = "<coordinator-app name=\"mycoordinator-app\" start=\"2009-02-01T01:00GMT\" end=\"2009-02-03T23:59GMT\" timezone=\"UTC\"";
+ jobXml += " frequency=\"720\" freq_timeunit=\"MINUTE\"";
jobXml += " action-nominal-time='2009-09-01T00:00Z' action-actual-time='2010-10-01T00:00Z'>";
jobXml += "<input-events><data-in name=\"A\" dataset=\"a\"><uris>file:///tmp/coord/US/2009/1/30|file:///tmp/coord/US/2009/1/31</uris>";
jobXml += "<dataset name=\"a\" frequency=\"1440\" initial-instance=\"2009-01-01T00:00Z\">";
Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1355200&r1=1355199&r2=1355200&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Fri Jun 29 00:40:44 2012
@@ -1,5 +1,6 @@
-- Oozie 3.3.0 release (trunk - unreleased)
+OOZIE-882 CoordELEvaluator.createDataEvaluator doesn't set timezone for coord action (shwethags via tucu)
OOZIE-892 increase default JVM max memory to 1GB to avoid OOM (rkanter via tucu)
OOZIE-861 allow for use of multiple <java-opts> (britt via virag)
OOZIE_870 Parameterize Credentials(britt via virag)