errose28 commented on code in PR #8448: URL: https://github.com/apache/ozone/pull/8448#discussion_r2198217721
########## 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") + private MutableGaugeLong numMetadataVolumesScanned; + + @Metric("number of checks skipped because the minimum gap since the last check had not elapsed") Review Comment: I think this better aligns with the metric name and indicates that the whole iteration for checking all volumes was skipped, not just a check of a single volume. ```suggestion @Metric("number of volume scanner iterations skipped because the minimum gap since the last iteration had not elapsed") ``` ########## 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: I'm not understanding the intent of that linked comment, but we need to do as @Tejaskriya suggested here to make sure this metric always gives a usable value. ########## 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: I don't think these metrics are based on the volume set concept anymore, just a count of volumes. ```suggestion @Metric("number of data volumes scanned since the last restart") ``` ########## 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") Review Comment: ```suggestion @Metric("number of iterations the volume scanner has completed since the last restart") ``` ########## 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; Review Comment: There's a mismatch in this metric's name + description and actual usage. - `numDataVolumesScanned` describes counting the number of unique data volumes that have ever been scanned. - `numDataVolumeScans` describes counting the number of times a scan over any data volume was run. Currently we are using the first name with the second value. I think we can keep the usage as is and just change the name to the second one to match that. Same for the metadata volume metric below. ########## 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 volumes 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]
