You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2020/08/03 18:38:23 UTC
[hbase] branch master updated: HBASE-24767 Change default to false
for HBASE-15519 per-user metrics Set
hbase.regionserver.user.metrics.enabled default to false; i.e. off. (#2132)
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 21a0b8e HBASE-24767 Change default to false for HBASE-15519 per-user metrics Set hbase.regionserver.user.metrics.enabled default to false; i.e. off. (#2132)
21a0b8e is described below
commit 21a0b8ea114f448cdc898e30e25e3b8a3dd857a0
Author: Michael Stack <sa...@users.noreply.github.com>
AuthorDate: Mon Aug 3 11:36:19 2020 -0700
HBASE-24767 Change default to false for HBASE-15519 per-user metrics Set hbase.regionserver.user.metrics.enabled default to false; i.e. off. (#2132)
Signed-off-by: Viraj Jasani <vj...@apache.org>
Signed-off-by: Jan Hentschel <ja...@ultratendency.com>
---
.../hbase/regionserver/MetricsUserAggregateFactory.java | 2 +-
.../org/apache/hadoop/hbase/TestClientClusterMetrics.java | 6 ++++++
.../hbase/regionserver/TestMetricsUserAggregate.java | 14 ++++++++++++--
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsUserAggregateFactory.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsUserAggregateFactory.java
index 38e440b..f766e91 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsUserAggregateFactory.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsUserAggregateFactory.java
@@ -28,7 +28,7 @@ public class MetricsUserAggregateFactory {
}
public static final String METRIC_USER_ENABLED_CONF = "hbase.regionserver.user.metrics.enabled";
- public static final boolean DEFAULT_METRIC_USER_ENABLED_CONF = true;
+ public static final boolean DEFAULT_METRIC_USER_ENABLED_CONF = false;
public static MetricsUserAggregate getMetricsUserAggregate(Configuration conf) {
if (conf.getBoolean(METRIC_USER_ENABLED_CONF, DEFAULT_METRIC_USER_ENABLED_CONF)) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterMetrics.java
index dd3bc73..b578ffe 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterMetrics.java
@@ -50,6 +50,7 @@ import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.filter.FilterAllFilter;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
+import org.apache.hadoop.hbase.regionserver.MetricsUserAggregateFactory;
import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.hbase.security.UserProvider;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -306,6 +307,11 @@ public class TestClientClusterMetrics {
@Test public void testUserMetrics() throws Exception {
Configuration conf = UTIL.getConfiguration();
+ // If metrics for users is not enabled, this test doesn't make sense.
+ if (!conf.getBoolean(MetricsUserAggregateFactory.METRIC_USER_ENABLED_CONF,
+ MetricsUserAggregateFactory.DEFAULT_METRIC_USER_ENABLED_CONF)) {
+ return;
+ }
User userFoo = User.createUserForTesting(conf, "FOO_USER_METRIC_TEST", new String[0]);
User userBar = User.createUserForTesting(conf, "BAR_USER_METRIC_TEST", new String[0]);
User userTest = User.createUserForTesting(conf, "TEST_USER_METRIC_TEST", new String[0]);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsUserAggregate.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsUserAggregate.java
index 645c7f2..501ca72 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsUserAggregate.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsUserAggregate.java
@@ -47,7 +47,7 @@ public class TestMetricsUserAggregate {
private MetricsRegionServerWrapperStub wrapper;
private MetricsRegionServer rsm;
- private MetricsUserAggregateImpl userAgg;
+ private MetricsUserAggregate userAgg;
private TableName tableName = TableName.valueOf("testUserAggregateMetrics");
@BeforeClass
@@ -60,7 +60,7 @@ public class TestMetricsUserAggregate {
wrapper = new MetricsRegionServerWrapperStub();
Configuration conf = HBaseConfiguration.create();
rsm = new MetricsRegionServer(wrapper,conf , null);
- userAgg = (MetricsUserAggregateImpl)rsm.getMetricsUserAggregate();
+ userAgg = (MetricsUserAggregate)rsm.getMetricsUserAggregate();
}
private void doOperations() {
@@ -90,6 +90,11 @@ public class TestMetricsUserAggregate {
@Test
public void testPerUserOperations() {
Configuration conf = HBaseConfiguration.create();
+ // If metrics for users is not enabled, this test doesn't make sense.
+ if (!conf.getBoolean(MetricsUserAggregateFactory.METRIC_USER_ENABLED_CONF,
+ MetricsUserAggregateFactory.DEFAULT_METRIC_USER_ENABLED_CONF)) {
+ return;
+ }
User userFoo = User.createUserForTesting(conf, "FOO", new String[0]);
User userBar = User.createUserForTesting(conf, "BAR", new String[0]);
@@ -128,6 +133,11 @@ public class TestMetricsUserAggregate {
@Test public void testLossyCountingOfUserMetrics() {
Configuration conf = HBaseConfiguration.create();
+ // If metrics for users is not enabled, this test doesn't make sense.
+ if (!conf.getBoolean(MetricsUserAggregateFactory.METRIC_USER_ENABLED_CONF,
+ MetricsUserAggregateFactory.DEFAULT_METRIC_USER_ENABLED_CONF)) {
+ return;
+ }
int noOfUsers = 10000;
for (int i = 1; i <= noOfUsers; i++) {
User.createUserForTesting(conf, "FOO" + i, new String[0]).getUGI()