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/09/10 19:49:57 UTC
svn commit: r1383000 - in /oozie/trunk:
core/src/test/java/org/apache/oozie/util/TestLogStreamer.java release-log.txt
Author: tucu
Date: Mon Sep 10 17:49:57 2012
New Revision: 1383000
URL: http://svn.apache.org/viewvc?rev=1383000&view=rev
Log:
OOZIE-990 TestLogStreamer.testStreamLog fails in very rare cases (rkanter via tucu)
Modified:
oozie/trunk/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java
oozie/trunk/release-log.txt
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java?rev=1383000&r1=1382999&r2=1383000&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java Mon Sep 10 17:49:57 2012
@@ -22,6 +22,7 @@ import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.StringWriter;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -35,6 +36,8 @@ public class TestLogStreamer extends XTe
static String logStatement = " - USER[oozie] GROUP[-] TOKEN[-] APP[-] "
+ "JOB[14-200904160239--example-forkjoinwf] ACTION[-] ";
+ private final static SimpleDateFormat filenameDateFormatter = new SimpleDateFormat("yyyy-MM-dd-HH");
+
public void testStreamLog() throws IOException {
long currTime = System.currentTimeMillis();
XLogStreamer.Filter.reset();
@@ -104,7 +107,7 @@ public class TestLogStreamer extends XTe
// This GZip file would be included in list of files for log retrieval, provided, there is an overlap between
// the two time windows i) time duration during which the GZipped log file is modified ii) time window between
// start and end times of the job
- String outFilename = "oozie.log" + formatDateForFilename(new GregorianCalendar()) + ".gz";
+ String outFilename = "oozie.log-" + filenameDateFormatter.format(new Date(currTime)) + ".gz";
File f = new File(getTestCaseDir() + "/" + outFilename);
StringBuilder sb = new StringBuilder();
sb.append("\n2009-06-24 02:43:13,958 DEBUG _L8_:323" + logStatement + "End workflow state change");
@@ -245,38 +248,4 @@ public class TestLogStreamer extends XTe
gzout.write(buf, 0, buf.length);
gzout.close();
}
-
- private String formatDateForFilename(Calendar cal) {
- int year = cal.get(Calendar.YEAR);
- int month = cal.get(Calendar.MONTH) + 1;
- int date = cal.get(Calendar.DATE);
- int hour = cal.get(Calendar.HOUR_OF_DAY);
-
- StringBuilder sb = new StringBuilder("-");
- if (year < 10) {
- sb.append("000");
- } else if (year < 100) {
- sb.append("00");
- } else if (year < 1000) {
- sb.append("0");
- }
- sb.append(year);
- sb.append("-");
- if (month < 10) {
- sb.append("0");
- }
- sb.append(month);
- sb.append("-");
- if (date < 10) {
- sb.append("0");
- }
- sb.append(date);
- sb.append("-");
- if (hour < 10) {
- sb.append("0");
- }
- sb.append(hour);
-
- return sb.toString();
- }
}
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1383000&r1=1382999&r2=1383000&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Mon Sep 10 17:49:57 2012
@@ -1,5 +1,6 @@
-- Oozie 3.4.0 release (trunk - unreleased)
+OOZIE-990 TestLogStreamer.testStreamLog fails in very rare cases (rkanter via tucu)
OOZIE-987 Fix minor bug in one of the uber jar tests (rkanter via tucu)
OOZIE-809 MySQL TEXT columns should be MEDIUMTEXT (rkanter via tucu)
OOZIE-988 Improve verification of TestJavaActionExecutor.testLibFileArchives (rkanter via tucu)