svn commit: r1358306 - in /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase: master/metrics/MasterMetrics.java regionserver/metrics/RegionServerMetrics.java

[te...@apache.org]

Author: tedyu
Date: Fri Jul  6 17:20:30 2012
New Revision: 1358306

URL: http://svn.apache.org/viewvc?rev=1358306&view=rev
Log:
HBASE-6220 PersistentMetricsTimeVaryingRate gets used for non-time-based metrics (Paul Cavallaro)


Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java?rev=1358306&r1=1358305&r2=1358306&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java Fri Jul  6 17:20:30 2012
@@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFac
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.metrics.HBaseInfo;
 import org.apache.hadoop.hbase.metrics.MetricsRate;
-import org.apache.hadoop.hbase.metrics.PersistentMetricsTimeVaryingRate;
+import org.apache.hadoop.hbase.metrics.histogram.MetricsHistogram;
 import org.apache.hadoop.metrics.ContextFactory;
 import org.apache.hadoop.metrics.MetricsContext;
 import org.apache.hadoop.metrics.MetricsRecord;
@@ -60,12 +60,10 @@ public class MasterMetrics implements Up
     new MetricsRate("cluster_requests", registry);
 
   /** Time it takes to finish HLog.splitLog() */
-  final PersistentMetricsTimeVaryingRate splitTime =
-    new PersistentMetricsTimeVaryingRate("splitTime", registry);
+  final MetricsHistogram splitTime = new MetricsHistogram("splitTime", registry);
 
   /** Size of HLog files being split */
-  final PersistentMetricsTimeVaryingRate splitSize =
-    new PersistentMetricsTimeVaryingRate("splitSize", registry);
+  final MetricsHistogram splitSize = new MetricsHistogram("splitSize", registry);
 
   /**
     * Regions in Transition metrics such as number of RIT regions, oldest
@@ -122,8 +120,8 @@ public class MasterMetrics implements Up
       if (this.extendedPeriod > 0 &&
           this.lastUpdate - this.lastExtUpdate >= this.extendedPeriod) {
         this.lastExtUpdate = this.lastUpdate;
-        this.splitTime.resetMinMaxAvg();
-        this.splitSize.resetMinMaxAvg();
+        this.splitTime.clear();
+        this.splitSize.clear();
         this.resetAllMinMax();
       }
 
@@ -147,8 +145,8 @@ public class MasterMetrics implements Up
    * @param size length of original HLogs that were split
    */
   public synchronized void addSplit(long time, long size) {
-    splitTime.inc(time);
-    splitSize.inc(size);
+    splitTime.update(time);
+    splitSize.update(size);
   }
 
   /**

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java?rev=1358306&r1=1358305&r2=1358306&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java Fri Jul  6 17:20:30 2012
@@ -286,11 +286,11 @@ public class RegionServerMetrics impleme
   /**
    * time each scheduled compaction takes
    */
-  protected final PersistentMetricsTimeVaryingRate compactionTime =
-    new PersistentMetricsTimeVaryingRate("compactionTime", registry);
+  protected final MetricsHistogram compactionTime =
+      new MetricsHistogram("compactionTime", registry);
 
-  protected final PersistentMetricsTimeVaryingRate compactionSize =
-    new PersistentMetricsTimeVaryingRate("compactionSize", registry);
+  protected final MetricsHistogram compactionSize =
+      new MetricsHistogram("compactionSize", registry);
 
   /**
    * time each scheduled flush takes
@@ -364,8 +364,8 @@ public class RegionServerMetrics impleme
       if (this.extendedPeriod > 0 &&
           this.lastUpdate - this.lastExtUpdate >= this.extendedPeriod) {
         this.lastExtUpdate = this.lastUpdate;
-        this.compactionTime.resetMinMaxAvg();
-        this.compactionSize.resetMinMaxAvg();
+        this.compactionTime.clear();
+        this.compactionSize.clear();
         this.flushTime.resetMinMaxAvg();
         this.flushSize.resetMinMaxAvg();
         this.resetAllMinMax();
@@ -499,8 +499,8 @@ public class RegionServerMetrics impleme
    * @param size bytesize of storefiles in the compaction
    */
   public synchronized void addCompaction(long time, long size) {
-    this.compactionTime.inc(time);
-    this.compactionSize.inc(size);
+    this.compactionTime.update(time);
+    this.compactionSize.update(size);
   }
 
   /**