This is an automated email from the ASF dual-hosted git repository.
ramkrishna pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 0ebc96e porting HBASE-24199 to 2.1 branches (#1732)
0ebc96e is described below
commit 0ebc96e0491dde1aed25f7a5f7ba1df5ed2042c5
Author: gkanade <gaurav.kan...@gmail.com>
AuthorDate: Tue May 19 10:14:24 2020 +0530
porting HBASE-24199 to 2.1 branches (#1732)
Signed-off-by: Ramkrishna <ramkris...@apache.org>
---
.../hbase/master/MetricsAssignmentManagerSourceImpl.java | 11 +++++++++++
.../hadoop/hbase/master/MetricsMasterProcSourceImpl.java | 3 +++
.../apache/hadoop/hbase/master/MetricsMasterSourceImpl.java | 3 +++
.../hadoop/hbase/master/TestAssignmentManagerMetrics.java | 2 ++
.../org/apache/hadoop/hbase/master/TestMasterMetrics.java | 3 +++
5 files changed, 22 insertions(+)
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 e8ab7d7..012f311 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
@@ -21,6 +21,8 @@ package org.apache.hadoop.hbase.master;
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.MetricsCollector;
+import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.lib.MutableFastCounter;
import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
import org.apache.yetus.audience.InterfaceAudience;
@@ -115,4 +117,13 @@ public class MetricsAssignmentManagerSourceImpl
public OperationMetrics getMergeMetrics() {
return mergeMetrics;
}
+
+ @Override
+ public void getMetrics(MetricsCollector metricsCollector, boolean all) {
+ MetricsRecordBuilder metricsRecordBuilder =
metricsCollector.addRecord(metricsName);
+ metricsRegistry.snapshot(metricsRecordBuilder, all);
+ if(metricsAdapter != null) {
+ metricsAdapter.snapshotAllMetrics(registry, metricsRecordBuilder);
+ }
+ }
}
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 c51cd10..69e7d79 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
@@ -70,6 +70,9 @@ public class MetricsMasterProcSourceImpl
}
metricsRegistry.snapshot(metricsRecordBuilder, all);
+ if(metricsAdapter != null) {
+ metricsAdapter.snapshotAllMetrics(registry, metricsRecordBuilder);
+ }
}
}
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 5b78fe8..0437b85 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
@@ -116,6 +116,9 @@ public class MetricsMasterSourceImpl
}
metricsRegistry.snapshot(metricsRecordBuilder, all);
+ if(metricsAdapter != null) {
+ metricsAdapter.snapshotAllMetrics(registry, metricsRecordBuilder);
+ }
}
@Override
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java
index 7c338cd..66c0ee4 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java
@@ -160,6 +160,8 @@ public class TestAssignmentManagerMetrics {
METRICS_HELPER.assertGauge(MetricsAssignmentManagerSource.RIT_COUNT_NAME, 1,
amSource);
METRICS_HELPER.assertGauge(MetricsAssignmentManagerSource.RIT_COUNT_OVER_THRESHOLD_NAME,
1,
amSource);
+
METRICS_HELPER.assertCounter(MetricsAssignmentManagerSource.ASSIGN_METRIC_PREFIX
+ + "SubmittedCount", 2, amSource);
}
}
}
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
index 1d2e4a8..72d2cce 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
@@ -143,6 +143,9 @@ public class TestMasterMetrics {
metricsHelper.assertTag("serverName", master.getServerName().toString(),
masterSource);
metricsHelper.assertTag("clusterId", master.getClusterId(), masterSource);
metricsHelper.assertTag("zookeeperQuorum",
master.getZooKeeper().getQuorum(), masterSource);
+
+
metricsHelper.assertCounter(MetricsMasterSource.SERVER_CRASH_METRIC_PREFIX+"SubmittedCount",
0,
+ masterSource);
}
@Test
