Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E72EC105D0 for ; Mon, 5 Aug 2013 16:03:29 +0000 (UTC) Received: (qmail 99572 invoked by uid 500); 5 Aug 2013 16:03:29 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 99301 invoked by uid 500); 5 Aug 2013 16:03:25 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 99273 invoked by uid 99); 5 Aug 2013 16:03:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Aug 2013 16:03:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Aug 2013 16:03:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 03299238890D; Mon, 5 Aug 2013 16:03:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1510581 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java Date: Mon, 05 Aug 2013 16:03:02 -0000 To: mapreduce-commits@hadoop.apache.org From: kihwal@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130805160303.03299238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kihwal Date: Mon Aug 5 16:03:02 2013 New Revision: 1510581 URL: http://svn.apache.org/r1510581 Log: MAPREDUCE-5446. TestJobHistoryEvents and TestJobHistoryParsing have race conditions. Contributed by Jason Lowe. Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.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=1510581&r1=1510580&r2=1510581&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Mon Aug 5 16:03:02 2013 @@ -186,6 +186,9 @@ Release 2.1.1-beta - UNRELEASED MAPREDUCE-5352. Optimize node local splits generated by CombineFileInputFormat. (sseth) + MAPREDUCE-5446. TestJobHistoryEvents and TestJobHistoryParsing have race + conditions (jlowe via kihwal) + BUG FIXES MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. (Omkar Vinit Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java?rev=1510581&r1=1510580&r2=1510581&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java Mon Aug 5 16:03:02 2013 @@ -357,15 +357,20 @@ public class MRApp extends MRAppMaster { } public void waitForState(Service.STATE finalState) throws Exception { - int timeoutSecs = 0; - while (!finalState.equals(getServiceState()) && timeoutSecs++ < 20) { - System.out.println("MRApp State is : " + getServiceState() - + " Waiting for state : " + finalState); - Thread.sleep(500); - } - System.out.println("MRApp State is : " + getServiceState()); - Assert.assertEquals("MRApp state is not correct (timedout)", finalState, - getServiceState()); + if (finalState == Service.STATE.STOPPED) { + Assert.assertTrue("Timeout while waiting for MRApp to stop", + waitForServiceToStop(20 * 1000)); + } else { + int timeoutSecs = 0; + while (!finalState.equals(getServiceState()) && timeoutSecs++ < 20) { + System.out.println("MRApp State is : " + getServiceState() + + " Waiting for state : " + finalState); + Thread.sleep(500); + } + System.out.println("MRApp State is : " + getServiceState()); + Assert.assertEquals("MRApp state is not correct (timedout)", finalState, + getServiceState()); + } } public void verifyCompleted() {