Author: ddas
Date: Tue Jul 8 06:02:49 2008
New Revision: 674807
URL: http://svn.apache.org/viewvc?rev=674807&view=rev
Log:
Merge -r 674776:674777 from trunk onto 0.18 branch. Fixes HADOOP-3703.
Modified:
hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt
hadoop/core/branches/branch-0.18/src/contrib/hod/support/logcondense.py
Modified: hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt?rev=674807&r1=674806&r2=674807&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt Tue Jul 8
06:02:49 2008
@@ -50,6 +50,9 @@
script.exitcode file when a cluster directory is specified as a relative
path. (Vinod Kumar Vavilapalli via mahadev)
+ HADOOP-3703. Fixes logcondense.py to use the new format of hadoop dfs -lsr
+ command line output format. (Vinod Kumar Vavilapalli via yhemanth)
+
Release 0.17.0 - 2008-05-18
INCOMPATIBLE CHANGES
Modified:
hadoop/core/branches/branch-0.18/src/contrib/hod/support/logcondense.py
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/contrib/hod/support/logcondense.py?rev=674807&r1=674806&r2=674807&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/contrib/hod/support/logcondense.py
(original)
+++ hadoop/core/branches/branch-0.18/src/contrib/hod/support/logcondense.py Tue
Jul 8 06:02:49 2008
@@ -126,7 +126,7 @@
toPurge = { }
for line in stdout:
try:
- m = re.match("^(.*?)\s.*$", line)
+ m = re.match("^.*\s(.*)\n$", line)
filename = m.group(1)
# file name format:
<prefix>/<user>/hod-logs/<jobid>/[0-1]-[jobtracker|tasktracker|datanode|namenode|]-hostname-YYYYMMDDtime-random.tar.gz
# first strip prefix:
