You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2014/01/21 16:41:30 UTC

svn commit: r1560045 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java

Author: ivank
Date: Tue Jan 21 15:41:29 2014
New Revision: 1560045

URL: http://svn.apache.org/r1560045
Log:
BOOKKEEPER-719: Inconsistent synchronization of org.apache.bookkeeper.stats.CodahaleMetricsProvider.metrics (sijie via ivank)

Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1560045&r1=1560044&r2=1560045&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Tue Jan 21 15:41:29 2014
@@ -54,6 +54,8 @@ Trunk (unreleased changes)
 
       BOOKKEEPER-615: Twitter stats implementation of stats interface (sijie via ivank)
 
+      BOOKKEEPER-719: Inconsistent synchronization of org.apache.bookkeeper.stats.CodahaleMetricsProvider.metrics (sijie via ivank)
+
       bookkeeper-server:
 
         BOOKKEEPER-567: ReadOnlyBookieTest hangs on shutdown (sijie via ivank)

Modified: zookeeper/bookkeeper/trunk/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java?rev=1560045&r1=1560044&r2=1560045&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java Tue Jan 21 15:41:29 2014
@@ -60,6 +60,10 @@ public class CodahaleMetricsProvider imp
         }
     }
 
+    synchronized MetricRegistry getMetrics() {
+        return metrics;
+    }
+
     @Override
     public void start(Configuration conf) {
         initIfNecessary();
@@ -75,7 +79,7 @@ public class CodahaleMetricsProvider imp
             HostAndPort addr = HostAndPort.fromString(graphiteHost);
             final Graphite graphite = new Graphite(
                     new InetSocketAddress(addr.getHostText(), addr.getPort()));
-            reporters.add(GraphiteReporter.forRegistry(metrics)
+            reporters.add(GraphiteReporter.forRegistry(getMetrics())
                           .prefixedWith(prefix)
                           .convertRatesTo(TimeUnit.SECONDS)
                           .convertDurationsTo(TimeUnit.MILLISECONDS)
@@ -93,14 +97,14 @@ public class CodahaleMetricsProvider imp
                 outdir = new File(csvDir);
             }
             LOG.info("Configuring stats with csv output to directory [{}]", outdir.getAbsolutePath());
-            reporters.add(CsvReporter.forRegistry(metrics)
+            reporters.add(CsvReporter.forRegistry(getMetrics())
                           .convertRatesTo(TimeUnit.SECONDS)
                           .convertDurationsTo(TimeUnit.MILLISECONDS)
                           .build(outdir));
         }
         if (!Strings.isNullOrEmpty(slf4jCat)) {
             LOG.info("Configuring stats with slf4j");
-            reporters.add(Slf4jReporter.forRegistry(metrics)
+            reporters.add(Slf4jReporter.forRegistry(getMetrics())
                           .outputTo(LoggerFactory.getLogger(slf4jCat))
                           .convertRatesTo(TimeUnit.SECONDS)
                           .convertDurationsTo(TimeUnit.MILLISECONDS)
@@ -122,6 +126,6 @@ public class CodahaleMetricsProvider imp
     @Override
     public StatsLogger getStatsLogger(String name) {
         initIfNecessary();
-        return new CodahaleStatsLogger(metrics, name);
+        return new CodahaleStatsLogger(getMetrics(), name);
     }
 }