Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: mapreduce-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1157422 - in /hadoop/common/trunk/mapreduce: CHANGES.txt
 src/test/mapred/org/apache/hadoop/mapreduce/SleepJob.java
Date: Sat, 13 Aug 2011 20:25:53 -0000
To: mapreduce-commits@hadoop.apache.org
From: acmurthy@apache.org
Message-Id: <20110813202553.C83C1238885D@eris.apache.org>

Author: acmurthy
Date: Sat Aug 13 20:25:53 2011
New Revision: 1157422

URL: http://svn.apache.org/viewvc?rev=1157422&view=rev
Log:
MAPREDUCE-2727. Fix divide-by-zero error in SleepJob for sleepCount equals 0. Contributed by Jeffrey Naisbitt.

Modified:
    hadoop/common/trunk/mapreduce/CHANGES.txt
    hadoop/common/trunk/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/SleepJob.java

Modified: hadoop/common/trunk/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/CHANGES.txt?rev=1157422&r1=1157421&r2=1157422&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/CHANGES.txt (original)
+++ hadoop/common/trunk/mapreduce/CHANGES.txt Sat Aug 13 20:25:53 2011
@@ -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
 

Modified: hadoop/common/trunk/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/SleepJob.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/SleepJob.java?rev=1157422&r1=1157421&r2=1157422&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/SleepJob.java (original)
+++ hadoop/common/trunk/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/SleepJob.java Sat Aug 13 20:25:53 2011
@@ -97,6 +97,9 @@ public class SleepJob extends Configured
 
         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
         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
       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
       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;
     }