Author: cdouglas
Date: Tue Feb 10 00:37:43 2009
New Revision: 742803
URL: http://svn.apache.org/viewvc?rev=742803&view=rev
Log:
HADOOP-5039. Fix log rolling regex to process only the relevant subdirectories.
Contributed by Jerome Boulon
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java
hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=742803&r1=742802&r2=742803&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Feb 10 00:37:43 2009
@@ -125,6 +125,9 @@
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
Modified:
hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java?rev=742803&r1=742802&r2=742803&view=diff
==============================================================================
---
hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java
(original)
+++
hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java
Tue Feb 10 00:37:43 2009
@@ -88,7 +88,7 @@
// 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 @@
return 0;
}
-}
\ No newline at end of file
+}
Modified:
hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java?rev=742803&r1=742802&r2=742803&view=diff
==============================================================================
---
hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java
(original)
+++
hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java
Tue Feb 10 00:37:43 2009
@@ -88,7 +88,7 @@
// 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
