You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:55:38 UTC
svn commit: r1077789 - in
/hadoop/common/branches/branch-0.20-security-patches/src:
mapred/org/apache/hadoop/mapred/MapTask.java
test/org/apache/hadoop/mapred/TestTaskTrackerMemoryManager.java
Author: omalley
Date: Fri Mar 4 04:55:38 2011
New Revision: 1077789
URL: http://svn.apache.org/viewvc?rev=1077789&view=rev
Log:
commit 86ad5488507bec0f0d9dcdadcf88204f38adb6cb
Author: Greg Roelofs <ro...@yahoo-inc.com>
Date: Wed Feb 9 20:06:01 2011 -0800
. Fix 2 of 4 unit-test failures: TestBadRecords (NPE due to
rearranged MapTask code in ) and TestTaskTrackerMemoryManager
(need hostname in output-string pattern). (roelofs, ramach)
+++ b/YAHOO-CHANGES.txt
+ . Fix 2 of 4 unit-test failures: TestBadRecords (NPE due to
+ rearranged MapTask code in ) and TestTaskTrackerMemoryManager
+ (need hostname in output-string pattern). (roelofs, ramach)
+
+ . New counters for FileInputFormat (BYTES_READ) and
+ . Change DiskErrorException to IOException (boryas)
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/MapTask.java
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestTaskTrackerMemoryManager.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/MapTask.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/MapTask.java?rev=1077789&r1=1077788&r2=1077789&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/MapTask.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/MapTask.java Fri Mar 4 04:55:38 2011
@@ -280,13 +280,13 @@ class MapTask extends Task {
private Counters.Counter skipRecCounter;
private long recIndex = -1;
- SkippingRecordReader(TaskUmbilicalProtocol umbilical, TaskReporter reporter)
- throws IOException {
- super(null, conf, reporter);
+ SkippingRecordReader(InputSplit split, TaskUmbilicalProtocol umbilical,
+ TaskReporter reporter) throws IOException {
+ super(split, conf, reporter);
this.umbilical = umbilical;
this.skipRecCounter = reporter.getCounter(Counter.MAP_SKIPPED_RECORDS);
this.toWriteSkipRecs = toWriteSkipRecs() &&
- SkipBadRecords.getSkipOutputPath(conf)!=null;
+ SkipBadRecords.getSkipOutputPath(conf)!=null;
skipIt = getSkipRanges().skipRangeIterator();
}
@@ -415,7 +415,7 @@ class MapTask extends Task {
reporter.setInputSplit(inputSplit);
RecordReader<INKEY,INVALUE> in = isSkipping() ?
- new SkippingRecordReader<INKEY,INVALUE>(umbilical, reporter) :
+ new SkippingRecordReader<INKEY,INVALUE>(inputSplit, umbilical, reporter) :
new TrackedRecordReader<INKEY,INVALUE>(inputSplit, job, reporter);
job.setBoolean("mapred.skip.on", isSkipping());
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestTaskTrackerMemoryManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestTaskTrackerMemoryManager.java?rev=1077789&r1=1077788&r2=1077789&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestTaskTrackerMemoryManager.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestTaskTrackerMemoryManager.java Fri Mar 4 04:55:38 2011
@@ -339,15 +339,14 @@ public class TestTaskTrackerMemoryManage
startCluster(fConf);
- Pattern taskOverLimitPattern =
- Pattern.compile(String.format(taskOverLimitPatternString, String
- .valueOf(PER_TASK_LIMIT)));
+ Pattern taskOverLimitPattern = Pattern.compile(
+ String.format(taskOverLimitPatternString, String.valueOf(PER_TASK_LIMIT)));
Pattern trackerOverLimitPattern =
- Pattern
- .compile("Killing one of the least progress tasks - .*, as "
- + "the cumulative memory usage of all the tasks on the TaskTracker"
- + " exceeds virtual memory limit " + TASK_TRACKER_LIMIT + ".");
+ Pattern.compile("Killing one of the least progress tasks - .*, as "
+ + "the cumulative memory usage of all the tasks on the TaskTracker"
+ + " host0.foo.com exceeds virtual memory limit " + TASK_TRACKER_LIMIT
+ + ".");
Matcher mat = null;
// Set up job.