Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6416817CAD for ; Tue, 7 Oct 2014 14:11:45 +0000 (UTC) Received: (qmail 15445 invoked by uid 500); 7 Oct 2014 14:11:45 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 15376 invoked by uid 500); 7 Oct 2014 14:11:45 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 15367 invoked by uid 99); 7 Oct 2014 14:11:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Oct 2014 14:11:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A66958B59EC; Tue, 7 Oct 2014 14:11:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jlowe@apache.org To: common-commits@hadoop.apache.org Message-Id: <6738c9c980ee4fd6ab135f1efd1d3742@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: MAPREDUCE-6029. TestCommitterEventHandler fails in trunk. Contributed by Mit Desai Date: Tue, 7 Oct 2014 14:11:44 +0000 (UTC) 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 Authored: Tue Oct 7 14:10:39 2014 +0000 Committer: Jason Lowe 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;