Tejaskriya commented on code in PR #8448: URL: https://github.com/apache/ozone/pull/8448#discussion_r2192151794
########## hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/StorageVolumeScannerMetrics.java: ########## @@ -0,0 +1,125 @@ +/* + * 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.Collection; +import org.apache.hadoop.hdds.annotation.InterfaceAudience; +import org.apache.hadoop.metrics2.MetricsSystem; +import org.apache.hadoop.metrics2.annotation.Metric; +import org.apache.hadoop.metrics2.annotation.Metrics; +import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; +import org.apache.hadoop.metrics2.lib.MutableCounterLong; +import org.apache.hadoop.metrics2.lib.MutableGaugeLong; + +/** + * This class captures the Storage Volume Scanner Metrics. + **/ [email protected] +@Metrics(about = "Storage Volume Scanner Metrics", context = "dfs") +public class StorageVolumeScannerMetrics { + public static final String SOURCE_NAME = StorageVolumeScannerMetrics.class.getSimpleName(); + + @Metric("number of volumes scanned in the last iteration") + private MutableGaugeLong numVolumesScannedInLastIteration; + + @Metric("number of iterations of scanner completed since the restart") + private MutableCounterLong numScanIterations; + + @Metric("number of data volume sets scanned") Review Comment: ```suggestion @Metric("number of data volume sets scanned since the last restart") ``` ########## hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfoMetrics.java: ########## @@ -63,6 +64,12 @@ public class VolumeInfoMetrics implements MetricsSource { @Metric("Volume available space is insufficient") private MutableGaugeInt availableSpaceInsufficient; + @Metric("Returns the Number of Volumes Scanned") + private MutableCounterLong numScans; + + @Metric("Returns the Number of Volume Scans Skipped") Review Comment: Similar to above comment, ```suggestion @Metric("Number of scans skipped for the volume") ``` ########## hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfoMetrics.java: ########## @@ -63,6 +64,12 @@ public class VolumeInfoMetrics implements MetricsSource { @Metric("Volume available space is insufficient") private MutableGaugeInt availableSpaceInsufficient; + @Metric("Returns the Number of Volumes Scanned") Review Comment: If I am not mistaken this metric counts how many times a particular volume is scanned right? In that case this description is slightly misleading. ```suggestion @Metric("Number of times the volume is scanned") ``` ########## hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/StorageVolumeChecker.java: ########## @@ -176,12 +175,28 @@ public synchronized void checkAllVolumeSets() { } try { + metrics.setNumVolumesScannedInLastIteration(0); for (VolumeSet volSet : registeredVolumeSets) { + long volumeCount = volSet.getVolumesList().size(); + if (volSet instanceof MutableVolumeSet) { + StorageVolume.VolumeType type = ((MutableVolumeSet) volSet).getVolumeType(); + switch (type) { + case DATA_VOLUME: + metrics.incNumDataVolumesScanned(volumeCount); + break; + case META_VOLUME: + metrics.incNumMetadataVolumesScanned(volumeCount); + break; + default: + LOG.warn("Unknown volume type: {}", type); + break; + } + } volSet.checkAllVolumes(this); + metrics.incrNumVolumesScannedInLastIteration(volSet.getVolumesList().size()); Review Comment: This type of approach where we set the metric to zero before a loop and increment it in each iteration will give a wrong impression if user happens to read the metrics in the middle of a run of the scanner. Instead, a local variable can be used to do this summing, and the metric can simply be reset once to this local variable at the end of the run. We wouldn't need to increment the metric itself in each iteration. That way we don't need the `incrNumVolumesScannedInLastIteration` method. ########## hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/StorageVolumeScannerMetrics.java: ########## @@ -0,0 +1,125 @@ +/* + * 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.Collection; +import org.apache.hadoop.hdds.annotation.InterfaceAudience; +import org.apache.hadoop.metrics2.MetricsSystem; +import org.apache.hadoop.metrics2.annotation.Metric; +import org.apache.hadoop.metrics2.annotation.Metrics; +import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; +import org.apache.hadoop.metrics2.lib.MutableCounterLong; +import org.apache.hadoop.metrics2.lib.MutableGaugeLong; + +/** + * This class captures the Storage Volume Scanner Metrics. + **/ [email protected] +@Metrics(about = "Storage Volume Scanner Metrics", context = "dfs") +public class StorageVolumeScannerMetrics { + public static final String SOURCE_NAME = StorageVolumeScannerMetrics.class.getSimpleName(); + + @Metric("number of volumes scanned in the last iteration") + private MutableGaugeLong numVolumesScannedInLastIteration; + + @Metric("number of iterations of scanner completed since the restart") + private MutableCounterLong numScanIterations; + + @Metric("number of data volume sets scanned") + private MutableGaugeLong numDataVolumesScanned; + + @Metric("number of metadata volume sets scanned") Review Comment: ```suggestion @Metric("number of metadata volume sets scanned since the last restart") ``` -- 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]
