errose28 commented on code in PR #8609: URL: https://github.com/apache/ozone/pull/8609#discussion_r2198947064
########## hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeHealthMetrics.java: ########## @@ -0,0 +1,106 @@ +/* + * 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.ozone.container.common.volume; + +import java.util.List; +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.MetricsSystem; +import org.apache.hadoop.metrics2.annotation.Metrics; +import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; +import org.apache.hadoop.metrics2.lib.Interns; +import org.apache.hadoop.metrics2.lib.MetricsRegistry; +import org.apache.hadoop.ozone.OzoneConsts; + +/** + * This class is used to track Volume Health metrics for all volumes on a datanode. + */ +@Metrics(about = "Ozone Volume Health Metrics", + context = OzoneConsts.OZONE) +public class VolumeHealthMetrics implements MetricsSource { + + private static final String SOURCE_BASENAME = + VolumeHealthMetrics.class.getSimpleName(); + + private static final MetricsInfo TOTAL_VOLUMES = + Interns.info("TotalVolumes", "Total number of volumes"); + private static final MetricsInfo HEALTHY_VOLUMES = + Interns.info("NumHealthyVolumes", "Number of healthy volumes"); + private static final MetricsInfo FAILED_VOLUMES = + Interns.info("NumFailedVolumes", "Number of failed volumes"); + + private final MetricsRegistry registry; + private final String metricsSourceName; + private final VolumeSet volumeSet; + private final StorageVolume.VolumeType volumeType; + + /** + * Constructor for VolumeHealthMetrics. + * + * @param volumeType Type of volumes (DATA_VOLUME, META_VOLUME, DB_VOLUME) + * @param volumeSet The volume set to track metrics for + */ + public VolumeHealthMetrics(StorageVolume.VolumeType volumeType, VolumeSet volumeSet) { Review Comment: Is there a difference between the init pattern used here and in [VolumeInfoMetrics](https://github.com/apache/ozone/blob/6bf009c2029765c73df503d2515c267238db9996/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfoMetrics.java#L69) vs having one static create like [this](https://github.com/apache/ozone/blob/d8a391558f239355ed2f53580f7cc7fe86becfac/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/CommandHandlerMetrics.java#L57)? Can you check the spec for Hadoop metric system on this? ########## hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeHealthMetrics.java: ########## @@ -0,0 +1,106 @@ +/* + * 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.ozone.container.common.volume; + +import java.util.List; +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.MetricsSystem; +import org.apache.hadoop.metrics2.annotation.Metrics; +import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; +import org.apache.hadoop.metrics2.lib.Interns; +import org.apache.hadoop.metrics2.lib.MetricsRegistry; +import org.apache.hadoop.ozone.OzoneConsts; + +/** + * This class is used to track Volume Health metrics for all volumes on a datanode. + */ +@Metrics(about = "Ozone Volume Health Metrics", + context = OzoneConsts.OZONE) +public class VolumeHealthMetrics implements MetricsSource { + + private static final String SOURCE_BASENAME = + VolumeHealthMetrics.class.getSimpleName(); + + private static final MetricsInfo TOTAL_VOLUMES = + Interns.info("TotalVolumes", "Total number of volumes"); + private static final MetricsInfo HEALTHY_VOLUMES = + Interns.info("NumHealthyVolumes", "Number of healthy volumes"); + private static final MetricsInfo FAILED_VOLUMES = + Interns.info("NumFailedVolumes", "Number of failed volumes"); + + private final MetricsRegistry registry; + private final String metricsSourceName; + private final VolumeSet volumeSet; + private final StorageVolume.VolumeType volumeType; + + /** + * Constructor for VolumeHealthMetrics. + * + * @param volumeType Type of volumes (DATA_VOLUME, META_VOLUME, DB_VOLUME) + * @param volumeSet The volume set to track metrics for + */ + public VolumeHealthMetrics(StorageVolume.VolumeType volumeType, VolumeSet volumeSet) { + this.volumeType = volumeType; + this.volumeSet = volumeSet; Review Comment: The composition here is backwards. `MutableVolumeSet` should contain the metrics object that tracks its stats. Then internally the locks can be used to get metrics from its maps as a consistent view in constant time. The only `OzoneContainer` modification would be to call a new `unregister` method in `MutableVolumeSet` to clean up its metrics on shutdown. ########## hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeHealthMetrics.java: ########## @@ -0,0 +1,106 @@ +/* + * 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.ozone.container.common.volume; + +import java.util.List; +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.MetricsSystem; +import org.apache.hadoop.metrics2.annotation.Metrics; +import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; +import org.apache.hadoop.metrics2.lib.Interns; +import org.apache.hadoop.metrics2.lib.MetricsRegistry; +import org.apache.hadoop.ozone.OzoneConsts; + +/** + * This class is used to track Volume Health metrics for all volumes on a datanode. + */ +@Metrics(about = "Ozone Volume Health Metrics", + context = OzoneConsts.OZONE) +public class VolumeHealthMetrics implements MetricsSource { + + private static final String SOURCE_BASENAME = + VolumeHealthMetrics.class.getSimpleName(); + + private static final MetricsInfo TOTAL_VOLUMES = + Interns.info("TotalVolumes", "Total number of volumes"); + private static final MetricsInfo HEALTHY_VOLUMES = + Interns.info("NumHealthyVolumes", "Number of healthy volumes"); + private static final MetricsInfo FAILED_VOLUMES = + Interns.info("NumFailedVolumes", "Number of failed volumes"); + + private final MetricsRegistry registry; + private final String metricsSourceName; + private final VolumeSet volumeSet; + private final StorageVolume.VolumeType volumeType; + + /** + * Constructor for VolumeHealthMetrics. + * + * @param volumeType Type of volumes (DATA_VOLUME, META_VOLUME, DB_VOLUME) + * @param volumeSet The volume set to track metrics for + */ + public VolumeHealthMetrics(StorageVolume.VolumeType volumeType, VolumeSet volumeSet) { Review Comment: Either way `init` is only called from within this class so it can be collapsed into the constructor. -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
