You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2013/11/25 19:58:48 UTC
svn commit: r1545370 - in /oozie/trunk: ./
core/src/main/java/org/apache/oozie/command/coord/
core/src/main/java/org/apache/oozie/service/
Author: rkanter
Date: Mon Nov 25 18:58:48 2013
New Revision: 1545370
URL: http://svn.apache.org/r1545370
Log:
OOZIE-1612 When printing Dates to log messages, we should make sure they are in oozie.processing.timezone (gwenshap via rkanter)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/service/CoordMaterializeTriggerService.java
oozie/trunk/release-log.txt
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java?rev=1545370&r1=1545369&r2=1545370&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java Mon Nov 25 18:58:48 2013
@@ -102,7 +102,7 @@ public class CoordActionInputCheckXComma
updateCoordAction(coordAction, false);
LOG.info("[" + actionId
+ "]::ActionInputCheck:: nominal Time is newer than current time, so requeue and wait. Current="
- + currentTime + ", nominal=" + nominalTime);
+ + DateUtils.formatDateOozieTZ(currentTime) + ", nominal=" + DateUtils.formatDateOozieTZ(nominalTime));
return null;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java?rev=1545370&r1=1545369&r2=1545370&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java Mon Nov 25 18:58:48 2013
@@ -193,7 +193,7 @@ public class CoordMaterializeTransitionX
endMatdTime = jobEndTime;
}
- LOG.debug("Materializing coord job id=" + jobId + ", start=" + startMatdTime + ", end=" + endMatdTime
+ LOG.debug("Materializing coord job id=" + jobId + ", start=" + DateUtils.formatDateOozieTZ(startMatdTime) + ", end=" + DateUtils.formatDateOozieTZ(endMatdTime)
+ ", window=" + materializationWindow);
}
@@ -319,6 +319,7 @@ public class CoordMaterializeTransitionX
Calendar end = Calendar.getInstance(appTz);
end.setTime(endMatdTime);
lastActionNumber = coordJob.getLastActionNumber();
+ //Intentionally printing dates in their own timezone, not Oozie timezone
LOG.info("materialize actions for tz=" + appTz.getDisplayName() + ",\n start=" + start.getTime() + ", end="
+ end.getTime() + ",\n timeUnit " + freqTU.getCalendarUnit() + ",\n frequency :" + frequency + ":"
+ freqTU + ",\n lastActionNumber " + lastActionNumber);
@@ -379,7 +380,7 @@ public class CoordMaterializeTransitionX
lastActionNumber++;
int timeout = coordJob.getTimeout();
- LOG.debug("Materializing action for time=" + start.getTime() + ", lastactionnumber=" + lastActionNumber
+ LOG.debug("Materializing action for time=" + DateUtils.formatDateOozieTZ(start.getTime()) + ", lastactionnumber=" + lastActionNumber
+ " timeout=" + timeout + " minutes");
Date actualTime = new Date();
action = CoordCommandUtils.materializeOneInstance(jobId, dryrun, (Element) eJob.clone(),
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java?rev=1545370&r1=1545369&r2=1545370&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java Mon Nov 25 18:58:48 2013
@@ -51,6 +51,7 @@ import org.apache.oozie.util.LogUtils;
import org.apache.oozie.util.StatusUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
+import org.apache.oozie.util.DateUtils;
public class CoordPushDependencyCheckXCommand extends CoordinatorXCommand<Void> {
protected String actionId;
@@ -213,7 +214,7 @@ public class CoordPushDependencyCheckXCo
// CoordActionInputCheckXCommand will take care of moving it to READY when it is nominal time.
if (nominalTime.compareTo(currentTime) > 0) {
LOG.info("[" + actionId + "]::ActionInputCheck:: nominal Time is newer than current time. Current="
- + currentTime + ", nominal=" + nominalTime);
+ + DateUtils.formatDateOozieTZ(currentTime) + ", nominal=" + DateUtils.formatDateOozieTZ(nominalTime));
}
else {
String actionXml = resolveCoordConfiguration();
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/CoordMaterializeTriggerService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/CoordMaterializeTriggerService.java?rev=1545370&r1=1545369&r2=1545370&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/CoordMaterializeTriggerService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/CoordMaterializeTriggerService.java Mon Nov 25 18:58:48 2013
@@ -30,6 +30,7 @@ import org.apache.oozie.executor.jpa.Coo
import org.apache.oozie.executor.jpa.JPAExecutorException;
import org.apache.oozie.util.XCallable;
import org.apache.oozie.util.XLog;
+import org.apache.oozie.util.DateUtils;
/**
* The coordinator Materialization Lookup trigger service schedule lookup trigger command for every interval (default is
@@ -133,7 +134,7 @@ public class CoordMaterializeTriggerServ
CoordJobsToBeMaterializedJPAExecutor cmatcmd = new CoordJobsToBeMaterializedJPAExecutor(currDate, limit);
List<CoordinatorJobBean> materializeJobs = jpaService.execute(cmatcmd);
int rejected = 0;
- LOG.info("CoordMaterializeTriggerService - Curr Date= " + currDate + ", Num jobs to materialize = "
+ LOG.info("CoordMaterializeTriggerService - Curr Date= " + DateUtils.formatDateOozieTZ(currDate) + ", Num jobs to materialize = "
+ materializeJobs.size());
for (CoordinatorJobBean coordJob : materializeJobs) {
if (Services.get().get(JobsConcurrencyService.class).isJobIdForThisServer(coordJob.getId())) {
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1545370&r1=1545369&r2=1545370&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Mon Nov 25 18:58:48 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1612 When printing Dates to log messages, we should make sure they are in oozie.processing.timezone (gwenshap via rkanter)
OOZIE-1519 Admin command to update the sharelib (puru via ryota)
OOZIE-1604 <java-opts> and <java-opt> not added to Application Master property in uber mode (ryota)
OOZIE-1584 Setup sharelib using script and pickup latest(honor ship.launcher) and remove DFS dependency at startup (puru via ryota)