Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <vjasani@apache.org>
Signed-off-by: Jan Hentschel <jan.hentschel@ultratendency.com>
This commit is contained in:
Michael Stack 2020-08-03 11:36:19 -07:00 committed by GitHub
parent 8b1c86a54d
commit 86d2e37bc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsUserAggregateFactory.java
View File

@ -28,7 +28,7 @@ public class MetricsUserAggregateFactory {
} }
public static final String METRIC_USER_ENABLED_CONF = "hbase.regionserver.user.metrics.enabled"; 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) { public static MetricsUserAggregate getMetricsUserAggregate(Configuration conf) {
if (conf.getBoolean(METRIC_USER_ENABLED_CONF, DEFAULT_METRIC_USER_ENABLED_CONF)) { if (conf.getBoolean(METRIC_USER_ENABLED_CONF, DEFAULT_METRIC_USER_ENABLED_CONF)) {

6
hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterMetrics.java
View File

@ -49,6 +49,7 @@ import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.filter.FilterAllFilter; import org.apache.hadoop.hbase.filter.FilterAllFilter;
import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.regionserver.HRegionServer; 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.User;
import org.apache.hadoop.hbase.security.UserProvider; import org.apache.hadoop.hbase.security.UserProvider;
import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.MediumTests;
@ -251,6 +252,11 @@ public class TestClientClusterMetrics {
@Test public void testUserMetrics() throws Exception { @Test public void testUserMetrics() throws Exception {
Configuration conf = UTIL.getConfiguration(); 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 userFoo = User.createUserForTesting(conf, "FOO_USER_METRIC_TEST", new String[0]);
User userBar = User.createUserForTesting(conf, "BAR_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]); User userTest = User.createUserForTesting(conf, "TEST_USER_METRIC_TEST", new String[0]);

14
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsUserAggregate.java
View File

@ -47,7 +47,7 @@ public class TestMetricsUserAggregate {
private MetricsRegionServerWrapperStub wrapper; private MetricsRegionServerWrapperStub wrapper;
private MetricsRegionServer rsm; private MetricsRegionServer rsm;
private MetricsUserAggregateImpl userAgg; private MetricsUserAggregate userAgg;
private TableName tableName = TableName.valueOf("testUserAggregateMetrics"); private TableName tableName = TableName.valueOf("testUserAggregateMetrics");
@BeforeClass @BeforeClass
@ -60,7 +60,7 @@ public class TestMetricsUserAggregate {
wrapper = new MetricsRegionServerWrapperStub(); wrapper = new MetricsRegionServerWrapperStub();
Configuration conf = HBaseConfiguration.create(); Configuration conf = HBaseConfiguration.create();
rsm = new MetricsRegionServer(wrapper,conf , null); rsm = new MetricsRegionServer(wrapper,conf , null);
userAgg = (MetricsUserAggregateImpl)rsm.getMetricsUserAggregate(); userAgg = (MetricsUserAggregate)rsm.getMetricsUserAggregate();
} }
private void doOperations() { private void doOperations() {
@ -90,6 +90,11 @@ public class TestMetricsUserAggregate {
@Test @Test
public void testPerUserOperations() { public void testPerUserOperations() {
Configuration conf = HBaseConfiguration.create(); 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 userFoo = User.createUserForTesting(conf, "FOO", new String[0]);
User userBar = User.createUserForTesting(conf, "BAR", new String[0]); User userBar = User.createUserForTesting(conf, "BAR", new String[0]);
@ -128,6 +133,11 @@ public class TestMetricsUserAggregate {
@Test public void testLossyCountingOfUserMetrics() { @Test public void testLossyCountingOfUserMetrics() {
Configuration conf = HBaseConfiguration.create(); 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; int noOfUsers = 10000;
for (int i = 1; i <= noOfUsers; i++) { for (int i = 1; i <= noOfUsers; i++) {
User.createUserForTesting(conf, "FOO" + i, new String[0]).getUGI() User.createUserForTesting(conf, "FOO" + i, new String[0]).getUGI()