From 13e11a46c6e37cba63d951e2739f3e8a42aa7ee6 Mon Sep 17 00:00:00 2001 From: tianhang Date: Wed, 8 Mar 2023 22:30:22 +0800 Subject: [PATCH] HBASE-27681 Addendum delete old metric classes (#5092) Signed-off-by: Duo Zhang Signed-off-by: Bryan Beaudreault --- .../regionserver/MetricsTableLatencies.java | 145 ------------ .../MetricsTableLatenciesImpl.java | 216 ------------------ ...p.hbase.regionserver.MetricsTableLatencies | 17 -- 3 files changed, 378 deletions(-) delete mode 100644 hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableLatencies.java delete mode 100644 hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableLatenciesImpl.java delete mode 100644 hbase-hadoop-compat/src/main/resources/META-INF/services/org.apache.hadoop.hbase.regionserver.MetricsTableLatencies diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableLatencies.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableLatencies.java deleted file mode 100644 index e7d447aef49..00000000000 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableLatencies.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * 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.hadoop.hbase.regionserver; - -import org.apache.yetus.audience.InterfaceAudience; - -/** - * Latency metrics for a specific table in a RegionServer. - */ -@InterfaceAudience.Private -public interface MetricsTableLatencies { - - /** - * The name of the metrics - */ - String METRICS_NAME = "TableLatencies"; - - /** - * The name of the metrics context that metrics will be under. - */ - String METRICS_CONTEXT = "regionserver"; - - /** - * Description - */ - String METRICS_DESCRIPTION = "Metrics about Tables on a single HBase RegionServer"; - - /** - * The name of the metrics context that metrics will be under in jmx - */ - String METRICS_JMX_CONTEXT = "RegionServer,sub=" + METRICS_NAME; - - String GET_TIME = "getTime"; - String SCAN_TIME = "scanTime"; - String SCAN_SIZE = "scanSize"; - String PUT_TIME = "putTime"; - String PUT_BATCH_TIME = "putBatchTime"; - String DELETE_TIME = "deleteTime"; - String DELETE_BATCH_TIME = "deleteBatchTime"; - String INCREMENT_TIME = "incrementTime"; - String APPEND_TIME = "appendTime"; - String CHECK_AND_DELETE_TIME = "checkAndDeleteTime"; - String CHECK_AND_PUT_TIME = "checkAndPutTime"; - String CHECK_AND_MUTATE_TIME = "checkAndMutateTime"; - - /** - * Update the Put time histogram - * @param tableName The table the metric is for - * @param t time it took - */ - void updatePut(String tableName, long t); - - /** - * Update the batch Put time histogram - * @param tableName The table the metric is for - * @param t time it took - */ - void updatePutBatch(String tableName, long t); - - /** - * Update the Delete time histogram - * @param tableName The table the metric is for - * @param t time it took - */ - void updateDelete(String tableName, long t); - - /** - * Update the batch Delete time histogram - * @param tableName The table the metric is for - * @param t time it took - */ - void updateDeleteBatch(String tableName, long t); - - /** - * Update the Get time histogram . - * @param tableName The table the metric is for - * @param t time it took - */ - void updateGet(String tableName, long t); - - /** - * Update the Increment time histogram. - * @param tableName The table the metric is for - * @param t time it took - */ - void updateIncrement(String tableName, long t); - - /** - * Update the Append time histogram. - * @param tableName The table the metric is for - * @param t time it took - */ - void updateAppend(String tableName, long t); - - /** - * Update the scan size. - * @param tableName The table the metric is for - * @param scanSize size of the scan - */ - void updateScanSize(String tableName, long scanSize); - - /** - * Update the scan time. - * @param tableName The table the metric is for - * @param t time it took - */ - void updateScanTime(String tableName, long t); - - /** - * Update the CheckAndDelete time histogram. - * @param nameAsString The table the metric is for - * @param time time it took - */ - void updateCheckAndDelete(String nameAsString, long time); - - /** - * Update the CheckAndPut time histogram. - * @param nameAsString The table the metric is for - * @param time time it took - */ - void updateCheckAndPut(String nameAsString, long time); - - /** - * Update the CheckAndMutate time histogram. - * @param nameAsString The table the metric is for - * @param time time it took - */ - void updateCheckAndMutate(String nameAsString, long time); - -} diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableLatenciesImpl.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableLatenciesImpl.java deleted file mode 100644 index 1c90b33d5d4..00000000000 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableLatenciesImpl.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * 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.hadoop.hbase.regionserver; - -import java.util.HashMap; -import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.metrics.BaseSourceImpl; -import org.apache.hadoop.metrics2.MetricHistogram; -import org.apache.hadoop.metrics2.MetricsCollector; -import org.apache.hadoop.metrics2.MetricsRecordBuilder; -import org.apache.hadoop.metrics2.lib.DynamicMetricsRegistry; -import org.apache.yetus.audience.InterfaceAudience; - -/** - * Implementation of {@link MetricsTableLatencies} to track latencies for one table in a - * RegionServer. - */ -@InterfaceAudience.Private -public class MetricsTableLatenciesImpl extends BaseSourceImpl implements MetricsTableLatencies { - - private final HashMap histogramsByTable = new HashMap<>(); - - public static class TableHistograms { - final MetricHistogram getTimeHisto; - final MetricHistogram incrementTimeHisto; - final MetricHistogram appendTimeHisto; - final MetricHistogram putTimeHisto; - final MetricHistogram putBatchTimeHisto; - final MetricHistogram deleteTimeHisto; - final MetricHistogram deleteBatchTimeHisto; - final MetricHistogram scanTimeHisto; - final MetricHistogram scanSizeHisto; - final MetricHistogram checkAndDeleteTimeHisto; - final MetricHistogram checkAndPutTimeHisto; - final MetricHistogram checkAndMutateTimeHisto; - - TableHistograms(DynamicMetricsRegistry registry, TableName tn) { - getTimeHisto = registry.newTimeHistogram(qualifyMetricsName(tn, GET_TIME)); - incrementTimeHisto = registry.newTimeHistogram(qualifyMetricsName(tn, INCREMENT_TIME)); - appendTimeHisto = registry.newTimeHistogram(qualifyMetricsName(tn, APPEND_TIME)); - putTimeHisto = registry.newTimeHistogram(qualifyMetricsName(tn, PUT_TIME)); - putBatchTimeHisto = registry.newTimeHistogram(qualifyMetricsName(tn, PUT_BATCH_TIME)); - deleteTimeHisto = registry.newTimeHistogram(qualifyMetricsName(tn, DELETE_TIME)); - deleteBatchTimeHisto = registry.newTimeHistogram(qualifyMetricsName(tn, DELETE_BATCH_TIME)); - scanTimeHisto = registry.newTimeHistogram(qualifyMetricsName(tn, SCAN_TIME)); - scanSizeHisto = registry.newSizeHistogram(qualifyMetricsName(tn, SCAN_SIZE)); - checkAndDeleteTimeHisto = - registry.newTimeHistogram(qualifyMetricsName(tn, CHECK_AND_DELETE_TIME)); - checkAndPutTimeHisto = registry.newTimeHistogram(qualifyMetricsName(tn, CHECK_AND_PUT_TIME)); - checkAndMutateTimeHisto = - registry.newTimeHistogram(qualifyMetricsName(tn, CHECK_AND_MUTATE_TIME)); - } - - public void updatePut(long time) { - putTimeHisto.add(time); - } - - public void updatePutBatch(long time) { - putBatchTimeHisto.add(time); - } - - public void updateDelete(long t) { - deleteTimeHisto.add(t); - } - - public void updateDeleteBatch(long t) { - deleteBatchTimeHisto.add(t); - } - - public void updateGet(long t) { - getTimeHisto.add(t); - } - - public void updateIncrement(long t) { - incrementTimeHisto.add(t); - } - - public void updateAppend(long t) { - appendTimeHisto.add(t); - } - - public void updateScanSize(long scanSize) { - scanSizeHisto.add(scanSize); - } - - public void updateScanTime(long t) { - scanTimeHisto.add(t); - } - - public void updateCheckAndDeleteTime(long t) { - checkAndDeleteTimeHisto.add(t); - } - - public void updateCheckAndPutTime(long t) { - checkAndPutTimeHisto.add(t); - } - - public void updateCheckAndMutateTime(long t) { - checkAndMutateTimeHisto.add(t); - } - } - - public static String qualifyMetricsName(TableName tableName, String metric) { - StringBuilder sb = new StringBuilder(); - sb.append("Namespace_").append(tableName.getNamespaceAsString()); - sb.append("_table_").append(tableName.getQualifierAsString()); - sb.append("_metric_").append(metric); - return sb.toString(); - } - - public TableHistograms getOrCreateTableHistogram(String tableName) { - // TODO Java8's ConcurrentHashMap#computeIfAbsent would be stellar instead - final TableName tn = TableName.valueOf(tableName); - TableHistograms latency = histogramsByTable.get(tn); - if (latency == null) { - latency = new TableHistograms(getMetricsRegistry(), tn); - histogramsByTable.put(tn, latency); - } - return latency; - } - - public MetricsTableLatenciesImpl() { - this(METRICS_NAME, METRICS_DESCRIPTION, METRICS_CONTEXT, METRICS_JMX_CONTEXT); - } - - public MetricsTableLatenciesImpl(String metricsName, String metricsDescription, - String metricsContext, String metricsJmxContext) { - super(metricsName, metricsDescription, metricsContext, metricsJmxContext); - } - - @Override - public void updatePut(String tableName, long t) { - getOrCreateTableHistogram(tableName).updatePut(t); - } - - @Override - public void updatePutBatch(String tableName, long t) { - getOrCreateTableHistogram(tableName).updatePutBatch(t); - } - - @Override - public void updateDelete(String tableName, long t) { - getOrCreateTableHistogram(tableName).updateDelete(t); - } - - @Override - public void updateDeleteBatch(String tableName, long t) { - getOrCreateTableHistogram(tableName).updateDeleteBatch(t); - } - - @Override - public void updateGet(String tableName, long t) { - getOrCreateTableHistogram(tableName).updateGet(t); - } - - @Override - public void updateIncrement(String tableName, long t) { - getOrCreateTableHistogram(tableName).updateIncrement(t); - } - - @Override - public void updateAppend(String tableName, long t) { - getOrCreateTableHistogram(tableName).updateAppend(t); - } - - @Override - public void updateScanSize(String tableName, long scanSize) { - getOrCreateTableHistogram(tableName).updateScanSize(scanSize); - } - - @Override - public void updateScanTime(String tableName, long t) { - getOrCreateTableHistogram(tableName).updateScanTime(t); - } - - @Override - public void updateCheckAndDelete(String tableName, long time) { - getOrCreateTableHistogram(tableName).updateCheckAndDeleteTime(time); - } - - @Override - public void updateCheckAndPut(String tableName, long time) { - getOrCreateTableHistogram(tableName).updateCheckAndPutTime(time); - } - - @Override - public void updateCheckAndMutate(String tableName, long time) { - getOrCreateTableHistogram(tableName).updateCheckAndMutateTime(time); - } - - @Override - public void getMetrics(MetricsCollector metricsCollector, boolean all) { - MetricsRecordBuilder mrb = metricsCollector.addRecord(metricsName); - // source is registered in supers constructor, sometimes called before the whole initialization. - metricsRegistry.snapshot(mrb, all); - if (metricsAdapter != null) { - // snapshot MetricRegistry as well - metricsAdapter.snapshotAllMetrics(registry, mrb); - } - } -} diff --git a/hbase-hadoop-compat/src/main/resources/META-INF/services/org.apache.hadoop.hbase.regionserver.MetricsTableLatencies b/hbase-hadoop-compat/src/main/resources/META-INF/services/org.apache.hadoop.hbase.regionserver.MetricsTableLatencies deleted file mode 100644 index c0aea237265..00000000000 --- a/hbase-hadoop-compat/src/main/resources/META-INF/services/org.apache.hadoop.hbase.regionserver.MetricsTableLatencies +++ /dev/null @@ -1,17 +0,0 @@ -# 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. -org.apache.hadoop.hbase.regionserver.MetricsTableLatenciesImpl \ No newline at end of file