HADOOP-5039. Fix log rolling regex to process only the relevant subdirectories.

Contributed by Jerome Boulon


git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@742803 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -125,6 +125,9 @@ Trunk (unreleased changes)
     HADOOP-4959. Correct system metric collection from top on Redhat 5.1. (Eric
     Yang via cdouglas)
 
+    HADOOP-5039. Fix log rolling regex to process only the relevant
+    subdirectories. (Jerome Boulon via cdouglas)
+
 Release 0.20.0 - Unreleased
 
   INCOMPATIBLE CHANGES

src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java

@@ -88,7 +88,7 @@ public class DailyChukwaRecordRolling extends Configured implements Tool
 				// Merge
 				String[] mergeArgs = new String[5];
 				// input
-				mergeArgs[0] = chukwaMainRepository + "/" + cluster + "/" + dataSource + "/" + workingDay +  "/*/*.evt";
+				mergeArgs[0] = chukwaMainRepository + "/" + cluster + "/" + dataSource + "/" + workingDay +  "/[0-24]*/*.evt";
 				// temp dir
 				mergeArgs[1] = tempDir + "/" + cluster + "/" + dataSource + "/" + workingDay + "_" + System.currentTimeMillis();
 				// final output dir
@@ -239,4 +239,4 @@ public class DailyChukwaRecordRolling extends Configured implements Tool
 		return 0;
 	}
 	
-}
+}

src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java

@@ -88,7 +88,7 @@ public class HourlyChukwaRecordRolling extends Configured implements Tool
 				// Merge
 				String[] mergeArgs = new String[5];
 				// input
-				mergeArgs[0] = chukwaMainRepository + "/" + cluster + "/" + dataSource + "/" + workingDay + "/" + workingHour + "/*/*.evt";
+				mergeArgs[0] = chukwaMainRepository + "/" + cluster + "/" + dataSource + "/" + workingDay + "/" + workingHour + "/[0-5]*/*.evt";
 				// temp dir
 				mergeArgs[1] = tempDir + "/" + cluster + "/" + dataSource + "/" + workingDay + "/" + workingHour + "_" + System.currentTimeMillis() ;
 				// final output dir