You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2018/06/10 07:29:03 UTC
[17/50] [abbrv] hbase git commit: HBASE-19724 Fixed Checkstyle errors
in hbase-hadoop2-compat and enabled Checkstyle to fail on violations
HBASE-19724 Fixed Checkstyle errors in hbase-hadoop2-compat and enabled Checkstyle to fail on violations
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d5ea9263
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d5ea9263
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d5ea9263
Branch: refs/heads/HBASE-20331
Commit: d5ea926321d8339dbbb761b32bcdc043aed576ee
Parents: 2fdd36f
Author: Jan Hentschel <ja...@ultratendency.com>
Authored: Sun Jan 7 13:10:31 2018 +0100
Committer: Jan Hentschel <ja...@ultratendency.com>
Committed: Fri Jun 1 10:59:47 2018 +0200
----------------------------------------------------------------------
hbase-hadoop2-compat/pom.xml | 7 +
.../hbase/ipc/MetricsHBaseServerSourceImpl.java | 13 +-
.../apache/hadoop/hbase/mapreduce/JobUtil.java | 12 +-
.../MetricsAssignmentManagerSourceImpl.java | 10 +-
.../MetricsMasterFilesystemSourceImpl.java | 2 +-
.../master/MetricsMasterProcSourceImpl.java | 2 +-
.../master/MetricsMasterQuotaSourceImpl.java | 5 +-
.../hbase/master/MetricsMasterSourceImpl.java | 11 +-
.../hbase/master/MetricsSnapshotSourceImpl.java | 2 +-
.../balancer/MetricsBalancerSourceImpl.java | 9 +-
.../MetricsStochasticBalancerSourceImpl.java | 23 +-
.../hadoop/hbase/metrics/BaseSourceImpl.java | 22 +-
.../apache/hadoop/hbase/metrics/Interns.java | 13 +-
.../hadoop/hbase/metrics/MBeanSourceImpl.java | 2 +-
.../hadoop/hbase/metrics/MetricsInfoImpl.java | 6 +-
.../MetricsHeapMemoryManagerSourceImpl.java | 2 +-
.../MetricsRegionAggregateSourceImpl.java | 6 +-
.../MetricsRegionServerSourceFactoryImpl.java | 5 +-
.../MetricsRegionServerSourceImpl.java | 406 ++++++++++---------
.../regionserver/MetricsRegionSourceImpl.java | 6 +-
.../MetricsTableAggregateSourceImpl.java | 8 +-
.../regionserver/MetricsTableSourceImpl.java | 18 +-
.../regionserver/wal/MetricsWALSourceImpl.java | 11 +-
.../MetricsReplicationGlobalSourceSource.java | 13 +-
.../MetricsReplicationSourceImpl.java | 2 +-
.../MetricsReplicationSourceSourceImpl.java | 3 +
.../hbase/rest/MetricsRESTSourceImpl.java | 25 +-
.../thrift/MetricsThriftServerSourceImpl.java | 5 +-
.../zookeeper/MetricsZooKeeperSourceImpl.java | 47 ++-
.../hadoop/metrics2/impl/JmxCacheBuster.java | 8 +-
.../lib/DefaultMetricsSystemHelper.java | 4 +-
.../metrics2/lib/DynamicMetricsRegistry.java | 39 +-
.../metrics2/lib/MetricsExecutorImpl.java | 2 +-
.../hadoop/metrics2/lib/MutableHistogram.java | 2 +-
.../metrics2/lib/MutableRangeHistogram.java | 3 +-
.../metrics2/lib/MutableSizeHistogram.java | 2 +-
.../metrics2/lib/MutableTimeHistogram.java | 4 +-
.../hadoop/metrics2/util/MetricQuantile.java | 13 +-
.../metrics2/util/MetricSampleQuantiles.java | 10 +-
.../apache/hadoop/hbase/HadoopShimsImpl.java | 3 +-
.../master/TestMetricsMasterSourceImpl.java | 9 +-
.../TestMetricsRegionServerSourceImpl.java | 10 +-
.../TestMetricsRegionSourceImpl.java | 22 +-
.../TestMetricsTableSourceImpl.java | 11 +-
...TestMetricsReplicationSourceFactoryImpl.java | 9 +-
.../TestMetricsReplicationSourceImpl.java | 6 +-
.../hbase/rest/TestMetricsRESTSourceImpl.java | 13 +-
.../hbase/test/MetricsAssertHelperImpl.java | 14 +-
...estMetricsThriftServerSourceFactoryImpl.java | 19 +-
.../TestMetricsZooKeeperSourceImpl.java | 8 +-
50 files changed, 469 insertions(+), 438 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml
index 6a313ab..ab33c72 100644
--- a/hbase-hadoop2-compat/pom.xml
+++ b/hbase-hadoop2-compat/pom.xml
@@ -71,6 +71,13 @@ limitations under the License.
<groupId>net.revelc.code</groupId>
<artifactId>warbucks-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/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 6e8b81d..45f60c4 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
@@ -19,20 +19,17 @@
package org.apache.hadoop.hbase.ipc;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.hbase.metrics.ExceptionTrackingSourceImpl;
import org.apache.hadoop.hbase.metrics.Interns;
import org.apache.hadoop.metrics2.MetricHistogram;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.lib.MutableFastCounter;
+import org.apache.yetus.audience.InterfaceAudience;
@InterfaceAudience.Private
public class MetricsHBaseServerSourceImpl extends ExceptionTrackingSourceImpl
implements MetricsHBaseServerSource {
-
-
private final MetricsHBaseServerWrapper wrapper;
private final MutableFastCounter authorizationSuccesses;
private final MutableFastCounter authorizationFailures;
@@ -119,10 +116,14 @@ public class MetricsHBaseServerSourceImpl extends ExceptionTrackingSourceImpl
}
@Override
- public void sentResponse(long count) { this.responseSize.add(count); }
+ public void sentResponse(long count) {
+ this.responseSize.add(count);
+ }
@Override
- public void receivedRequest(long count) { this.requestSize.add(count); }
+ public void receivedRequest(long count) {
+ this.requestSize.add(count);
+ }
@Override
public void dequeuedCall(int qTime) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/mapreduce/JobUtil.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/mapreduce/JobUtil.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/mapreduce/JobUtil.java
index 6989285..b6d9642 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/mapreduce/JobUtil.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/mapreduce/JobUtil.java
@@ -20,14 +20,14 @@ package org.apache.hadoop.hbase.mapreduce;
import java.io.IOException;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.mapreduce.Cluster;
+import org.apache.hadoop.mapreduce.JobSubmissionFiles;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.mapreduce.Cluster;
-import org.apache.hadoop.mapreduce.JobSubmissionFiles;
/**
* Utility methods to interact with a job.
@@ -46,8 +46,8 @@ public abstract class JobUtil {
*
* @param conf system configuration
* @return staging directory path
- * @throws IOException
- * @throws InterruptedException
+ * @throws IOException if the ownership on the staging directory is not as expected
+ * @throws InterruptedException if the thread getting the staging directory is interrupted
*/
public static Path getStagingDir(Configuration conf)
throws IOException, InterruptedException {
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSourceImpl.java
index 52c03bf..e8ab7d7 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSourceImpl.java
@@ -18,12 +18,12 @@
package org.apache.hadoop.hbase.master;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.hbase.metrics.OperationMetrics;
import org.apache.hadoop.metrics2.MetricHistogram;
import org.apache.hadoop.metrics2.lib.MutableFastCounter;
import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
+import org.apache.yetus.audience.InterfaceAudience;
@InterfaceAudience.Private
public class MetricsAssignmentManagerSourceImpl
@@ -53,12 +53,12 @@ public class MetricsAssignmentManagerSourceImpl
}
public void init() {
- ritGauge = metricsRegistry.newGauge(RIT_COUNT_NAME, RIT_COUNT_DESC, 0l);
+ ritGauge = metricsRegistry.newGauge(RIT_COUNT_NAME, RIT_COUNT_DESC, 0L);
ritCountOverThresholdGauge = metricsRegistry.newGauge(RIT_COUNT_OVER_THRESHOLD_NAME,
- RIT_COUNT_OVER_THRESHOLD_DESC,0l);
- ritOldestAgeGauge = metricsRegistry.newGauge(RIT_OLDEST_AGE_NAME, RIT_OLDEST_AGE_DESC, 0l);
+ RIT_COUNT_OVER_THRESHOLD_DESC,0L);
+ ritOldestAgeGauge = metricsRegistry.newGauge(RIT_OLDEST_AGE_NAME, RIT_OLDEST_AGE_DESC, 0L);
ritDurationHisto = metricsRegistry.newTimeHistogram(RIT_DURATION_NAME, RIT_DURATION_DESC);
- operationCounter = metricsRegistry.getCounter(OPERATION_COUNT_NAME, 0l);
+ operationCounter = metricsRegistry.getCounter(OPERATION_COUNT_NAME, 0L);
/**
* NOTE: Please refer to HBASE-9774 and HBASE-14282. Based on these two issues, HBase is
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFilesystemSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFilesystemSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFilesystemSourceImpl.java
index 19aa3b7..d78efce 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFilesystemSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFilesystemSourceImpl.java
@@ -18,9 +18,9 @@
package org.apache.hadoop.hbase.master;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.metrics2.MetricHistogram;
+import org.apache.yetus.audience.InterfaceAudience;
@InterfaceAudience.Private
public class MetricsMasterFilesystemSourceImpl
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterProcSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterProcSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterProcSourceImpl.java
index dcf81e1..c51cd10 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterProcSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterProcSourceImpl.java
@@ -18,11 +18,11 @@
package org.apache.hadoop.hbase.master;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.hbase.metrics.Interns;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Hadoop2 implementation of MetricsMasterSource.
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSourceImpl.java
index 4f14c64..750c1c9 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSourceImpl.java
@@ -19,20 +19,21 @@ package org.apache.hadoop.hbase.master;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.metrics2.MetricHistogram;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.lib.Interns;
import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Implementation of {@link MetricsMasterQuotaSource} which writes the values passed in via the
* interface to the metrics backend.
*/
@InterfaceAudience.Private
-public class MetricsMasterQuotaSourceImpl extends BaseSourceImpl implements MetricsMasterQuotaSource {
+public class MetricsMasterQuotaSourceImpl extends BaseSourceImpl
+ implements MetricsMasterQuotaSource {
private final MetricsMasterWrapper wrapper;
private final MutableGaugeLong spaceQuotasGauge;
private final MutableGaugeLong tablesViolatingQuotasGauge;
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/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 48163a3..5b78fe8 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
@@ -18,13 +18,13 @@
package org.apache.hadoop.hbase.master;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.hbase.metrics.Interns;
import org.apache.hadoop.hbase.metrics.OperationMetrics;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.lib.MutableFastCounter;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Hadoop2 implementation of MetricsMasterSource.
@@ -61,9 +61,9 @@ public class MetricsMasterSourceImpl
@Override
public void init() {
super.init();
- clusterRequestsCounter = metricsRegistry.newCounter(CLUSTER_REQUESTS_NAME, "", 0l);
+ clusterRequestsCounter = metricsRegistry.newCounter(CLUSTER_REQUESTS_NAME, "", 0L);
- /**
+ /*
* NOTE: Please refer to HBASE-9774 and HBASE-14282. Based on these two issues, HBase is
* moving away from using Hadoop's metric2 to having independent HBase specific Metrics. Use
* {@link BaseSourceImpl#registry} to register the new metrics.
@@ -92,8 +92,9 @@ public class MetricsMasterSourceImpl
MASTER_ACTIVE_TIME_DESC), masterWrapper.getActiveTime())
.addGauge(Interns.info(MASTER_START_TIME_NAME,
MASTER_START_TIME_DESC), masterWrapper.getStartTime())
- .addGauge(Interns.info(MASTER_FINISHED_INITIALIZATION_TIME_NAME, MASTER_FINISHED_INITIALIZATION_TIME_DESC),
- masterWrapper.getMasterInitializationTime())
+ .addGauge(Interns.info(MASTER_FINISHED_INITIALIZATION_TIME_NAME,
+ MASTER_FINISHED_INITIALIZATION_TIME_DESC),
+ masterWrapper.getMasterInitializationTime())
.addGauge(Interns.info(AVERAGE_LOAD_NAME, AVERAGE_LOAD_DESC),
masterWrapper.getAverageLoad())
.tag(Interns.info(LIVE_REGION_SERVERS_NAME, LIVE_REGION_SERVERS_DESC),
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSourceImpl.java
index e622e4c..7077f73 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSourceImpl.java
@@ -18,9 +18,9 @@
package org.apache.hadoop.hbase.master;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.metrics2.MetricHistogram;
+import org.apache.yetus.audience.InterfaceAudience;
@InterfaceAudience.Private
public class MetricsSnapshotSourceImpl extends BaseSourceImpl implements MetricsSnapshotSource {
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSourceImpl.java
index 032175f..a10b3d7 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSourceImpl.java
@@ -18,14 +18,13 @@
package org.apache.hadoop.hbase.master.balancer;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.metrics2.MetricHistogram;
import org.apache.hadoop.metrics2.lib.MutableFastCounter;
+import org.apache.yetus.audience.InterfaceAudience;
@InterfaceAudience.Private
-public class MetricsBalancerSourceImpl extends BaseSourceImpl implements MetricsBalancerSource{
-
+public class MetricsBalancerSourceImpl extends BaseSourceImpl implements MetricsBalancerSource {
private MetricHistogram blanceClusterHisto;
private MutableFastCounter miscCount;
@@ -39,12 +38,10 @@ public class MetricsBalancerSourceImpl extends BaseSourceImpl implements Metrics
super(metricsName, metricsDescription, metricsContext, metricsJmxContext);
}
-
@Override
public void init() {
blanceClusterHisto = metricsRegistry.newTimeHistogram(BALANCE_CLUSTER);
miscCount = metricsRegistry.newCounter(MISC_INVOATION_COUNT, "", 0L);
-
}
@Override
@@ -54,6 +51,6 @@ public class MetricsBalancerSourceImpl extends BaseSourceImpl implements Metrics
@Override
public void incrMiscInvocations() {
- miscCount.incr();
+ miscCount.incr();
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsStochasticBalancerSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsStochasticBalancerSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsStochasticBalancerSourceImpl.java
index 01e44cd..3b4ba36 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsStochasticBalancerSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsStochasticBalancerSourceImpl.java
@@ -22,10 +22,10 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.Interns;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
+import org.apache.yetus.audience.InterfaceAudience;
@InterfaceAudience.Private
public class MetricsStochasticBalancerSourceImpl extends MetricsBalancerSourceImpl implements
@@ -38,14 +38,14 @@ public class MetricsStochasticBalancerSourceImpl extends MetricsBalancerSourceIm
private int mruCap = calcMruCap(metricsSize);
private Map<String, Map<String, Double>> stochasticCosts =
- new LinkedHashMap<String, Map<String, Double>>(mruCap, MRU_LOAD_FACTOR, true) {
- private static final long serialVersionUID = 8204713453436906599L;
+ new LinkedHashMap<String, Map<String, Double>>(mruCap, MRU_LOAD_FACTOR, true) {
+ private static final long serialVersionUID = 8204713453436906599L;
- @Override
- protected boolean removeEldestEntry(Map.Entry<String, Map<String, Double>> eldest) {
- return size() > mruCap;
- }
- };
+ @Override
+ protected boolean removeEldestEntry(Map.Entry<String, Map<String, Double>> eldest) {
+ return size() > mruCap;
+ }
+ };
private Map<String, String> costFunctionDescs = new ConcurrentHashMap<>();
/**
@@ -98,7 +98,11 @@ public class MetricsStochasticBalancerSourceImpl extends MetricsBalancerSourceIm
String attrName = tableEntry.getKey() + TABLE_FUNCTION_SEP + costEntry.getKey();
Double cost = costEntry.getValue();
String functionDesc = costFunctionDescs.get(costEntry.getKey());
- if (functionDesc == null) functionDesc = costEntry.getKey();
+
+ if (functionDesc == null) {
+ functionDesc = costEntry.getKey();
+ }
+
metricsRecordBuilder.addGauge(Interns.info(attrName, functionDesc), cost);
}
}
@@ -106,5 +110,4 @@ public class MetricsStochasticBalancerSourceImpl extends MetricsBalancerSourceIm
}
metricsRegistry.snapshot(metricsRecordBuilder, all);
}
-
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSourceImpl.java
index dfa7487..a90d810 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSourceImpl.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.hbase.metrics;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.impl.GlobalMetricRegistriesAdapter;
import org.apache.hadoop.hbase.metrics.impl.HBaseMetrics2HadoopMetricsAdapter;
import org.apache.hadoop.hbase.regionserver.MetricsRegionServerSourceImpl;
@@ -31,6 +30,7 @@ import org.apache.hadoop.metrics2.lib.MutableFastCounter;
import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
import org.apache.hadoop.metrics2.lib.MutableHistogram;
import org.apache.hadoop.metrics2.source.JvmMetrics;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Hadoop 2 implementation of BaseSource (using metrics2 framework). It handles registration to
@@ -46,7 +46,10 @@ public class BaseSourceImpl implements BaseSource, MetricsSource {
private boolean inited = false;
synchronized void init(String name) {
- if (inited) return;
+ if (inited) {
+ return;
+ }
+
inited = true;
DefaultMetricsSystem.initialize(HBASE_METRICS_SYSTEM_NAME);
JvmMetrics.initSingleton(name, "");
@@ -60,9 +63,10 @@ public class BaseSourceImpl implements BaseSource, MetricsSource {
/**
* @deprecated Use hbase-metrics/hbase-metrics-api module interfaces for new metrics.
- * Defining BaseSources for new metric groups (WAL, RPC, etc) is not needed anymore, however,
- * for existing BaseSource implemetnations, please use the field named "registry" which is a
- * MetricRegistry instance together with the HBaseMetrics2HadoopMetricsAdapter.
+ * Defining BaseSources for new metric groups (WAL, RPC, etc) is not needed anymore,
+ * however, for existing {@link BaseSource} implementations, please use the field
+ * named "registry" which is a {@link MetricRegistry} instance together with the
+ * {@link HBaseMetrics2HadoopMetricsAdapter}.
*/
@Deprecated
protected final DynamicMetricsRegistry metricsRegistry;
@@ -144,7 +148,7 @@ public class BaseSourceImpl implements BaseSource, MetricsSource {
* @param delta The amount to increment the gauge by.
*/
public void incGauge(String gaugeName, long delta) {
- MutableGaugeLong gaugeInt = metricsRegistry.getGauge(gaugeName, 0l);
+ MutableGaugeLong gaugeInt = metricsRegistry.getGauge(gaugeName, 0L);
gaugeInt.incr(delta);
}
@@ -155,7 +159,7 @@ public class BaseSourceImpl implements BaseSource, MetricsSource {
* @param delta the ammount to subtract from a gauge value.
*/
public void decGauge(String gaugeName, long delta) {
- MutableGaugeLong gaugeInt = metricsRegistry.getGauge(gaugeName, 0l);
+ MutableGaugeLong gaugeInt = metricsRegistry.getGauge(gaugeName, 0L);
gaugeInt.decr(delta);
}
@@ -166,7 +170,7 @@ public class BaseSourceImpl implements BaseSource, MetricsSource {
* @param delta the ammount to increment
*/
public void incCounters(String key, long delta) {
- MutableFastCounter counter = metricsRegistry.getCounter(key, 0l);
+ MutableFastCounter counter = metricsRegistry.getCounter(key, 0L);
counter.incr(delta);
}
@@ -180,7 +184,7 @@ public class BaseSourceImpl implements BaseSource, MetricsSource {
/**
* Remove a named gauge.
*
- * @param key
+ * @param key the key of the gauge to remove
*/
public void removeMetric(String key) {
metricsRegistry.removeMetric(key);
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/Interns.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/Interns.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/Interns.java
index b23bfc8..254d3b4 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/Interns.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/Interns.java
@@ -18,21 +18,18 @@
package org.apache.hadoop.hbase.metrics;
-
-
-import org.apache.hbase.thirdparty.com.google.common.cache.CacheBuilder;
-import org.apache.hbase.thirdparty.com.google.common.cache.CacheLoader;
-import org.apache.hbase.thirdparty.com.google.common.cache.LoadingCache;
-
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.yetus.audience.InterfaceStability;
import org.apache.hadoop.metrics2.MetricsInfo;
import org.apache.hadoop.metrics2.MetricsTag;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.yetus.audience.InterfaceStability;
+import org.apache.hbase.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hbase.thirdparty.com.google.common.cache.CacheLoader;
+import org.apache.hbase.thirdparty.com.google.common.cache.LoadingCache;
/**
* Helpers to create interned metrics info
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSourceImpl.java
index 2dcfff6..a5ffe8f 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSourceImpl.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.hbase.metrics;
import javax.management.ObjectName;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.metrics2.util.MBeans;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Hadoop2 metrics2 implementation of an object that registers MBeans.
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MetricsInfoImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MetricsInfoImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MetricsInfoImpl.java
index c3c3f5b..42d139c 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MetricsInfoImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MetricsInfoImpl.java
@@ -18,13 +18,13 @@
package org.apache.hadoop.hbase.metrics;
+import org.apache.hadoop.metrics2.MetricsInfo;
+import org.apache.yetus.audience.InterfaceAudience;
+
import org.apache.hbase.thirdparty.com.google.common.base.MoreObjects;
import org.apache.hbase.thirdparty.com.google.common.base.Objects;
import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.hadoop.metrics2.MetricsInfo;
-
/**
* Making implementing metric info a little easier
*/
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSourceImpl.java
index e4a0a08..047f8e1 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSourceImpl.java
@@ -18,11 +18,11 @@
*/
package org.apache.hadoop.hbase.regionserver;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.metrics2.MetricHistogram;
import org.apache.hadoop.metrics2.lib.MutableFastCounter;
import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Hadoop2 implementation of MetricsHeapMemoryManagerSource. Implements BaseSource through
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/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 cb78ccf..044d6b8 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
@@ -23,15 +23,15 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.hbase.metrics.Interns;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.impl.JmxCacheBuster;
import org.apache.hadoop.metrics2.lib.MetricsExecutorImpl;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@InterfaceAudience.Private
public class MetricsRegionAggregateSourceImpl extends BaseSourceImpl
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.java
index be2aae2..2e6b458 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.java
@@ -17,10 +17,10 @@
*/
package org.apache.hadoop.hbase.regionserver;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.io.MetricsIOSource;
import org.apache.hadoop.hbase.io.MetricsIOSourceImpl;
import org.apache.hadoop.hbase.io.MetricsIOWrapper;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Factory to create MetricsRegionServerSource when given a MetricsRegionServerWrapper
@@ -65,7 +65,8 @@ public class MetricsRegionServerSourceFactoryImpl implements MetricsRegionServer
}
@Override
- public synchronized MetricsRegionServerSource createServer(MetricsRegionServerWrapper regionServerWrapper) {
+ public synchronized MetricsRegionServerSource createServer(
+ MetricsRegionServerWrapper regionServerWrapper) {
return new MetricsRegionServerSourceImpl(regionServerWrapper);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/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 a123a89..94b8389 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
@@ -18,13 +18,13 @@
package org.apache.hadoop.hbase.regionserver;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.hbase.metrics.Interns;
import org.apache.hadoop.metrics2.MetricHistogram;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.lib.MutableFastCounter;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Hadoop2 implementation of MetricsRegionServerSource.
@@ -220,7 +220,7 @@ public class MetricsRegionServerSourceImpl
@Override
public void incrSlowPut() {
- slowPut.incr();
+ slowPut.incr();
}
@Override
@@ -329,209 +329,136 @@ public class MetricsRegionServerSourceImpl
*/
@Override
public void getMetrics(MetricsCollector metricsCollector, boolean all) {
-
MetricsRecordBuilder mrb = metricsCollector.addRecord(metricsName);
// rsWrap can be null because this function is called inside of init.
if (rsWrap != null) {
- mrb.addGauge(Interns.info(REGION_COUNT, REGION_COUNT_DESC), rsWrap.getNumOnlineRegions())
- .addGauge(Interns.info(STORE_COUNT, STORE_COUNT_DESC), rsWrap.getNumStores())
- .addGauge(Interns.info(WALFILE_COUNT, WALFILE_COUNT_DESC), rsWrap.getNumWALFiles())
- .addGauge(Interns.info(WALFILE_SIZE, WALFILE_SIZE_DESC), rsWrap.getWALFileSize())
- .addGauge(Interns.info(STOREFILE_COUNT, STOREFILE_COUNT_DESC), rsWrap.getNumStoreFiles())
- .addGauge(Interns.info(MEMSTORE_SIZE, MEMSTORE_SIZE_DESC), rsWrap.getMemStoreSize())
- .addGauge(Interns.info(STOREFILE_SIZE, STOREFILE_SIZE_DESC), rsWrap.getStoreFileSize())
- .addGauge(Interns.info(MAX_STORE_FILE_AGE, MAX_STORE_FILE_AGE_DESC),
- rsWrap.getMaxStoreFileAge())
- .addGauge(Interns.info(MIN_STORE_FILE_AGE, MIN_STORE_FILE_AGE_DESC),
- rsWrap.getMinStoreFileAge())
- .addGauge(Interns.info(AVG_STORE_FILE_AGE, AVG_STORE_FILE_AGE_DESC),
- rsWrap.getAvgStoreFileAge())
- .addGauge(Interns.info(NUM_REFERENCE_FILES, NUM_REFERENCE_FILES_DESC),
- rsWrap.getNumReferenceFiles())
- .addGauge(Interns.info(RS_START_TIME_NAME, RS_START_TIME_DESC),
- rsWrap.getStartCode())
- .addGauge(Interns.info(AVERAGE_REGION_SIZE, AVERAGE_REGION_SIZE_DESC), rsWrap.getAverageRegionSize())
- .addCounter(Interns.info(TOTAL_REQUEST_COUNT, TOTAL_REQUEST_COUNT_DESC),
- rsWrap.getTotalRequestCount())
- .addCounter(Interns.info(TOTAL_ROW_ACTION_REQUEST_COUNT, TOTAL_ROW_ACTION_REQUEST_COUNT_DESC),
- rsWrap.getTotalRowActionRequestCount())
- .addCounter(Interns.info(READ_REQUEST_COUNT, READ_REQUEST_COUNT_DESC),
- rsWrap.getReadRequestsCount())
- .addCounter(Interns.info(FILTERED_READ_REQUEST_COUNT, FILTERED_READ_REQUEST_COUNT_DESC),
- rsWrap.getFilteredReadRequestsCount())
- .addCounter(Interns.info(WRITE_REQUEST_COUNT, WRITE_REQUEST_COUNT_DESC),
- rsWrap.getWriteRequestsCount())
- .addCounter(Interns.info(RPC_GET_REQUEST_COUNT, RPC_GET_REQUEST_COUNT_DESC),
- rsWrap.getRpcGetRequestsCount())
- .addCounter(Interns.info(RPC_SCAN_REQUEST_COUNT, RPC_SCAN_REQUEST_COUNT_DESC),
- rsWrap.getRpcScanRequestsCount())
- .addCounter(Interns.info(RPC_MULTI_REQUEST_COUNT, RPC_MULTI_REQUEST_COUNT_DESC),
- rsWrap.getRpcMultiRequestsCount())
- .addCounter(Interns.info(RPC_MUTATE_REQUEST_COUNT, RPC_MUTATE_REQUEST_COUNT_DESC),
- rsWrap.getRpcMutateRequestsCount())
- .addCounter(Interns.info(CHECK_MUTATE_FAILED_COUNT, CHECK_MUTATE_FAILED_COUNT_DESC),
- rsWrap.getCheckAndMutateChecksFailed())
- .addCounter(Interns.info(CHECK_MUTATE_PASSED_COUNT, CHECK_MUTATE_PASSED_COUNT_DESC),
- rsWrap.getCheckAndMutateChecksPassed())
- .addGauge(Interns.info(STOREFILE_INDEX_SIZE, STOREFILE_INDEX_SIZE_DESC),
- rsWrap.getStoreFileIndexSize())
- .addGauge(Interns.info(STATIC_INDEX_SIZE, STATIC_INDEX_SIZE_DESC),
- rsWrap.getTotalStaticIndexSize())
- .addGauge(Interns.info(STATIC_BLOOM_SIZE, STATIC_BLOOM_SIZE_DESC),
- rsWrap.getTotalStaticBloomSize())
- .addGauge(
- Interns.info(NUMBER_OF_MUTATIONS_WITHOUT_WAL, NUMBER_OF_MUTATIONS_WITHOUT_WAL_DESC),
- rsWrap.getNumMutationsWithoutWAL())
- .addGauge(Interns.info(DATA_SIZE_WITHOUT_WAL, DATA_SIZE_WITHOUT_WAL_DESC),
- rsWrap.getDataInMemoryWithoutWAL())
- .addGauge(Interns.info(PERCENT_FILES_LOCAL, PERCENT_FILES_LOCAL_DESC),
- rsWrap.getPercentFileLocal())
- .addGauge(Interns.info(PERCENT_FILES_LOCAL_SECONDARY_REGIONS,
- PERCENT_FILES_LOCAL_SECONDARY_REGIONS_DESC),
- rsWrap.getPercentFileLocalSecondaryRegions())
- .addGauge(Interns.info(SPLIT_QUEUE_LENGTH, SPLIT_QUEUE_LENGTH_DESC),
- rsWrap.getSplitQueueSize())
- .addGauge(Interns.info(COMPACTION_QUEUE_LENGTH, COMPACTION_QUEUE_LENGTH_DESC),
- rsWrap.getCompactionQueueSize())
- .addGauge(Interns.info(SMALL_COMPACTION_QUEUE_LENGTH, SMALL_COMPACTION_QUEUE_LENGTH_DESC),
- rsWrap.getSmallCompactionQueueSize())
- .addGauge(Interns.info(LARGE_COMPACTION_QUEUE_LENGTH, LARGE_COMPACTION_QUEUE_LENGTH_DESC),
- rsWrap.getLargeCompactionQueueSize())
- .addGauge(Interns.info(FLUSH_QUEUE_LENGTH, FLUSH_QUEUE_LENGTH_DESC),
- rsWrap.getFlushQueueSize())
-
- .addGauge(Interns.info(BLOCK_CACHE_FREE_SIZE, BLOCK_CACHE_FREE_DESC),
- rsWrap.getBlockCacheFreeSize())
- .addGauge(Interns.info(BLOCK_CACHE_COUNT, BLOCK_CACHE_COUNT_DESC),
- rsWrap.getBlockCacheCount())
- .addGauge(Interns.info(BLOCK_CACHE_SIZE, BLOCK_CACHE_SIZE_DESC),
- rsWrap.getBlockCacheSize())
- .addCounter(Interns.info(BLOCK_CACHE_HIT_COUNT, BLOCK_CACHE_HIT_COUNT_DESC),
- rsWrap.getBlockCacheHitCount())
- .addCounter(Interns.info(BLOCK_CACHE_PRIMARY_HIT_COUNT,
- BLOCK_CACHE_PRIMARY_HIT_COUNT_DESC), rsWrap.getBlockCachePrimaryHitCount())
- .addCounter(Interns.info(BLOCK_CACHE_MISS_COUNT, BLOCK_COUNT_MISS_COUNT_DESC),
- rsWrap.getBlockCacheMissCount())
- .addCounter(Interns.info(BLOCK_CACHE_PRIMARY_MISS_COUNT,
- BLOCK_COUNT_PRIMARY_MISS_COUNT_DESC), rsWrap.getBlockCachePrimaryMissCount())
- .addCounter(Interns.info(BLOCK_CACHE_EVICTION_COUNT, BLOCK_CACHE_EVICTION_COUNT_DESC),
- rsWrap.getBlockCacheEvictedCount())
- .addCounter(Interns.info(BLOCK_CACHE_PRIMARY_EVICTION_COUNT,
- BLOCK_CACHE_PRIMARY_EVICTION_COUNT_DESC), rsWrap.getBlockCachePrimaryEvictedCount())
- .addGauge(Interns.info(BLOCK_CACHE_HIT_PERCENT, BLOCK_CACHE_HIT_PERCENT_DESC),
- rsWrap.getBlockCacheHitPercent())
- .addGauge(Interns.info(BLOCK_CACHE_EXPRESS_HIT_PERCENT,
- BLOCK_CACHE_EXPRESS_HIT_PERCENT_DESC), rsWrap.getBlockCacheHitCachingPercent())
- .addCounter(Interns.info(BLOCK_CACHE_FAILED_INSERTION_COUNT,
- BLOCK_CACHE_FAILED_INSERTION_COUNT_DESC),rsWrap.getBlockCacheFailedInsertions())
- .addCounter(Interns.info(BLOCK_CACHE_DATA_MISS_COUNT, ""), rsWrap.getDataMissCount())
- .addCounter(Interns.info(BLOCK_CACHE_LEAF_INDEX_MISS_COUNT, ""),
- rsWrap.getLeafIndexMissCount())
- .addCounter(Interns.info(BLOCK_CACHE_BLOOM_CHUNK_MISS_COUNT, ""),
- rsWrap.getBloomChunkMissCount())
- .addCounter(Interns.info(BLOCK_CACHE_META_MISS_COUNT, ""), rsWrap.getMetaMissCount())
- .addCounter(Interns.info(BLOCK_CACHE_ROOT_INDEX_MISS_COUNT, ""),
- rsWrap.getRootIndexMissCount())
- .addCounter(Interns.info(BLOCK_CACHE_INTERMEDIATE_INDEX_MISS_COUNT, ""),
- rsWrap.getIntermediateIndexMissCount())
- .addCounter(Interns.info(BLOCK_CACHE_FILE_INFO_MISS_COUNT, ""),
- rsWrap.getFileInfoMissCount())
- .addCounter(Interns.info(BLOCK_CACHE_GENERAL_BLOOM_META_MISS_COUNT, ""),
- rsWrap.getGeneralBloomMetaMissCount())
- .addCounter(Interns.info(BLOCK_CACHE_DELETE_FAMILY_BLOOM_MISS_COUNT, ""),
- rsWrap.getDeleteFamilyBloomMissCount())
- .addCounter(Interns.info(BLOCK_CACHE_TRAILER_MISS_COUNT, ""),
- rsWrap.getTrailerMissCount())
- .addCounter(Interns.info(BLOCK_CACHE_DATA_HIT_COUNT, ""), rsWrap.getDataHitCount())
- .addCounter(Interns.info(BLOCK_CACHE_LEAF_INDEX_HIT_COUNT, ""),
- rsWrap.getLeafIndexHitCount())
- .addCounter(Interns.info(BLOCK_CACHE_BLOOM_CHUNK_HIT_COUNT, ""),
- rsWrap.getBloomChunkHitCount())
- .addCounter(Interns.info(BLOCK_CACHE_META_HIT_COUNT, ""), rsWrap.getMetaHitCount())
- .addCounter(Interns.info(BLOCK_CACHE_ROOT_INDEX_HIT_COUNT, ""),
- rsWrap.getRootIndexHitCount())
- .addCounter(Interns.info(BLOCK_CACHE_INTERMEDIATE_INDEX_HIT_COUNT, ""),
- rsWrap.getIntermediateIndexHitCount())
- .addCounter(Interns.info(BLOCK_CACHE_FILE_INFO_HIT_COUNT, ""),
- rsWrap.getFileInfoHitCount())
- .addCounter(Interns.info(BLOCK_CACHE_GENERAL_BLOOM_META_HIT_COUNT, ""),
- rsWrap.getGeneralBloomMetaHitCount())
- .addCounter(Interns.info(BLOCK_CACHE_DELETE_FAMILY_BLOOM_HIT_COUNT, ""),
- rsWrap.getDeleteFamilyBloomHitCount())
- .addCounter(Interns.info(BLOCK_CACHE_TRAILER_HIT_COUNT, ""), rsWrap.getTrailerHitCount())
- .addGauge(Interns.info(L1_CACHE_HIT_COUNT, L1_CACHE_HIT_COUNT_DESC),
- rsWrap.getL1CacheHitCount())
- .addGauge(Interns.info(L1_CACHE_MISS_COUNT, L1_CACHE_MISS_COUNT_DESC),
- rsWrap.getL1CacheMissCount())
- .addGauge(Interns.info(L1_CACHE_HIT_RATIO, L1_CACHE_HIT_RATIO_DESC),
- rsWrap.getL1CacheHitRatio())
- .addGauge(Interns.info(L1_CACHE_MISS_RATIO, L1_CACHE_MISS_RATIO_DESC),
- rsWrap.getL1CacheMissRatio())
- .addGauge(Interns.info(L2_CACHE_HIT_COUNT, L2_CACHE_HIT_COUNT_DESC),
- rsWrap.getL2CacheHitCount())
- .addGauge(Interns.info(L2_CACHE_MISS_COUNT, L2_CACHE_MISS_COUNT_DESC),
- rsWrap.getL2CacheMissCount())
- .addGauge(Interns.info(L2_CACHE_HIT_RATIO, L2_CACHE_HIT_RATIO_DESC),
- rsWrap.getL2CacheHitRatio())
- .addGauge(Interns.info(L2_CACHE_MISS_RATIO, L2_CACHE_MISS_RATIO_DESC),
- rsWrap.getL2CacheMissRatio())
- .addCounter(Interns.info(UPDATES_BLOCKED_TIME, UPDATES_BLOCKED_DESC),
- rsWrap.getUpdatesBlockedTime())
- .addCounter(Interns.info(FLUSHED_CELLS, FLUSHED_CELLS_DESC),
- rsWrap.getFlushedCellsCount())
- .addCounter(Interns.info(COMPACTED_CELLS, COMPACTED_CELLS_DESC),
- rsWrap.getCompactedCellsCount())
- .addCounter(Interns.info(MAJOR_COMPACTED_CELLS, MAJOR_COMPACTED_CELLS_DESC),
- rsWrap.getMajorCompactedCellsCount())
- .addCounter(Interns.info(FLUSHED_CELLS_SIZE, FLUSHED_CELLS_SIZE_DESC),
- rsWrap.getFlushedCellsSize())
- .addCounter(Interns.info(COMPACTED_CELLS_SIZE, COMPACTED_CELLS_SIZE_DESC),
- rsWrap.getCompactedCellsSize())
- .addCounter(Interns.info(MAJOR_COMPACTED_CELLS_SIZE, MAJOR_COMPACTED_CELLS_SIZE_DESC),
- rsWrap.getMajorCompactedCellsSize())
- .addCounter(
- Interns.info(CELLS_COUNT_COMPACTED_FROM_MOB, CELLS_COUNT_COMPACTED_FROM_MOB_DESC),
- rsWrap.getCellsCountCompactedFromMob())
- .addCounter(Interns.info(CELLS_COUNT_COMPACTED_TO_MOB, CELLS_COUNT_COMPACTED_TO_MOB_DESC),
- rsWrap.getCellsCountCompactedToMob())
- .addCounter(
- Interns.info(CELLS_SIZE_COMPACTED_FROM_MOB, CELLS_SIZE_COMPACTED_FROM_MOB_DESC),
- rsWrap.getCellsSizeCompactedFromMob())
- .addCounter(Interns.info(CELLS_SIZE_COMPACTED_TO_MOB, CELLS_SIZE_COMPACTED_TO_MOB_DESC),
- rsWrap.getCellsSizeCompactedToMob())
- .addCounter(Interns.info(MOB_FLUSH_COUNT, MOB_FLUSH_COUNT_DESC),
- rsWrap.getMobFlushCount())
- .addCounter(Interns.info(MOB_FLUSHED_CELLS_COUNT, MOB_FLUSHED_CELLS_COUNT_DESC),
- rsWrap.getMobFlushedCellsCount())
- .addCounter(Interns.info(MOB_FLUSHED_CELLS_SIZE, MOB_FLUSHED_CELLS_SIZE_DESC),
- rsWrap.getMobFlushedCellsSize())
- .addCounter(Interns.info(MOB_SCAN_CELLS_COUNT, MOB_SCAN_CELLS_COUNT_DESC),
- rsWrap.getMobScanCellsCount())
- .addCounter(Interns.info(MOB_SCAN_CELLS_SIZE, MOB_SCAN_CELLS_SIZE_DESC),
- rsWrap.getMobScanCellsSize())
- .addGauge(Interns.info(MOB_FILE_CACHE_COUNT, MOB_FILE_CACHE_COUNT_DESC),
- rsWrap.getMobFileCacheCount())
- .addCounter(Interns.info(MOB_FILE_CACHE_ACCESS_COUNT, MOB_FILE_CACHE_ACCESS_COUNT_DESC),
- rsWrap.getMobFileCacheAccessCount())
- .addCounter(Interns.info(MOB_FILE_CACHE_MISS_COUNT, MOB_FILE_CACHE_MISS_COUNT_DESC),
- rsWrap.getMobFileCacheMissCount())
- .addCounter(
- Interns.info(MOB_FILE_CACHE_EVICTED_COUNT, MOB_FILE_CACHE_EVICTED_COUNT_DESC),
- rsWrap.getMobFileCacheEvictedCount())
- .addGauge(Interns.info(MOB_FILE_CACHE_HIT_PERCENT, MOB_FILE_CACHE_HIT_PERCENT_DESC),
- rsWrap.getMobFileCacheHitPercent())
-
- .addCounter(Interns.info(HEDGED_READS, HEDGED_READS_DESC), rsWrap.getHedgedReadOps())
- .addCounter(Interns.info(HEDGED_READ_WINS, HEDGED_READ_WINS_DESC),
- rsWrap.getHedgedReadWins())
- .addCounter(Interns.info(BLOCKED_REQUESTS_COUNT, BLOCKED_REQUESTS_COUNT_DESC),
- rsWrap.getBlockedRequestsCount())
- .tag(Interns.info(ZOOKEEPER_QUORUM_NAME, ZOOKEEPER_QUORUM_DESC),
- rsWrap.getZookeeperQuorum())
- .tag(Interns.info(SERVER_NAME_NAME, SERVER_NAME_DESC), rsWrap.getServerName())
- .tag(Interns.info(CLUSTER_ID_NAME, CLUSTER_ID_DESC), rsWrap.getClusterId());
-
+ addGaugesToMetricsRecordBuilder(mrb)
+ .addCounter(Interns.info(TOTAL_REQUEST_COUNT, TOTAL_REQUEST_COUNT_DESC),
+ rsWrap.getTotalRequestCount())
+ .addCounter(Interns.info(TOTAL_ROW_ACTION_REQUEST_COUNT,
+ TOTAL_ROW_ACTION_REQUEST_COUNT_DESC), rsWrap.getTotalRowActionRequestCount())
+ .addCounter(Interns.info(READ_REQUEST_COUNT, READ_REQUEST_COUNT_DESC),
+ rsWrap.getReadRequestsCount())
+ .addCounter(Interns.info(FILTERED_READ_REQUEST_COUNT,
+ FILTERED_READ_REQUEST_COUNT_DESC), rsWrap.getFilteredReadRequestsCount())
+ .addCounter(Interns.info(WRITE_REQUEST_COUNT, WRITE_REQUEST_COUNT_DESC),
+ rsWrap.getWriteRequestsCount())
+ .addCounter(Interns.info(RPC_GET_REQUEST_COUNT, RPC_GET_REQUEST_COUNT_DESC),
+ rsWrap.getRpcGetRequestsCount())
+ .addCounter(Interns.info(RPC_SCAN_REQUEST_COUNT, RPC_SCAN_REQUEST_COUNT_DESC),
+ rsWrap.getRpcScanRequestsCount())
+ .addCounter(Interns.info(RPC_MULTI_REQUEST_COUNT, RPC_MULTI_REQUEST_COUNT_DESC),
+ rsWrap.getRpcMultiRequestsCount())
+ .addCounter(Interns.info(RPC_MUTATE_REQUEST_COUNT, RPC_MUTATE_REQUEST_COUNT_DESC),
+ rsWrap.getRpcMutateRequestsCount())
+ .addCounter(Interns.info(CHECK_MUTATE_FAILED_COUNT, CHECK_MUTATE_FAILED_COUNT_DESC),
+ rsWrap.getCheckAndMutateChecksFailed())
+ .addCounter(Interns.info(CHECK_MUTATE_PASSED_COUNT, CHECK_MUTATE_PASSED_COUNT_DESC),
+ rsWrap.getCheckAndMutateChecksPassed())
+ .addCounter(Interns.info(BLOCK_CACHE_HIT_COUNT, BLOCK_CACHE_HIT_COUNT_DESC),
+ rsWrap.getBlockCacheHitCount())
+ .addCounter(Interns.info(BLOCK_CACHE_PRIMARY_HIT_COUNT,
+ BLOCK_CACHE_PRIMARY_HIT_COUNT_DESC), rsWrap.getBlockCachePrimaryHitCount())
+ .addCounter(Interns.info(BLOCK_CACHE_MISS_COUNT, BLOCK_COUNT_MISS_COUNT_DESC),
+ rsWrap.getBlockCacheMissCount())
+ .addCounter(Interns.info(BLOCK_CACHE_PRIMARY_MISS_COUNT,
+ BLOCK_COUNT_PRIMARY_MISS_COUNT_DESC), rsWrap.getBlockCachePrimaryMissCount())
+ .addCounter(Interns.info(BLOCK_CACHE_EVICTION_COUNT, BLOCK_CACHE_EVICTION_COUNT_DESC),
+ rsWrap.getBlockCacheEvictedCount())
+ .addCounter(Interns.info(BLOCK_CACHE_PRIMARY_EVICTION_COUNT,
+ BLOCK_CACHE_PRIMARY_EVICTION_COUNT_DESC),
+ rsWrap.getBlockCachePrimaryEvictedCount())
+ .addCounter(Interns.info(BLOCK_CACHE_FAILED_INSERTION_COUNT,
+ BLOCK_CACHE_FAILED_INSERTION_COUNT_DESC),
+ rsWrap.getBlockCacheFailedInsertions())
+ .addCounter(Interns.info(BLOCK_CACHE_DATA_MISS_COUNT, ""),
+ rsWrap.getDataMissCount())
+ .addCounter(Interns.info(BLOCK_CACHE_LEAF_INDEX_MISS_COUNT, ""),
+ rsWrap.getLeafIndexMissCount())
+ .addCounter(Interns.info(BLOCK_CACHE_BLOOM_CHUNK_MISS_COUNT, ""),
+ rsWrap.getBloomChunkMissCount())
+ .addCounter(Interns.info(BLOCK_CACHE_META_MISS_COUNT, ""),
+ rsWrap.getMetaMissCount())
+ .addCounter(Interns.info(BLOCK_CACHE_ROOT_INDEX_MISS_COUNT, ""),
+ rsWrap.getRootIndexMissCount())
+ .addCounter(Interns.info(BLOCK_CACHE_INTERMEDIATE_INDEX_MISS_COUNT, ""),
+ rsWrap.getIntermediateIndexMissCount())
+ .addCounter(Interns.info(BLOCK_CACHE_FILE_INFO_MISS_COUNT, ""),
+ rsWrap.getFileInfoMissCount())
+ .addCounter(Interns.info(BLOCK_CACHE_GENERAL_BLOOM_META_MISS_COUNT, ""),
+ rsWrap.getGeneralBloomMetaMissCount())
+ .addCounter(Interns.info(BLOCK_CACHE_DELETE_FAMILY_BLOOM_MISS_COUNT, ""),
+ rsWrap.getDeleteFamilyBloomMissCount())
+ .addCounter(Interns.info(BLOCK_CACHE_TRAILER_MISS_COUNT, ""),
+ rsWrap.getTrailerMissCount())
+ .addCounter(Interns.info(BLOCK_CACHE_DATA_HIT_COUNT, ""),
+ rsWrap.getDataHitCount())
+ .addCounter(Interns.info(BLOCK_CACHE_LEAF_INDEX_HIT_COUNT, ""),
+ rsWrap.getLeafIndexHitCount())
+ .addCounter(Interns.info(BLOCK_CACHE_BLOOM_CHUNK_HIT_COUNT, ""),
+ rsWrap.getBloomChunkHitCount())
+ .addCounter(Interns.info(BLOCK_CACHE_META_HIT_COUNT, ""),
+ rsWrap.getMetaHitCount())
+ .addCounter(Interns.info(BLOCK_CACHE_ROOT_INDEX_HIT_COUNT, ""),
+ rsWrap.getRootIndexHitCount())
+ .addCounter(Interns.info(BLOCK_CACHE_INTERMEDIATE_INDEX_HIT_COUNT, ""),
+ rsWrap.getIntermediateIndexHitCount())
+ .addCounter(Interns.info(BLOCK_CACHE_FILE_INFO_HIT_COUNT, ""),
+ rsWrap.getFileInfoHitCount())
+ .addCounter(Interns.info(BLOCK_CACHE_GENERAL_BLOOM_META_HIT_COUNT, ""),
+ rsWrap.getGeneralBloomMetaHitCount())
+ .addCounter(Interns.info(BLOCK_CACHE_DELETE_FAMILY_BLOOM_HIT_COUNT, ""),
+ rsWrap.getDeleteFamilyBloomHitCount())
+ .addCounter(Interns.info(BLOCK_CACHE_TRAILER_HIT_COUNT, ""),
+ rsWrap.getTrailerHitCount())
+ .addCounter(Interns.info(UPDATES_BLOCKED_TIME, UPDATES_BLOCKED_DESC),
+ rsWrap.getUpdatesBlockedTime())
+ .addCounter(Interns.info(FLUSHED_CELLS, FLUSHED_CELLS_DESC),
+ rsWrap.getFlushedCellsCount())
+ .addCounter(Interns.info(COMPACTED_CELLS, COMPACTED_CELLS_DESC),
+ rsWrap.getCompactedCellsCount())
+ .addCounter(Interns.info(MAJOR_COMPACTED_CELLS, MAJOR_COMPACTED_CELLS_DESC),
+ rsWrap.getMajorCompactedCellsCount())
+ .addCounter(Interns.info(FLUSHED_CELLS_SIZE, FLUSHED_CELLS_SIZE_DESC),
+ rsWrap.getFlushedCellsSize())
+ .addCounter(Interns.info(COMPACTED_CELLS_SIZE, COMPACTED_CELLS_SIZE_DESC),
+ rsWrap.getCompactedCellsSize())
+ .addCounter(Interns.info(MAJOR_COMPACTED_CELLS_SIZE, MAJOR_COMPACTED_CELLS_SIZE_DESC),
+ rsWrap.getMajorCompactedCellsSize())
+ .addCounter(Interns.info(CELLS_COUNT_COMPACTED_FROM_MOB,
+ CELLS_COUNT_COMPACTED_FROM_MOB_DESC), rsWrap.getCellsCountCompactedFromMob())
+ .addCounter(Interns.info(CELLS_COUNT_COMPACTED_TO_MOB,
+ CELLS_COUNT_COMPACTED_TO_MOB_DESC), rsWrap.getCellsCountCompactedToMob())
+ .addCounter(Interns.info(CELLS_SIZE_COMPACTED_FROM_MOB,
+ CELLS_SIZE_COMPACTED_FROM_MOB_DESC), rsWrap.getCellsSizeCompactedFromMob())
+ .addCounter(Interns.info(CELLS_SIZE_COMPACTED_TO_MOB,
+ CELLS_SIZE_COMPACTED_TO_MOB_DESC), rsWrap.getCellsSizeCompactedToMob())
+ .addCounter(Interns.info(MOB_FLUSH_COUNT, MOB_FLUSH_COUNT_DESC),
+ rsWrap.getMobFlushCount())
+ .addCounter(Interns.info(MOB_FLUSHED_CELLS_COUNT, MOB_FLUSHED_CELLS_COUNT_DESC),
+ rsWrap.getMobFlushedCellsCount())
+ .addCounter(Interns.info(MOB_FLUSHED_CELLS_SIZE, MOB_FLUSHED_CELLS_SIZE_DESC),
+ rsWrap.getMobFlushedCellsSize())
+ .addCounter(Interns.info(MOB_SCAN_CELLS_COUNT, MOB_SCAN_CELLS_COUNT_DESC),
+ rsWrap.getMobScanCellsCount())
+ .addCounter(Interns.info(MOB_SCAN_CELLS_SIZE, MOB_SCAN_CELLS_SIZE_DESC),
+ rsWrap.getMobScanCellsSize())
+ .addCounter(Interns.info(MOB_FILE_CACHE_ACCESS_COUNT,
+ MOB_FILE_CACHE_ACCESS_COUNT_DESC), rsWrap.getMobFileCacheAccessCount())
+ .addCounter(Interns.info(MOB_FILE_CACHE_MISS_COUNT, MOB_FILE_CACHE_MISS_COUNT_DESC),
+ rsWrap.getMobFileCacheMissCount())
+ .addCounter(Interns.info(MOB_FILE_CACHE_EVICTED_COUNT,
+ MOB_FILE_CACHE_EVICTED_COUNT_DESC), rsWrap.getMobFileCacheEvictedCount())
+ .addCounter(Interns.info(HEDGED_READS, HEDGED_READS_DESC), rsWrap.getHedgedReadOps())
+ .addCounter(Interns.info(HEDGED_READ_WINS, HEDGED_READ_WINS_DESC),
+ rsWrap.getHedgedReadWins())
+ .addCounter(Interns.info(BLOCKED_REQUESTS_COUNT, BLOCKED_REQUESTS_COUNT_DESC),
+ rsWrap.getBlockedRequestsCount())
+ .tag(Interns.info(ZOOKEEPER_QUORUM_NAME, ZOOKEEPER_QUORUM_DESC),
+ rsWrap.getZookeeperQuorum())
+ .tag(Interns.info(SERVER_NAME_NAME, SERVER_NAME_DESC), rsWrap.getServerName())
+ .tag(Interns.info(CLUSTER_ID_NAME, CLUSTER_ID_DESC), rsWrap.getClusterId());
}
metricsRegistry.snapshot(mrb, all);
@@ -543,6 +470,83 @@ public class MetricsRegionServerSourceImpl
}
}
+ private MetricsRecordBuilder addGaugesToMetricsRecordBuilder(MetricsRecordBuilder mrb) {
+ return mrb.addGauge(Interns.info(REGION_COUNT, REGION_COUNT_DESC), rsWrap.getNumOnlineRegions())
+ .addGauge(Interns.info(STORE_COUNT, STORE_COUNT_DESC), rsWrap.getNumStores())
+ .addGauge(Interns.info(WALFILE_COUNT, WALFILE_COUNT_DESC), rsWrap.getNumWALFiles())
+ .addGauge(Interns.info(WALFILE_SIZE, WALFILE_SIZE_DESC), rsWrap.getWALFileSize())
+ .addGauge(Interns.info(STOREFILE_COUNT, STOREFILE_COUNT_DESC),
+ rsWrap.getNumStoreFiles())
+ .addGauge(Interns.info(MEMSTORE_SIZE, MEMSTORE_SIZE_DESC), rsWrap.getMemStoreSize())
+ .addGauge(Interns.info(STOREFILE_SIZE, STOREFILE_SIZE_DESC), rsWrap.getStoreFileSize())
+ .addGauge(Interns.info(MAX_STORE_FILE_AGE, MAX_STORE_FILE_AGE_DESC),
+ rsWrap.getMaxStoreFileAge())
+ .addGauge(Interns.info(MIN_STORE_FILE_AGE, MIN_STORE_FILE_AGE_DESC),
+ rsWrap.getMinStoreFileAge())
+ .addGauge(Interns.info(AVG_STORE_FILE_AGE, AVG_STORE_FILE_AGE_DESC),
+ rsWrap.getAvgStoreFileAge())
+ .addGauge(Interns.info(NUM_REFERENCE_FILES, NUM_REFERENCE_FILES_DESC),
+ rsWrap.getNumReferenceFiles())
+ .addGauge(Interns.info(RS_START_TIME_NAME, RS_START_TIME_DESC), rsWrap.getStartCode())
+ .addGauge(Interns.info(AVERAGE_REGION_SIZE, AVERAGE_REGION_SIZE_DESC),
+ rsWrap.getAverageRegionSize())
+ .addGauge(Interns.info(STOREFILE_INDEX_SIZE, STOREFILE_INDEX_SIZE_DESC),
+ rsWrap.getStoreFileIndexSize())
+ .addGauge(Interns.info(STATIC_INDEX_SIZE, STATIC_INDEX_SIZE_DESC),
+ rsWrap.getTotalStaticIndexSize())
+ .addGauge(Interns.info(STATIC_BLOOM_SIZE, STATIC_BLOOM_SIZE_DESC),
+ rsWrap.getTotalStaticBloomSize())
+ .addGauge(Interns.info(NUMBER_OF_MUTATIONS_WITHOUT_WAL,
+ NUMBER_OF_MUTATIONS_WITHOUT_WAL_DESC), rsWrap.getNumMutationsWithoutWAL())
+ .addGauge(Interns.info(DATA_SIZE_WITHOUT_WAL, DATA_SIZE_WITHOUT_WAL_DESC),
+ rsWrap.getDataInMemoryWithoutWAL())
+ .addGauge(Interns.info(PERCENT_FILES_LOCAL, PERCENT_FILES_LOCAL_DESC),
+ rsWrap.getPercentFileLocal())
+ .addGauge(Interns.info(PERCENT_FILES_LOCAL_SECONDARY_REGIONS,
+ PERCENT_FILES_LOCAL_SECONDARY_REGIONS_DESC),
+ rsWrap.getPercentFileLocalSecondaryRegions())
+ .addGauge(Interns.info(SPLIT_QUEUE_LENGTH, SPLIT_QUEUE_LENGTH_DESC),
+ rsWrap.getSplitQueueSize())
+ .addGauge(Interns.info(COMPACTION_QUEUE_LENGTH, COMPACTION_QUEUE_LENGTH_DESC),
+ rsWrap.getCompactionQueueSize())
+ .addGauge(Interns.info(SMALL_COMPACTION_QUEUE_LENGTH,
+ SMALL_COMPACTION_QUEUE_LENGTH_DESC), rsWrap.getSmallCompactionQueueSize())
+ .addGauge(Interns.info(LARGE_COMPACTION_QUEUE_LENGTH,
+ LARGE_COMPACTION_QUEUE_LENGTH_DESC), rsWrap.getLargeCompactionQueueSize())
+ .addGauge(Interns.info(FLUSH_QUEUE_LENGTH, FLUSH_QUEUE_LENGTH_DESC),
+ rsWrap.getFlushQueueSize())
+ .addGauge(Interns.info(BLOCK_CACHE_FREE_SIZE, BLOCK_CACHE_FREE_DESC),
+ rsWrap.getBlockCacheFreeSize())
+ .addGauge(Interns.info(BLOCK_CACHE_COUNT, BLOCK_CACHE_COUNT_DESC),
+ rsWrap.getBlockCacheCount())
+ .addGauge(Interns.info(BLOCK_CACHE_SIZE, BLOCK_CACHE_SIZE_DESC),
+ rsWrap.getBlockCacheSize())
+ .addGauge(Interns.info(BLOCK_CACHE_HIT_PERCENT, BLOCK_CACHE_HIT_PERCENT_DESC),
+ rsWrap.getBlockCacheHitPercent())
+ .addGauge(Interns.info(BLOCK_CACHE_EXPRESS_HIT_PERCENT,
+ BLOCK_CACHE_EXPRESS_HIT_PERCENT_DESC), rsWrap.getBlockCacheHitCachingPercent())
+ .addGauge(Interns.info(L1_CACHE_HIT_COUNT, L1_CACHE_HIT_COUNT_DESC),
+ rsWrap.getL1CacheHitCount())
+ .addGauge(Interns.info(L1_CACHE_MISS_COUNT, L1_CACHE_MISS_COUNT_DESC),
+ rsWrap.getL1CacheMissCount())
+ .addGauge(Interns.info(L1_CACHE_HIT_RATIO, L1_CACHE_HIT_RATIO_DESC),
+ rsWrap.getL1CacheHitRatio())
+ .addGauge(Interns.info(L1_CACHE_MISS_RATIO, L1_CACHE_MISS_RATIO_DESC),
+ rsWrap.getL1CacheMissRatio())
+ .addGauge(Interns.info(L2_CACHE_HIT_COUNT, L2_CACHE_HIT_COUNT_DESC),
+ rsWrap.getL2CacheHitCount())
+ .addGauge(Interns.info(L2_CACHE_MISS_COUNT, L2_CACHE_MISS_COUNT_DESC),
+ rsWrap.getL2CacheMissCount())
+ .addGauge(Interns.info(L2_CACHE_HIT_RATIO, L2_CACHE_HIT_RATIO_DESC),
+ rsWrap.getL2CacheHitRatio())
+ .addGauge(Interns.info(L2_CACHE_MISS_RATIO, L2_CACHE_MISS_RATIO_DESC),
+ rsWrap.getL2CacheMissRatio())
+ .addGauge(Interns.info(MOB_FILE_CACHE_COUNT, MOB_FILE_CACHE_COUNT_DESC),
+ rsWrap.getMobFileCacheCount())
+ .addGauge(Interns.info(MOB_FILE_CACHE_HIT_PERCENT, MOB_FILE_CACHE_HIT_PERCENT_DESC),
+ rsWrap.getMobFileCacheHitPercent());
+ }
+
@Override
public void incInfoThresholdExceeded(int count) {
infoPauseThresholdExceeded.incr(count);
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java
index 8f11811..ff1f42d 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java
@@ -20,13 +20,13 @@ package org.apache.hadoop.hbase.regionserver;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.metrics.Interns;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.lib.DynamicMetricsRegistry;
import org.apache.hadoop.metrics2.lib.MutableFastCounter;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@InterfaceAudience.Private
public class MetricsRegionSourceImpl implements MetricsRegionSource {
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
index 588986e..dc91964 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
@@ -20,17 +20,17 @@ package org.apache.hadoop.hbase.regionserver;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.hbase.metrics.Interns;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@InterfaceAudience.Private
public class MetricsTableAggregateSourceImpl extends BaseSourceImpl
-implements MetricsTableAggregateSource {
+ implements MetricsTableAggregateSource {
private static final Logger LOG = LoggerFactory.getLogger(MetricsTableAggregateSourceImpl.class);
private ConcurrentHashMap<String, MetricsTableSource> tableSources = new ConcurrentHashMap<>();
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
index 2269d9a..37653cd 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
@@ -21,12 +21,12 @@ package org.apache.hadoop.hbase.regionserver;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.hadoop.hbase.TableName;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.metrics.Interns;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.lib.DynamicMetricsRegistry;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@InterfaceAudience.Private
public class MetricsTableSourceImpl implements MetricsTableSource {
@@ -156,9 +156,15 @@ public class MetricsTableSourceImpl implements MetricsTableSource {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- return (o instanceof MetricsTableSourceImpl && compareTo((MetricsTableSourceImpl) o) == 0);
+ if (this == o) {
+ return true;
+ }
+
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ return (compareTo((MetricsTableSourceImpl) o) == 0);
}
public MetricsTableWrapperAggregate getTableWrapper() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSourceImpl.java
index 0a62f4f..2f35d4c 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSourceImpl.java
@@ -18,17 +18,16 @@
package org.apache.hadoop.hbase.regionserver.wal;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.metrics2.MetricHistogram;
import org.apache.hadoop.metrics2.lib.MutableFastCounter;
-
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Class that transitions metrics from MetricsWAL into the metrics subsystem.
*
* Implements BaseSource through BaseSourceImpl, following the pattern.
- * @see org.apache.hadoop.hbase.regionserver.wal.MetricsWAL
+ * @see org.apache.hadoop.hbase.regionserver.wal.MetricsWALSource
*/
@InterfaceAudience.Private
public class MetricsWALSourceImpl extends BaseSourceImpl implements MetricsWALSource {
@@ -55,15 +54,15 @@ public class MetricsWALSourceImpl extends BaseSourceImpl implements MetricsWALSo
//Create and store the metrics that will be used.
appendTimeHisto = this.getMetricsRegistry().newTimeHistogram(APPEND_TIME, APPEND_TIME_DESC);
appendSizeHisto = this.getMetricsRegistry().newSizeHistogram(APPEND_SIZE, APPEND_SIZE_DESC);
- appendCount = this.getMetricsRegistry().newCounter(APPEND_COUNT, APPEND_COUNT_DESC, 0l);
+ appendCount = this.getMetricsRegistry().newCounter(APPEND_COUNT, APPEND_COUNT_DESC, 0L);
slowAppendCount =
- this.getMetricsRegistry().newCounter(SLOW_APPEND_COUNT, SLOW_APPEND_COUNT_DESC, 0l);
+ this.getMetricsRegistry().newCounter(SLOW_APPEND_COUNT, SLOW_APPEND_COUNT_DESC, 0L);
syncTimeHisto = this.getMetricsRegistry().newTimeHistogram(SYNC_TIME, SYNC_TIME_DESC);
logRollRequested =
this.getMetricsRegistry().newCounter(ROLL_REQUESTED, ROLL_REQUESTED_DESC, 0L);
lowReplicationLogRollRequested = this.getMetricsRegistry()
.newCounter(LOW_REPLICA_ROLL_REQUESTED, LOW_REPLICA_ROLL_REQUESTED_DESC, 0L);
- writtenBytes = this.getMetricsRegistry().newCounter(WRITTEN_BYTES, WRITTEN_BYTES_DESC, 0l);
+ writtenBytes = this.getMetricsRegistry().newCounter(WRITTEN_BYTES, WRITTEN_BYTES_DESC, 0L);
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java
index 5d18ccb..9a86cf2 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java
@@ -36,6 +36,10 @@ public class MetricsReplicationGlobalSourceSource implements MetricsReplicationS
private final MutableFastCounter shippedBatchesCounter;
private final MutableFastCounter shippedOpsCounter;
private final MutableFastCounter shippedBytesCounter;
+
+ /**
+ * @deprecated since 1.3.0. Use {@link #shippedBytesCounter} instead.
+ */
@Deprecated
private final MutableFastCounter shippedKBsCounter;
private final MutableFastCounter logReadInBytesCounter;
@@ -75,13 +79,16 @@ public class MetricsReplicationGlobalSourceSource implements MetricsReplicationS
sizeOfHFileRefsQueueGauge =
rms.getMetricsRegistry().getGauge(SOURCE_SIZE_OF_HFILE_REFS_QUEUE, 0L);
- unknownFileLengthForClosedWAL = rms.getMetricsRegistry().getCounter(SOURCE_CLOSED_LOGS_WITH_UNKNOWN_LENGTH, 0L);
+ unknownFileLengthForClosedWAL = rms.getMetricsRegistry()
+ .getCounter(SOURCE_CLOSED_LOGS_WITH_UNKNOWN_LENGTH, 0L);
uncleanlyClosedWAL = rms.getMetricsRegistry().getCounter(SOURCE_UNCLEANLY_CLOSED_LOGS, 0L);
- uncleanlyClosedSkippedBytes = rms.getMetricsRegistry().getCounter(SOURCE_UNCLEANLY_CLOSED_IGNORED_IN_BYTES, 0L);
+ uncleanlyClosedSkippedBytes = rms.getMetricsRegistry()
+ .getCounter(SOURCE_UNCLEANLY_CLOSED_IGNORED_IN_BYTES, 0L);
restartWALReading = rms.getMetricsRegistry().getCounter(SOURCE_RESTARTED_LOG_READING, 0L);
repeatedFileBytes = rms.getMetricsRegistry().getCounter(SOURCE_REPEATED_LOG_FILE_BYTES, 0L);
completedWAL = rms.getMetricsRegistry().getCounter(SOURCE_COMPLETED_LOGS, 0L);
- completedRecoveryQueue = rms.getMetricsRegistry().getCounter(SOURCE_COMPLETED_RECOVERY_QUEUES, 0L);
+ completedRecoveryQueue = rms.getMetricsRegistry()
+ .getCounter(SOURCE_COMPLETED_RECOVERY_QUEUES, 0L);
}
@Override public void setLastShippedAge(long age) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceImpl.java
index c6370c9..02045f8 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceImpl.java
@@ -18,8 +18,8 @@
package org.apache.hadoop.hbase.replication.regionserver;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Hadoop2 implementation of MetricsReplicationSource. This provides access to metrics gauges and
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java
index be62e3d..719c916 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java
@@ -35,6 +35,9 @@ public class MetricsReplicationSourceSourceImpl implements MetricsReplicationSou
private final String shippedOpsKey;
private String keyPrefix;
+ /**
+ * @deprecated since 1.3.0. Use {@link #shippedBytesKey} instead.
+ */
@Deprecated
private final String shippedKBsKey;
private final String shippedBytesKey;
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSourceImpl.java
index 0ea71d6..3474265 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSourceImpl.java
@@ -18,10 +18,10 @@
package org.apache.hadoop.hbase.rest;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.metrics2.MetricHistogram;
import org.apache.hadoop.metrics2.lib.MutableFastCounter;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Hadoop Two implementation of a metrics2 source that will export metrics from the Rest server to
@@ -31,7 +31,6 @@ import org.apache.hadoop.metrics2.lib.MutableFastCounter;
*/
@InterfaceAudience.Private
public class MetricsRESTSourceImpl extends BaseSourceImpl implements MetricsRESTSource {
-
private MutableFastCounter request;
private MutableFastCounter sucGet;
private MutableFastCounter sucPut;
@@ -74,20 +73,20 @@ public class MetricsRESTSourceImpl extends BaseSourceImpl implements MetricsREST
@Override
public void init() {
super.init();
- request = getMetricsRegistry().getCounter(REQUEST_KEY, 0l);
+ request = getMetricsRegistry().getCounter(REQUEST_KEY, 0L);
- sucGet = getMetricsRegistry().getCounter(SUCCESSFUL_GET_KEY, 0l);
- sucPut = getMetricsRegistry().getCounter(SUCCESSFUL_PUT_KEY, 0l);
- sucDel = getMetricsRegistry().getCounter(SUCCESSFUL_DELETE_KEY, 0l);
+ sucGet = getMetricsRegistry().getCounter(SUCCESSFUL_GET_KEY, 0L);
+ sucPut = getMetricsRegistry().getCounter(SUCCESSFUL_PUT_KEY, 0L);
+ sucDel = getMetricsRegistry().getCounter(SUCCESSFUL_DELETE_KEY, 0L);
sucScan = getMetricsRegistry().getCounter(SUCCESSFUL_SCAN_KEY, 0L);
- sucAppend = getMetricsRegistry().getCounter(SUCCESSFUL_APPEND_KEY, 0l);
+ sucAppend = getMetricsRegistry().getCounter(SUCCESSFUL_APPEND_KEY, 0L);
sucIncrement = getMetricsRegistry().getCounter(SUCCESSFUL_INCREMENT_KEY, 0L);
- fGet = getMetricsRegistry().getCounter(FAILED_GET_KEY, 0l);
- fPut = getMetricsRegistry().getCounter(FAILED_PUT_KEY, 0l);
- fDel = getMetricsRegistry().getCounter(FAILED_DELETE_KEY, 0l);
- fScan = getMetricsRegistry().getCounter(FAILED_SCAN_KEY, 0l);
- fAppend = getMetricsRegistry().getCounter(FAILED_APPEND_KEY, 0l);
+ fGet = getMetricsRegistry().getCounter(FAILED_GET_KEY, 0L);
+ fPut = getMetricsRegistry().getCounter(FAILED_PUT_KEY, 0L);
+ fDel = getMetricsRegistry().getCounter(FAILED_DELETE_KEY, 0L);
+ fScan = getMetricsRegistry().getCounter(FAILED_SCAN_KEY, 0L);
+ fAppend = getMetricsRegistry().getCounter(FAILED_APPEND_KEY, 0L);
fIncrement = getMetricsRegistry().getCounter(FAILED_INCREMENT_KEY, 0L);
}
@@ -133,7 +132,7 @@ public class MetricsRESTSourceImpl extends BaseSourceImpl implements MetricsREST
@Override
public void incrementFailedScanRequests(int inc) {
- fScan.incr(inc);
+ fScan.incr(inc);
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceImpl.java
index b819620..4ed974c 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceImpl.java
@@ -18,16 +18,15 @@
package org.apache.hadoop.hbase.thrift;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.hbase.metrics.ExceptionTrackingSourceImpl;
import org.apache.hadoop.metrics2.MetricHistogram;
import org.apache.hadoop.metrics2.lib.MutableFastCounter;
import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
import org.apache.hadoop.metrics2.lib.MutableHistogram;
+import org.apache.yetus.audience.InterfaceAudience;
/**
- * Hadoop 2 version of MetricsThriftServerSource{@link org.apache.hadoop.hbase.thrift.MetricsThriftServerSource}
+ * Hadoop 2 version of {@link org.apache.hadoop.hbase.thrift.MetricsThriftServerSource}
*
* Implements BaseSource through BaseSourceImpl, following the pattern
*/
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ea9263/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSourceImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSourceImpl.java
index cd66595..50ebd46 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSourceImpl.java
@@ -18,11 +18,11 @@
package org.apache.hadoop.hbase.zookeeper;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.metrics.BaseSourceImpl;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
import org.apache.hadoop.metrics2.lib.MutableHistogram;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Class that transitions metrics from MetricsZooKeeper into the metrics subsystem.
@@ -51,25 +51,38 @@ public class MetricsZooKeeperSourceImpl extends BaseSourceImpl implements Metric
this(METRICS_NAME, METRICS_DESCRIPTION, METRICS_CONTEXT, METRICS_JMX_CONTEXT);
}
- public MetricsZooKeeperSourceImpl(String metricsName, String metricsDescription, String metricsContext,
- String metricsJmxContext) {
+ public MetricsZooKeeperSourceImpl(String metricsName, String metricsDescription,
+ String metricsContext, String metricsJmxContext) {
super(metricsName, metricsDescription, metricsContext, metricsJmxContext);
//Create and store the metrics that will be used.
- authFailedFailedOpCount = this.getMetricsRegistry().newGauge(EXCEPTION_AUTHFAILED, EXCEPTION_AUTHFAILED_DESC, 0L);
- connectionLossFailedOpCount = this.getMetricsRegistry().newGauge(EXCEPTION_CONNECTIONLOSS, EXCEPTION_CONNECTIONLOSS_DESC, 0L);
- dataInconsistencyFailedOpCount = this.getMetricsRegistry().newGauge(EXCEPTION_DATAINCONSISTENCY, EXCEPTION_DATAINCONSISTENCY_DESC, 0L);
- invalidACLFailedOpCount = this.getMetricsRegistry().newGauge(EXCEPTION_INVALIDACL, EXCEPTION_INVALIDACL_DESC, 0L);
- noAuthFailedOpCount = this.getMetricsRegistry().newGauge(EXCEPTION_NOAUTH, EXCEPTION_NOAUTH_DESC, 0L);
- operationTimeOutFailedOpCount = this.getMetricsRegistry().newGauge(EXCEPTION_OPERATIONTIMEOUT, EXCEPTION_OPERATIONTIMEOUT_DESC, 0L);
- runtimeInconsistencyFailedOpCount = this.getMetricsRegistry().newGauge(EXCEPTION_RUNTIMEINCONSISTENCY, EXCEPTION_RUNTIMEINCONSISTENCY_DESC, 0L);
- sessionExpiredFailedOpCount = this.getMetricsRegistry().newGauge(EXCEPTION_SESSIONEXPIRED, EXCEPTION_SESSIONEXPIRED_DESC, 0L);
- systemErrorFailedOpCount = this.getMetricsRegistry().newGauge(EXCEPTION_SYSTEMERROR, EXCEPTION_SYSTEMERROR_DESC, 0L);
- totalFailedZKCalls = this.getMetricsRegistry().newGauge(TOTAL_FAILED_ZK_CALLS, TOTAL_FAILED_ZK_CALLS_DESC, 0L);
-
- readOpLatency = this.getMetricsRegistry().newHistogram(READ_OPERATION_LATENCY_NAME, READ_OPERATION_LATENCY_DESC);
- writeOpLatency = this.getMetricsRegistry().newHistogram(WRITE_OPERATION_LATENCY_NAME, WRITE_OPERATION_LATENCY_DESC);
- syncOpLatency = this.getMetricsRegistry().newHistogram(SYNC_OPERATION_LATENCY_NAME, SYNC_OPERATION_LATENCY_DESC);
+ authFailedFailedOpCount = this.getMetricsRegistry().newGauge(
+ EXCEPTION_AUTHFAILED, EXCEPTION_AUTHFAILED_DESC, 0L);
+ connectionLossFailedOpCount = this.getMetricsRegistry().newGauge(
+ EXCEPTION_CONNECTIONLOSS, EXCEPTION_CONNECTIONLOSS_DESC, 0L);
+ dataInconsistencyFailedOpCount = this.getMetricsRegistry().newGauge(
+ EXCEPTION_DATAINCONSISTENCY, EXCEPTION_DATAINCONSISTENCY_DESC, 0L);
+ invalidACLFailedOpCount = this.getMetricsRegistry().newGauge(
+ EXCEPTION_INVALIDACL, EXCEPTION_INVALIDACL_DESC, 0L);
+ noAuthFailedOpCount = this.getMetricsRegistry().newGauge(
+ EXCEPTION_NOAUTH, EXCEPTION_NOAUTH_DESC, 0L);
+ operationTimeOutFailedOpCount = this.getMetricsRegistry().newGauge(
+ EXCEPTION_OPERATIONTIMEOUT, EXCEPTION_OPERATIONTIMEOUT_DESC, 0L);
+ runtimeInconsistencyFailedOpCount = this.getMetricsRegistry().newGauge(
+ EXCEPTION_RUNTIMEINCONSISTENCY, EXCEPTION_RUNTIMEINCONSISTENCY_DESC, 0L);
+ sessionExpiredFailedOpCount = this.getMetricsRegistry().newGauge(
+ EXCEPTION_SESSIONEXPIRED, EXCEPTION_SESSIONEXPIRED_DESC, 0L);
+ systemErrorFailedOpCount = this.getMetricsRegistry().newGauge(
+ EXCEPTION_SYSTEMERROR, EXCEPTION_SYSTEMERROR_DESC, 0L);
+ totalFailedZKCalls = this.getMetricsRegistry().newGauge(
+ TOTAL_FAILED_ZK_CALLS, TOTAL_FAILED_ZK_CALLS_DESC, 0L);
+
+ readOpLatency = this.getMetricsRegistry().newHistogram(
+ READ_OPERATION_LATENCY_NAME, READ_OPERATION_LATENCY_DESC);
+ writeOpLatency = this.getMetricsRegistry().newHistogram(
+ WRITE_OPERATION_LATENCY_NAME, WRITE_OPERATION_LATENCY_DESC);
+ syncOpLatency = this.getMetricsRegistry().newHistogram(
+ SYNC_OPERATION_LATENCY_NAME, SYNC_OPERATION_LATENCY_DESC);
}
public void getMetrics(MetricsCollector metricsCollector, boolean all) {