svn commit: r1092403 - in /hadoop/mapreduce/branches/branch-0.22: CHANGES.txt src/test/mapred/org/apache/hadoop/fs/slive/SliveTest.java

[sh...@apache.org]

Author: shv
Date: Thu Apr 14 17:38:04 2011
New Revision: 1092403

URL: http://svn.apache.org/viewvc?rev=1092403&view=rev
Log:
MAPREDUCE-2437. Merge -c 1092400 from trunk to branch 0.22.

Modified:
    hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
    hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/fs/slive/SliveTest.java

Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1092403&r1=1092402&r2=1092403&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Thu Apr 14 17:38:04 2011
@@ -519,6 +519,9 @@ Release 0.22.0 - Unreleased
     MAPREDUCE-2392. TaskTracker shutdown in the tests sometimes take 60s.
     (tomwhite)
 
+    MAPREDUCE-2437. SLive uses only part* files to generating the final report.
+    (shv)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

Modified: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/fs/slive/SliveTest.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/fs/slive/SliveTest.java?rev=1092403&r1=1092402&r2=1092403&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/fs/slive/SliveTest.java (original)
+++ hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/fs/slive/SliveTest.java Thu Apr 14 17:38:04 2011
@@ -229,6 +229,7 @@ public class SliveTest implements Tool {
       List<OperationOutput> noOperations = new ArrayList<OperationOutput>();
       Map<String, List<OperationOutput>> splitTypes = new TreeMap<String, List<OperationOutput>>();
       for(FileStatus fn : reduceFiles) {
+        if(!fn.getPath().getName().startsWith("part")) continue;
         fileReader = new BufferedReader(new InputStreamReader(
             new DataInputStream(fs.open(fn.getPath()))));
         String line;