-
Notifications
You must be signed in to change notification settings - Fork 590
HDDS-7282. Add EstimatedKeyCount metrics for SCM DB #3791
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
49115bd
HDDS-7282. Add EstimatedKeyCount metrics for SCM DB
symious cbe1ab7
HDDS-7282. unregister MxBean
symious 4b38b9c
HDDS-7282. Apply metrics for each column family
symious 85864fd
HDDS-7282. Use StoreImpl.getTableMap for iteration
symious fac5d74
HDDS-7282. Cache the cf on creation
symious 6bff98c
trigger new CI check
symious 1f721c3
HDDS-7282. Remove getEstimatedKeyCountStr
symious 3583df5
HDDS-7282. Fix crash caused by metrics
symious 292cd9d
HDDS-7282. Fix checkstyle and findbugs
symious e7b88da
HDDS-7282. Synchronized unregister
symious File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
...server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMMetadataStoreMetrics.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| /* | ||
| * 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 | ||
| * <p/> | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p/> | ||
| * 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.hdds.scm.metadata; | ||
|
|
||
| import com.google.gson.Gson; | ||
| import org.apache.commons.text.WordUtils; | ||
| import org.apache.hadoop.metrics2.MetricsCollector; | ||
| import org.apache.hadoop.metrics2.MetricsInfo; | ||
| import org.apache.hadoop.metrics2.MetricsRecordBuilder; | ||
| import org.apache.hadoop.metrics2.MetricsSource; | ||
| import org.apache.hadoop.metrics2.annotation.Metrics; | ||
| import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; | ||
| import org.apache.hadoop.metrics2.lib.MetricsRegistry; | ||
| import org.apache.hadoop.ozone.OzoneConsts; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static org.apache.hadoop.metrics2.lib.Interns.info; | ||
|
|
||
| /** | ||
| * Class contains metrics related to SCM Metadata Store. | ||
| */ | ||
| @Metrics(about = "SCM Metadata Store Metrics", context = OzoneConsts.OZONE) | ||
| public final class SCMMetadataStoreMetrics implements MetricsSource { | ||
|
|
||
| private static final Logger LOG = | ||
| LoggerFactory.getLogger(SCMMetadataStoreMetrics.class); | ||
|
|
||
| public static final String METRICS_SOURCE_NAME = | ||
| SCMMetadataStoreMetrics.class.getSimpleName(); | ||
|
|
||
| private static final MetricsInfo ESTIMATED_KEY_COUNT = info( | ||
| "EstimatedKeyCount", | ||
| "Tracked estimated key count of all column families"); | ||
|
|
||
| private MetricsRegistry registry; | ||
| private static SCMMetadataStoreMetrics instance; | ||
|
|
||
| private SCMMetadataStoreImpl scmMetadataStore; | ||
|
|
||
| private Map<String, MetricsInfo> columnFamilyMetrics; | ||
|
|
||
| public SCMMetadataStoreMetrics(SCMMetadataStoreImpl scmMetadataStoreImpl) { | ||
| this.registry = new MetricsRegistry(METRICS_SOURCE_NAME); | ||
| this.scmMetadataStore = scmMetadataStoreImpl; | ||
|
|
||
| columnFamilyMetrics = scmMetadataStoreImpl.getTableMap().entrySet() | ||
| .stream().collect( | ||
| Collectors.toMap(Map.Entry::getKey, e -> getMetricsInfo(e.getKey()))); | ||
| } | ||
|
|
||
| public static synchronized SCMMetadataStoreMetrics create(SCMMetadataStoreImpl | ||
| scmMetadataStore) { | ||
| if (instance != null) { | ||
| return instance; | ||
| } | ||
| instance = DefaultMetricsSystem.instance().register(METRICS_SOURCE_NAME, | ||
| "SCM Metadata store related metrics", | ||
| new SCMMetadataStoreMetrics(scmMetadataStore)); | ||
| return instance; | ||
| } | ||
|
|
||
| @Override | ||
| public void getMetrics(MetricsCollector collector, boolean all) { | ||
| MetricsRecordBuilder builder = collector.addRecord(METRICS_SOURCE_NAME); | ||
|
|
||
| Map<String, Long> keyCountMap = new HashMap<>(); | ||
| for (Map.Entry<String, MetricsInfo> entry: columnFamilyMetrics.entrySet()) { | ||
| long count = 0L; | ||
| try { | ||
| count = scmMetadataStore.getTableMap().get(entry.getKey()) | ||
| .getEstimatedKeyCount(); | ||
| } catch (IOException e) { | ||
| LOG.error("Can not get estimated key count for table {}", | ||
| entry.getKey(), e); | ||
| } | ||
| builder.addGauge(entry.getValue(), count); | ||
| keyCountMap.put(entry.getKey(), count); | ||
| } | ||
|
|
||
| Gson gson = new Gson(); | ||
| builder.tag(ESTIMATED_KEY_COUNT, gson.toJson(keyCountMap)); | ||
| } | ||
|
|
||
| public static synchronized void unRegister() { | ||
| instance = null; | ||
| DefaultMetricsSystem.instance().unregisterSource(METRICS_SOURCE_NAME); | ||
| } | ||
|
|
||
| private MetricsInfo getMetricsInfo(String tableName) { | ||
| String name = WordUtils.capitalize(tableName); | ||
| String metric = name + "EstimatedKeyCount"; | ||
| String description = "Estimated key count in table of " + name; | ||
| return info(metric, description); | ||
| } | ||
| } |
77 changes: 77 additions & 0 deletions
77
...erver-scm/src/test/java/org/apache/hadoop/hdds/scm/metadata/TestSCMMetadataStoreImpl.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /** | ||
| * 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.hdds.scm.metadata; | ||
|
|
||
| import org.apache.hadoop.hdds.conf.OzoneConfiguration; | ||
| import org.apache.hadoop.ozone.container.common.SCMTestUtils; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.io.TempDir; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.Path; | ||
|
|
||
| import static org.apache.hadoop.test.MetricsAsserts.getLongGauge; | ||
| import static org.apache.hadoop.test.MetricsAsserts.getMetrics; | ||
| import static org.apache.hadoop.test.MetricsAsserts.getStringMetric; | ||
|
|
||
|
|
||
| /** | ||
| * Testing of SCMMetadataStoreImpl. | ||
| */ | ||
| public class TestSCMMetadataStoreImpl { | ||
| private OzoneConfiguration conf; | ||
| private SCMMetadataStore scmMetadataStore; | ||
|
|
||
| @BeforeEach | ||
| public void setUp(@TempDir Path tempDir) throws Exception { | ||
| conf = SCMTestUtils.getConf(); | ||
|
|
||
| scmMetadataStore = new SCMMetadataStoreImpl(conf); | ||
| scmMetadataStore.start(conf); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEstimatedKeyCount() { | ||
| Assertions.assertTrue(getString("EstimatedKeyCount") | ||
| .contains("\"sequenceId\":0")); | ||
| Assertions.assertEquals(0, getGauge("SequenceIdEstimatedKeyCount")); | ||
|
|
||
| try { | ||
| scmMetadataStore.getSequenceIdTable().put("TestKey", 1L); | ||
| } catch (IOException e) { | ||
| // Ignore | ||
| } | ||
|
|
||
| Assertions.assertTrue(getString("EstimatedKeyCount") | ||
| .contains("\"sequenceId\":1")); | ||
| Assertions.assertEquals(1, getGauge("SequenceIdEstimatedKeyCount")); | ||
| } | ||
|
|
||
| private long getGauge(String metricName) { | ||
| return getLongGauge(metricName, | ||
| getMetrics(SCMMetadataStoreMetrics.METRICS_SOURCE_NAME)); | ||
| } | ||
|
|
||
| private String getString(String metricName) { | ||
| return getStringMetric(metricName, | ||
| getMetrics(SCMMetadataStoreMetrics.METRICS_SOURCE_NAME)); | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.