From mapreduce-commits-return-2606-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org Wed Oct 26 02:13:14 2011 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 B320971AF for ; Wed, 26 Oct 2011 02:13:14 +0000 (UTC) Received: (qmail 70658 invoked by uid 500); 26 Oct 2011 02:13:14 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 70625 invoked by uid 500); 26 Oct 2011 02:13:14 -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 70617 invoked by uid 99); 26 Oct 2011 02:13:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Oct 2011 02:13:14 +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; Wed, 26 Oct 2011 02:13:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 26CED23888FD; Wed, 26 Oct 2011 02:12:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1188997 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java Date: Wed, 26 Oct 2011 02:12:51 -0000 To: mapreduce-commits@hadoop.apache.org From: acmurthy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111026021251.26CED23888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: acmurthy Date: Wed Oct 26 02:12:50 2011 New Revision: 1188997 URL: http://svn.apache.org/viewvc?rev=1188997&view=rev Log: MAPREDUCE-3263. Fixed the MAPREDUCE-3028 commit which broke MR1. Contributed by Hitesh Shah. Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/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=1188997&r1=1188996&r2=1188997&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Wed Oct 26 02:12:50 2011 @@ -1767,6 +1767,9 @@ Release 0.23.0 - Unreleased MAPREDUCE-3253. Fixed ContextFactory to clone JobContext correctly. (acmurthy) + MAPREDUCE-3263. Fixed the MAPREDUCE-3028 commit which broke MR1. (Hitesh + Shah via acmurthy) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java?rev=1188997&r1=1188996&r2=1188997&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java Wed Oct 26 02:12:50 2011 @@ -130,8 +130,8 @@ public abstract class NotificationTestCa protected JobConf createJobConf() { JobConf conf = super.createJobConf(); conf.setJobEndNotificationURI(getNotificationUrlTemplate()); - conf.setInt(JobContext.END_NOTIFICATION_RETRIES, 3); - conf.setInt(JobContext.END_NOTIFICATION_RETRIE_INTERVAL, 200); + conf.setInt(JobContext.MR_JOB_END_RETRY_ATTEMPTS, 3); + conf.setInt(JobContext.MR_JOB_END_RETRY_INTERVAL, 200); return conf; }