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 8DC5ADB49 for ; Tue, 25 Sep 2012 17:27:03 +0000 (UTC) Received: (qmail 13539 invoked by uid 500); 25 Sep 2012 17:27:03 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 13413 invoked by uid 500); 25 Sep 2012 17:27:03 -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 13406 invoked by uid 99); 25 Sep 2012 17:27:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Sep 2012 17:27:03 +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; Tue, 25 Sep 2012 17:27:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F41A32388900 for ; Tue, 25 Sep 2012 17:26:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1390009 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java Date: Tue, 25 Sep 2012 17:26:18 -0000 To: common-commits@hadoop.apache.org From: acmurthy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120925172618.F41A32388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: acmurthy Date: Tue Sep 25 17:26:18 2012 New Revision: 1390009 URL: http://svn.apache.org/viewvc?rev=1390009&view=rev Log: Merge -c 1374095 from branch-1 to branch-1.1 to fix MAPREDUCE-4558. Disable TestJobTrackerSafeMode. Modified: hadoop/common/branches/branch-1.1/CHANGES.txt hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java Modified: hadoop/common/branches/branch-1.1/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1390009&r1=1390008&r2=1390009&view=diff ============================================================================== --- hadoop/common/branches/branch-1.1/CHANGES.txt (original) +++ hadoop/common/branches/branch-1.1/CHANGES.txt Tue Sep 25 17:26:18 2012 @@ -368,6 +368,8 @@ Release 1.1.0 - 2012.09.16 MAPREDUCE-3837. Job tracker is not able to recover job in case of crash and after that no user can submit job. (Mayank Bansal via tomwhite) + MAPREDUCE-4558. Disable TestJobTrackerSafeMode (sseth) + Release 1.0.4 - Unreleased NEW FEATURES Modified: hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java?rev=1390009&r1=1390008&r2=1390009&view=diff ============================================================================== --- hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java (original) +++ hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java Tue Sep 25 17:26:18 2012 @@ -35,6 +35,7 @@ import org.junit.*; * join back. */ +@Ignore public class TestJobTrackerSafeMode extends TestCase { final Path testDir = new Path(System.getProperty("test.build.data", "/tmp"), "jt-safemode"); @@ -197,7 +198,7 @@ public class TestJobTrackerSafeMode exte private boolean checkTrackers(JobTracker jobtracker, Set present, Set absent) { - while (jobtracker.getClusterStatus(true).getActiveTrackerNames().size() != 2) { + while (jobtracker.getClusterStatus(true).getActiveTrackerNames().size() != 3) { LOG.info("Waiting for Initialize all Task Trackers"); UtilsForTests.waitFor(1000); }