You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by tu...@apache.org on 2013/01/16 01:08:25 UTC
svn commit: r1433753 - in /hadoop/common/trunk/hadoop-mapreduce-project:
CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java
Author: tucu
Date: Wed Jan 16 00:08:25 2013
New Revision: 1433753
URL: http://svn.apache.org/viewvc?rev=1433753&view=rev
Log:
MAPREDUCE-4924. flakey test: org.apache.hadoop.mapred.TestClusterMRNotification.testMR. (rkanter via tucu)
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1433753&r1=1433752&r2=1433753&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Wed Jan 16 00:08:25 2013
@@ -256,6 +256,9 @@ Release 2.0.3-alpha - Unreleased
MAPREDUCE-4936. JobImpl uber checks for cpu are wrong (Arun C Murthy via
jlowe)
+ MAPREDUCE-4924. flakey test: org.apache.hadoop.mapred.TestClusterMRNotification.testMR.
+ (rkanter via tucu)
+
Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java?rev=1433753&r1=1433752&r2=1433753&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java Wed Jan 16 00:08:25 2013
@@ -90,8 +90,8 @@ public abstract class NotificationTestCa
}
public static class NotificationServlet extends HttpServlet {
- public static int counter = 0;
- public static int failureCounter = 0;
+ public static volatile int counter = 0;
+ public static volatile int failureCounter = 0;
private static final long serialVersionUID = 1L;
protected void doGet(HttpServletRequest req, HttpServletResponse res)
@@ -155,7 +155,11 @@ public abstract class NotificationTestCa
System.out.println(launchWordCount(this.createJobConf(),
"a b c d e f g h", 1, 1));
- Thread.sleep(2000);
+ boolean keepTrying = true;
+ for (int tries = 0; tries < 30 && keepTrying; tries++) {
+ Thread.sleep(50);
+ keepTrying = !(NotificationServlet.counter == 2);
+ }
assertEquals(2, NotificationServlet.counter);
assertEquals(0, NotificationServlet.failureCounter);
@@ -173,14 +177,22 @@ public abstract class NotificationTestCa
// run a job with KILLED status
System.out.println(UtilsForTests.runJobKill(this.createJobConf(), inDir,
outDir).getID());
- Thread.sleep(2000);
+ keepTrying = true;
+ for (int tries = 0; tries < 30 && keepTrying; tries++) {
+ Thread.sleep(50);
+ keepTrying = !(NotificationServlet.counter == 4);
+ }
assertEquals(4, NotificationServlet.counter);
assertEquals(0, NotificationServlet.failureCounter);
// run a job with FAILED status
System.out.println(UtilsForTests.runJobFail(this.createJobConf(), inDir,
outDir).getID());
- Thread.sleep(2000);
+ keepTrying = true;
+ for (int tries = 0; tries < 30 && keepTrying; tries++) {
+ Thread.sleep(50);
+ keepTrying = !(NotificationServlet.counter == 6);
+ }
assertEquals(6, NotificationServlet.counter);
assertEquals(0, NotificationServlet.failureCounter);
}