sanjeet006py commented on code in PR #2169: URL: https://github.com/apache/phoenix/pull/2169#discussion_r2143120355
########## phoenix-core/src/it/java/org/apache/phoenix/monitoring/CQSIThreadPoolMetricsIT.java: ########## @@ -0,0 +1,250 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.phoenix.monitoring; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest; +import org.apache.phoenix.jdbc.AbstractRPCConnectionInfo; +import org.apache.phoenix.jdbc.ConnectionInfo; +import org.apache.phoenix.jdbc.ZKConnectionInfo; +import org.apache.phoenix.query.ConfigurationFactory; +import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.util.InstanceResolver; +import org.apache.phoenix.util.PhoenixRuntime; +import org.apache.phoenix.util.QueryUtil; +import org.apache.phoenix.util.ReadOnlyProps; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import static org.apache.phoenix.jdbc.ConnectionInfo.CLIENT_CONNECTION_REGISTRY_IMPL_CONF_KEY; +import static org.apache.phoenix.query.QueryServices.CQSI_THREAD_POOL_ENABLED; +import static org.apache.phoenix.query.QueryServices.CQSI_THREAD_POOL_METRICS_ENABLED; +import static org.apache.phoenix.query.QueryServicesOptions.DEFAULT_QUERY_SERVICES_NAME; + +@Category(NeedsOwnMiniClusterTest.class) +@RunWith(Parameterized.class) +public class CQSIThreadPoolMetricsIT extends BaseHTableThreadPoolMetricsIT { + + private final String registryClassName; + private final Properties props = new Properties(); + + public CQSIThreadPoolMetricsIT(String registryClassName) { + this.registryClassName = registryClassName; + } + + @BeforeClass + public static void setUp() throws Exception { + final Configuration conf = HBaseConfiguration.create(); + setUpConfigForMiniCluster(conf); + conf.setBoolean(CQSI_THREAD_POOL_METRICS_ENABLED, true); + conf.setBoolean(CQSI_THREAD_POOL_ENABLED, true); + + InstanceResolver.clearSingletons(); + // Override to get required config for static fields loaded that require HBase config + InstanceResolver.getSingleton(ConfigurationFactory.class, new ConfigurationFactory() { + + @Override public Configuration getConfiguration() { + return conf; + } + + @Override public Configuration getConfiguration(Configuration confToClone) { + Configuration copy = new Configuration(conf); + copy.addResource(confToClone); + return copy; + } + }); + + Map<String, String> props = new HashMap<>(); + props.put(QueryServices.TESTS_MINI_CLUSTER_NUM_MASTERS, "2"); + setUpTestDriver(new ReadOnlyProps(props)); + } + + @Before + public void testCaseSetup() { + props.setProperty(CLIENT_CONNECTION_REGISTRY_IMPL_CONF_KEY, registryClassName); + } + + @After + public void cleanup() throws Exception { + driver.cleanUpCQSICache(); + HTableThreadPoolMetricsManager.clearHTableThreadPoolHistograms(); + props.clear(); + } + + @Parameterized.Parameters(name = "ExternalHTableThreadPoolMetricsIT_registryClassName={0}") + public synchronized static Collection<String> data() { + return Arrays.asList(ZKConnectionInfo.ZK_REGISTRY_NAME, + "org.apache.hadoop.hbase.client.RpcConnectionRegistry", + "org.apache.hadoop.hbase.client.MasterRegistry"); + } + + @Test + public void testHistogramsPerConnInfo() throws Exception { + String tableName = generateUniqueName(); + String histogramKey; + String cqsiNameService1 = "service1"; + String cqsiNameService2 = "service2"; + + // Create a connection for "service1" connection profile + String url = QueryUtil.getConnectionUrl(props, utility.getConfiguration(), + cqsiNameService1); + Map<String, List<HistogramDistribution>> htableThreadPoolHistograms; + try (Connection conn = driver.connect(url, props)) { + createTableAndUpsertData(conn, tableName); + + htableThreadPoolHistograms = runQueryAndGetHistograms(conn, tableName); + + histogramKey = getHistogramKey(url); + assertHTableThreadPoolUsed(htableThreadPoolHistograms, histogramKey); + Map<String, String> expectedTagKeyValues = getExpectedTagKeyValues(url, + cqsiNameService1); + assertHistogramTags(htableThreadPoolHistograms, expectedTagKeyValues, histogramKey); + } + + // Create a connection for "service2" connection profile + url = QueryUtil.getConnectionUrl(props, utility.getConfiguration(), cqsiNameService2); + htableThreadPoolHistograms = PhoenixRuntime.getHTableThreadPoolHistograms(); + // Assert that HTableThreadPoolHistograms for service2 is not there yet + Assert.assertNull(htableThreadPoolHistograms.get(getHistogramKey(url))); + try (Connection conn = driver.connect(url, props)) { + htableThreadPoolHistograms = runQueryAndGetHistograms(conn, tableName); + + assertHTableThreadPoolNotUsed(htableThreadPoolHistograms, histogramKey); + Map<String, String> expectedTagKeyValues = getExpectedTagKeyValues(url, + cqsiNameService1); + assertHistogramTags(htableThreadPoolHistograms, expectedTagKeyValues, histogramKey); Review Comment: Yes, I am asserting on old tags to make sure they are still there in histogram correponding to `service1`. I wanted to check this to make sure using new CQSI instance with new principal is not messing up old tags of old principal. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@phoenix.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
