svn commit: r1405984 - in /giraph/trunk: CHANGELOG giraph/src/main/java/org/apache/giraph/metrics/GiraphMetrics.java

[ap...@apache.org]

Author: apresta
Date: Mon Nov  5 22:06:40 2012
New Revision: 1405984

URL: http://svn.apache.org/viewvc?rev=1405984&view=rev
Log:
GIRAPH-401: Metrics should be disabled by default (apresta)

Modified:
    giraph/trunk/CHANGELOG
    giraph/trunk/giraph/src/main/java/org/apache/giraph/metrics/GiraphMetrics.java

Modified: giraph/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1405984&r1=1405983&r2=1405984&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Mon Nov  5 22:06:40 2012
@@ -1,6 +1,8 @@
 Giraph Change Log
 
 Release 0.2.0 - unreleased
+  GIRAPH-401: Metrics should be disabled by default (apresta)
+
   GIRAPH-400: Refactoring broke
   TestTextDoubleDoubleAdjacencyListVertexInputFormat (apresta)
 

Modified: giraph/trunk/giraph/src/main/java/org/apache/giraph/metrics/GiraphMetrics.java
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph/src/main/java/org/apache/giraph/metrics/GiraphMetrics.java?rev=1405984&r1=1405983&r2=1405984&view=diff
==============================================================================
--- giraph/trunk/giraph/src/main/java/org/apache/giraph/metrics/GiraphMetrics.java (original)
+++ giraph/trunk/giraph/src/main/java/org/apache/giraph/metrics/GiraphMetrics.java Mon Nov  5 22:06:40 2012
@@ -17,6 +17,9 @@
  */
 package org.apache.giraph.metrics;
 
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.mapreduce.Mapper;
+
 import com.google.common.base.Joiner;
 import com.yammer.metrics.core.Counter;
 import com.yammer.metrics.core.Gauge;
@@ -28,8 +31,6 @@ import com.yammer.metrics.core.MetricsRe
 import com.yammer.metrics.core.Timer;
 import com.yammer.metrics.reporting.ConsoleReporter;
 import com.yammer.metrics.reporting.JmxReporter;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.mapreduce.Mapper;
 
 import java.io.PrintStream;
 import java.util.concurrent.TimeUnit;
@@ -81,7 +82,7 @@ public class GiraphMetrics {
     }
 
     Configuration conf = context.getConfiguration();
-    if (conf.getBoolean(ENABLE, true)) {
+    if (conf.getBoolean(ENABLE, false)) {
       REGISTRY = new MetricsRegistry();
       REPORTER = new JmxReporter(REGISTRY);
       REPORTER.start();