svn commit: r1388309 - in /oozie/branches/branch-3.3: core/src/test/java/org/apache/oozie/util/TestLogStreamer.java release-log.txt

[vi...@apache.org]

Author: virag
Date: Fri Sep 21 03:07:28 2012
New Revision: 1388309

URL: http://svn.apache.org/viewvc?rev=1388309&view=rev
Log:
OOZIE-990 TestLogStreamer.testStreamLog fails in very rare cases (rkanter via virag)

Modified:
    oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java
    oozie/branches/branch-3.3/release-log.txt

Modified: oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java
URL: http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java?rev=1388309&r1=1388308&r2=1388309&view=diff
==============================================================================
--- oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java (original)
+++ oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java Fri Sep 21 03:07:28 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/branches/branch-3.3/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1388309&r1=1388308&r2=1388309&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Fri Sep 21 03:07:28 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.3.0 release (unreleased)
 
+OOZIE-990 TestLogStreamer.testStreamLog fails in very rare cases (rkanter via virag)
 OOZIE-989 Testcases failing intermittently where coordinator jobs are in catchup mode (virag)
 OOZIE-997 Add schema def. for distcp to work with global section and add missing xsd's for client xml validation (virag)
 OOZIE-991 action prepare executions work only with HDFS filesystems (tucu)