hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject [1/4] hbase git commit: HBASE-12102 Duplicate keys in HBase.RegionServer metrics JSON (Ravi Kishore Valeti)
Date Wed, 18 Feb 2015 17:28:16 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 2bf48700d -> 928989354
  refs/heads/branch-1 ac49c8d3e -> d71641ab2
  refs/heads/branch-1.0 78594e869 -> 66187db4a
  refs/heads/master d64ce3106 -> cecc475d2


HBASE-12102 Duplicate keys in HBase.RegionServer metrics JSON (Ravi Kishore Valeti)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cecc475d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cecc475d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cecc475d

Branch: refs/heads/master
Commit: cecc475d2f194eed67edf16cd84fbf9716b8d5c5
Parents: d64ce31
Author: Andrew Purtell <apurtell@apache.org>
Authored: Wed Feb 18 08:08:46 2015 -0800
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Wed Feb 18 08:08:46 2015 -0800

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java | 3 +--
 .../org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java   | 3 +--
 .../hbase/regionserver/MetricsRegionAggregateSourceImpl.java      | 3 +--
 .../hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java  | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/cecc475d/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
index 2f5e5cf..04cf953 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
@@ -110,8 +110,7 @@ public class MetricsHBaseServerSourceImpl extends BaseSourceImpl
 
   @Override
   public void getMetrics(MetricsCollector metricsCollector, boolean all) {
-    MetricsRecordBuilder mrb = metricsCollector.addRecord(metricsName)
-        .setContext(metricsContext);
+    MetricsRecordBuilder mrb = metricsCollector.addRecord(metricsName);
 
     if (wrapper != null) {
       mrb.addGauge(Interns.info(QUEUE_SIZE_NAME, QUEUE_SIZE_DESC), wrapper.getTotalQueueSize())

http://git-wip-us.apache.org/repos/asf/hbase/blob/cecc475d/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java
index d4c90dc..02463f6 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java
@@ -68,8 +68,7 @@ public class MetricsMasterSourceImpl
   @Override
   public void getMetrics(MetricsCollector metricsCollector, boolean all) {
 
-    MetricsRecordBuilder metricsRecordBuilder = metricsCollector.addRecord(metricsName)
-        .setContext(metricsContext);
+    MetricsRecordBuilder metricsRecordBuilder = metricsCollector.addRecord(metricsName);
 
     // masterWrapper can be null because this function is called inside of init.
     if (masterWrapper != null) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/cecc475d/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSourceImpl.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSourceImpl.java
index 5cb2cec..ab7255e 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSourceImpl.java
@@ -80,8 +80,7 @@ public class MetricsRegionAggregateSourceImpl extends BaseSourceImpl
   public void getMetrics(MetricsCollector collector, boolean all) {
 
 
-    MetricsRecordBuilder mrb = collector.addRecord(metricsName)
-        .setContext(metricsContext);
+    MetricsRecordBuilder mrb = collector.addRecord(metricsName);
 
     if (regionSources != null) {
       lock.readLock().lock();

http://git-wip-us.apache.org/repos/asf/hbase/blob/cecc475d/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java
index 2c1dcd3..4cd73a9 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java
@@ -176,8 +176,7 @@ public class MetricsRegionServerSourceImpl
   @Override
   public void getMetrics(MetricsCollector metricsCollector, boolean all) {
 
-    MetricsRecordBuilder mrb = metricsCollector.addRecord(metricsName)
-        .setContext(metricsContext);
+    MetricsRecordBuilder mrb = metricsCollector.addRecord(metricsName);
 
     // rsWrap can be null because this function is called inside of init.
     if (rsWrap != null) {


Mime
View raw message