Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 1761 invoked from network); 31 Aug 2008 05:21:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Aug 2008 05:21:09 -0000 Received: (qmail 74460 invoked by uid 500); 31 Aug 2008 05:21:07 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 74426 invoked by uid 500); 31 Aug 2008 05:21:07 -0000 Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: core-dev@hadoop.apache.org Delivered-To: mailing list core-commits@hadoop.apache.org Received: (qmail 74417 invoked by uid 99); 31 Aug 2008 05:21:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Aug 2008 22:21:07 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 31 Aug 2008 05:20:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0313E2388986; Sat, 30 Aug 2008 22:20:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690642 - in /hadoop/core/branches/branch-0.18: CHANGES.txt src/mapred/org/apache/hadoop/mapred/TaskTracker.java Date: Sun, 31 Aug 2008 05:20:48 -0000 To: core-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080831052049.0313E2388986@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Sat Aug 30 22:20:48 2008 New Revision: 690642 URL: http://svn.apache.org/viewvc?rev=690642&view=rev Log: HADOOP-4040. Merge -r 690640:690641 from trunk to branch 0.18. Modified: hadoop/core/branches/branch-0.18/CHANGES.txt hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Modified: hadoop/core/branches/branch-0.18/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=690642&r1=690641&r2=690642&view=diff ============================================================================== --- hadoop/core/branches/branch-0.18/CHANGES.txt (original) +++ hadoop/core/branches/branch-0.18/CHANGES.txt Sat Aug 30 22:20:48 2008 @@ -10,6 +10,10 @@ HADOOP-3821. Prevent SequenceFile and IFile from duplicating codecs in CodecPool when closed more than once. (Arun Murthy via cdouglas) + HADOOP-4040. Remove coded default of the IPC idle connection timeout + from the TaskTracker, which was causing HDFS client connections to not be + collected. (ddas via omalley) + Release 0.18.0 - 2008-08-19 INCOMPATIBLE CHANGES Modified: hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskTracker.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=690642&r1=690641&r2=690642&view=diff ============================================================================== --- hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskTracker.java (original) +++ hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Sat Aug 30 22:20:48 2008 @@ -2185,8 +2185,6 @@ int port = Integer.parseInt(args[1]); InetSocketAddress address = new InetSocketAddress(host, port); TaskAttemptID taskid = TaskAttemptID.forName(args[2]); - //set a very high idle timeout so that the connection is never closed - defaultConf.setInt("ipc.client.connection.maxidletime", 60*60*1000); TaskUmbilicalProtocol umbilical = (TaskUmbilicalProtocol)RPC.getProxy(TaskUmbilicalProtocol.class, TaskUmbilicalProtocol.versionID,