hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jl...@apache.org
Subject git commit: MAPREDUCE-6029. TestCommitterEventHandler fails in trunk. Contributed by Mit Desai
Date Tue, 07 Oct 2014 14:11:44 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 0fb273570 -> 2e789eb22


MAPREDUCE-6029. TestCommitterEventHandler fails in trunk. Contributed by Mit Desai


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2e789eb2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2e789eb2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2e789eb2

Branch: refs/heads/trunk
Commit: 2e789eb2261fa607489d8ae630fb77e8147d0266
Parents: 0fb2735
Author: Jason Lowe <jlowe@apache.org>
Authored: Tue Oct 7 14:10:39 2014 +0000
Committer: Jason Lowe <jlowe@apache.org>
Committed: Tue Oct 7 14:10:39 2014 +0000

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                        | 3 +++
 .../mapreduce/v2/app/commit/TestCommitterEventHandler.java  | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e789eb2/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 8bc1e53..1adf7cf 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -411,6 +411,9 @@ Release 2.6.0 - UNRELEASED
     MAPREDUCE-6094. TestMRCJCFileInputFormat.testAddInputPath() fails on trunk
     (Akira AJISAKA via jlowe)
 
+    MAPREDUCE-6029. TestCommitterEventHandler fails in trunk (Mit Desai via
+    jlowe)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e789eb2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/commit/TestCommitterEventHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/commit/TestCommitterEventHandler.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/commit/TestCommitterEventHandler.java
index 83e43f5..a553bbd 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/commit/TestCommitterEventHandler.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/commit/TestCommitterEventHandler.java
@@ -58,6 +58,7 @@ import org.apache.hadoop.mapreduce.v2.app.job.event.JobCommitCompletedEvent;
 import org.apache.hadoop.mapreduce.v2.app.job.event.JobCommitFailedEvent;
 import org.apache.hadoop.mapreduce.v2.util.MRApps;
 import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.util.Time;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.event.Event;
@@ -84,8 +85,12 @@ public class TestCommitterEventHandler {
     
     public synchronized Event getAndClearEvent() throws InterruptedException {
       if (event == null) {
-        //Wait for at most 10 ms
-        wait(100);
+        final long waitTime = 5000;
+        long waitStartTime = Time.monotonicNow();
+        while(event == null && Time.monotonicNow() - waitStartTime < waitTime)
{
+          //Wait for at most 5 sec
+          wait(waitTime);
+        }
       }
       Event e = event;
       event = null;


Mime
View raw message