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 08F3410D6C for ; Tue, 11 Mar 2014 04:34:51 +0000 (UTC) Received: (qmail 5201 invoked by uid 500); 11 Mar 2014 04:34:50 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 4731 invoked by uid 500); 11 Mar 2014 04:34:38 -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 4716 invoked by uid 99); 11 Mar 2014 04:34:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Mar 2014 04:34:35 +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, 11 Mar 2014 04:34:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CD2482388860; Tue, 11 Mar 2014 04:34:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1576187 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java Date: Tue, 11 Mar 2014 04:34:13 -0000 To: common-commits@hadoop.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140311043413.CD2482388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stack Date: Tue Mar 11 04:34:13 2014 New Revision: 1576187 URL: http://svn.apache.org/r1576187 Log: HADOOP-10337 ConcurrentModificationException from MetricsDynamicMBeanBase.createMBeanInfo() (Liang Xie via stack) Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1576187&r1=1576186&r2=1576187&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Mar 11 04:34:13 2014 @@ -416,6 +416,9 @@ Release 2.4.0 - UNRELEASED HADOOP-10395. TestCallQueueManager is flaky. (Arpit Agarwal) HADOOP-10394. TestAuthenticationFilter is flaky. (Arpit Agarwal) + + HADOOP-10337 ConcurrentModificationException from + MetricsDynamicMBeanBase.createMBeanInfo() (Liang Xie via stack) BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java?rev=1576187&r1=1576186&r2=1576187&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java Tue Mar 11 04:34:13 2014 @@ -18,8 +18,7 @@ package org.apache.hadoop.metrics.util; import java.util.Collection; -import java.util.HashMap; -import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import org.apache.hadoop.classification.InterfaceAudience; @@ -32,7 +31,8 @@ import org.apache.hadoop.classification. */ @InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"}) public class MetricsRegistry { - private Map metricsList = new HashMap(); + private ConcurrentHashMap metricsList = + new ConcurrentHashMap(); public MetricsRegistry() { } @@ -51,11 +51,11 @@ public class MetricsRegistry { * @param theMetricsObj - the metrics * @throws IllegalArgumentException if a name is already registered */ - public synchronized void add(final String metricsName, final MetricsBase theMetricsObj) { - if (metricsList.containsKey(metricsName)) { - throw new IllegalArgumentException("Duplicate metricsName:" + metricsName); + public void add(final String metricsName, final MetricsBase theMetricsObj) { + if (metricsList.putIfAbsent(metricsName, theMetricsObj) != null) { + throw new IllegalArgumentException("Duplicate metricsName:" + + metricsName); } - metricsList.put(metricsName, theMetricsObj); } @@ -65,7 +65,7 @@ public class MetricsRegistry { * @return the metrics if there is one registered by the supplied name. * Returns null if none is registered */ - public synchronized MetricsBase get(final String metricsName) { + public MetricsBase get(final String metricsName) { return metricsList.get(metricsName); } @@ -74,7 +74,7 @@ public class MetricsRegistry { * * @return the list of metrics names */ - public synchronized Collection getKeyList() { + public Collection getKeyList() { return metricsList.keySet(); } @@ -82,7 +82,7 @@ public class MetricsRegistry { * * @return the list of metrics */ - public synchronized Collection getMetricsList() { + public Collection getMetricsList() { return metricsList.values(); } }