From commits-return-94751-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Mon Aug 3 18:37:53 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id E867F180642 for ; Mon, 3 Aug 2020 20:37:52 +0200 (CEST) Received: from mail.apache.org (localhost [127.0.0.1]) by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id 15DD0124317 for ; Mon, 3 Aug 2020 18:37:52 +0000 (UTC) Received: (qmail 19868 invoked by uid 500); 3 Aug 2020 18:37:51 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 19855 invoked by uid 99); 3 Aug 2020 18:37:51 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Aug 2020 18:37:51 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A5F568242E; Mon, 3 Aug 2020 18:37:51 +0000 (UTC) Date: Mon, 03 Aug 2020 18:37:50 +0000 To: "commits@hbase.apache.org" Subject: [hbase] branch branch-2.3 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) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <159647986946.27943.12561479005234966610@gitbox.apache.org> From: stack@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: hbase X-Git-Refname: refs/heads/branch-2.3 X-Git-Reftype: branch X-Git-Oldrev: 94a03d7ae2ba2986fd359720704b88808d50f623 X-Git-Newrev: 18d190a7e33a5f5d01e0aecb496b62832699edcf X-Git-Rev: 18d190a7e33a5f5d01e0aecb496b62832699edcf X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. stack pushed a commit to branch branch-2.3 in repository https://gitbox.apache.org/repos/asf/hbase.git The following commit(s) were added to refs/heads/branch-2.3 by this push: new 18d190a 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) 18d190a is described below commit 18d190a7e33a5f5d01e0aecb496b62832699edcf Author: Michael Stack 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 Signed-off-by: Jan Hentschel --- .../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 b0e3991..c62424e 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 @@ -49,6 +49,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; @@ -251,6 +252,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()