Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 1776 invoked from network); 29 Jan 2009 17:36:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Jan 2009 17:36:38 -0000 Received: (qmail 29792 invoked by uid 500); 29 Jan 2009 17:36:38 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 29762 invoked by uid 500); 29 Jan 2009 17:36:38 -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 29753 invoked by uid 99); 29 Jan 2009 17:36:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Jan 2009 09:36:38 -0800 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; Thu, 29 Jan 2009 17:36:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E08BA2388ACB; Thu, 29 Jan 2009 17:36:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r738934 - in /hadoop/core/trunk: CHANGES.txt src/core/org/apache/hadoop/ipc/RPC.java Date: Thu, 29 Jan 2009 17:36:10 -0000 To: core-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090129173610.E08BA2388ACB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: szetszwo Date: Thu Jan 29 17:36:10 2009 New Revision: 738934 URL: http://svn.apache.org/viewvc?rev=738934&view=rev Log: HADOOP-5139. Catch IllegalArgumentException during metrics registration in RPC. (Hairong Kuang via szetszwo) Modified: hadoop/core/trunk/CHANGES.txt hadoop/core/trunk/src/core/org/apache/hadoop/ipc/RPC.java Modified: hadoop/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=738934&r1=738933&r2=738934&view=diff ============================================================================== --- hadoop/core/trunk/CHANGES.txt (original) +++ hadoop/core/trunk/CHANGES.txt Thu Jan 29 17:36:10 2009 @@ -71,6 +71,9 @@ HADOOP-5045. FileSystem.isDirectory() should not be deprecated. (Suresh Srinivas via szetszwo) + HADOOP-5139. Catch IllegalArgumentException during metrics registration + in RPC. (Hairong Kuang via szetszwo) + Release 0.20.0 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/core/trunk/src/core/org/apache/hadoop/ipc/RPC.java URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/ipc/RPC.java?rev=738934&r1=738933&r2=738934&view=diff ============================================================================== --- hadoop/core/trunk/src/core/org/apache/hadoop/ipc/RPC.java (original) +++ hadoop/core/trunk/src/core/org/apache/hadoop/ipc/RPC.java Thu Jan 29 17:36:10 2009 @@ -519,8 +519,15 @@ MetricsTimeVaryingRate m = (MetricsTimeVaryingRate) rpcMetrics.registry.get(call.getMethodName()); if (m == null) { - m = new MetricsTimeVaryingRate(call.getMethodName(), + try { + m = new MetricsTimeVaryingRate(call.getMethodName(), rpcMetrics.registry); + } catch (IllegalArgumentException iae) { + // the metrics has been registered; re-fetch the handle + LOG.info("Error register " + call.getMethodName(), iae); + m = (MetricsTimeVaryingRate) rpcMetrics.registry.get( + call.getMethodName()); + } } m.inc(processingTime);