Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-2727. Fix divide-by-zero error in SleepJob for sleepCount equals 0. Contributed by Jeffrey Naisbitt. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1157422 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-08-13 20:25:53 +00:00
parent a464402cb8
commit cb98b81851
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mapreduce/CHANGES.txt
View File

@ -402,6 +402,9 @@ Trunk (unreleased changes)
MAPREDUCE-2839. Fixed TokenCache to get delegation tokens using both new
and old apis. (Siddharth Seth via acmurthy)
MAPREDUCE-2727. Fix divide-by-zero error in SleepJob for sleepCount equals
0. (Jeffrey Naisbitt via acmurthy)
Release 0.22.0 - Unreleased

9
mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/SleepJob.java
View File

@ -97,6 +97,9 @@ public class SleepJob extends Configured implements Tool {
public boolean nextKeyValue()
throws IOException {
if (count == 0) {
return false;
}
key = new IntWritable();
key.set(emitCount);
int emit = emitPerMapTask / count;
@ -112,7 +115,7 @@ public class SleepJob extends Configured implements Tool {
public IntWritable getCurrentValue() { return value; }
public void close() throws IOException { }
public float getProgress() throws IOException {
return records / ((float)count);
return count == 0 ? 100 : records / ((float)count);
}
};
}
@ -129,7 +132,7 @@ public class SleepJob extends Configured implements Tool {
Configuration conf = context.getConfiguration();
this.mapSleepCount =
conf.getInt(MAP_SLEEP_COUNT, mapSleepCount);
this.mapSleepDuration =
this.mapSleepDuration = mapSleepCount == 0 ? 0 :
conf.getLong(MAP_SLEEP_TIME , 100) / mapSleepCount;
}
@ -166,7 +169,7 @@ public class SleepJob extends Configured implements Tool {
Configuration conf = context.getConfiguration();
this.reduceSleepCount =
conf.getInt(REDUCE_SLEEP_COUNT, reduceSleepCount);
this.reduceSleepDuration =
this.reduceSleepDuration = reduceSleepCount == 0 ? 0 :
conf.getLong(REDUCE_SLEEP_TIME , 100) / reduceSleepCount;
}