devmadhuu commented on code in PR #9127: URL: https://github.com/apache/ozone/pull/9127#discussion_r2425260422
########## hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/upgrade/ReplicatedSizeOfFilesUpgradeAction.java: ########## @@ -0,0 +1,67 @@ +/* + * 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.recon.upgrade; + +import com.google.inject.Injector; +import javax.sql.DataSource; +import org.apache.hadoop.ozone.recon.ReconGuiceServletContextListener; +import org.apache.hadoop.ozone.recon.tasks.ReconTaskController; +import org.apache.hadoop.ozone.recon.tasks.ReconTaskReInitializationEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Upgrade action for the REPLICATED_SIZE_OF_FILES layout feature. + * The action triggers a full rebuild of the NSSummary ensuring that the new field: replicatedSizeOfFiles is correctly + * populated for all objects. + */ +@UpgradeActionRecon(feature = ReconLayoutFeature.REPLICATED_SIZE_OF_FILES, + type = ReconUpgradeAction.UpgradeActionType.FINALIZE) +public class ReplicatedSizeOfFilesUpgradeAction implements ReconUpgradeAction { Review Comment: While the upgrade action rebuilds all data, there's a potential race condition during the upgrade window: - If any diskUsage API hits between when the layout version is upgraded and when the rebuild completes, it might try to read old-format data with the new codec. Should an upgrade action set a flag or block queries until the rebuild completes ? ########## hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/NSSummary.java: ########## @@ -37,24 +37,27 @@ public class NSSummary { // for performance optimization, not just direct files in this directory private int numOfFiles; private long sizeOfFiles; + private long replicatedSizeOfFiles; private int[] fileSizeBucket; private Set<Long> childDir; private String dirName; private long parentId = 0; public NSSummary() { - this(0, 0L, new int[ReconConstants.NUM_OF_FILE_SIZE_BINS], + this(0, 0L, 0L, new int[ReconConstants.NUM_OF_FILE_SIZE_BINS], new HashSet<>(), "", 0); } public NSSummary(int numOfFiles, long sizeOfFiles, + long replicatedSizeOfFiles, int[] bucket, Set<Long> childDir, String dirName, long parentId) { this.numOfFiles = numOfFiles; this.sizeOfFiles = sizeOfFiles; + this.replicatedSizeOfFiles = replicatedSizeOfFiles; Review Comment: update toString() method also to include this new field. ########## hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/upgrade/ReplicatedSizeOfFilesUpgradeAction.java: ########## @@ -0,0 +1,67 @@ +/* + * 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.recon.upgrade; + +import com.google.inject.Injector; +import javax.sql.DataSource; +import org.apache.hadoop.ozone.recon.ReconGuiceServletContextListener; +import org.apache.hadoop.ozone.recon.tasks.ReconTaskController; +import org.apache.hadoop.ozone.recon.tasks.ReconTaskReInitializationEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Upgrade action for the REPLICATED_SIZE_OF_FILES layout feature. + * The action triggers a full rebuild of the NSSummary ensuring that the new field: replicatedSizeOfFiles is correctly + * populated for all objects. + */ +@UpgradeActionRecon(feature = ReconLayoutFeature.REPLICATED_SIZE_OF_FILES, + type = ReconUpgradeAction.UpgradeActionType.FINALIZE) +public class ReplicatedSizeOfFilesUpgradeAction implements ReconUpgradeAction { Review Comment: Also, Pls consider adding metrics for tracking rebuild progress during upgrades ########## hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskDbEventHandler.java: ########## @@ -102,14 +102,15 @@ protected void handlePutKeyEvent(OmKeyInfo keyInfo, Map<Long, // Update immediate parent's totals (these fields now represent totals) Review Comment: ```suggestion // Update immediate parent's totals (includes all descendant files) ``` ########## hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithFSO.java: ########## @@ -675,10 +671,10 @@ public void testQuotaUsage() throws Exception { @Test public void testFileSizeDist() throws Exception { - checkFileSizeDist(ROOT_PATH, 2, 3, 4, 1); - checkFileSizeDist(VOL_PATH, 2, 1, 2, 1); - checkFileSizeDist(BUCKET_ONE_PATH, 1, 1, 1, 1); - checkFileSizeDist(DIR_ONE_PATH, 0, 1, 1, 1); + checkFileSizeDist(ROOT_PATH, 2, 3, 4, 2); Review Comment: This is fine, and there are tests in OM code to verify the integrity of replicated size using `QuotaUtil.getReplicatedSize() `to calculate expected values, but there's no test after this PR that verifies the propagation through multiple levels. For example: `/bucket/dir1/dir2/dir3/file1` Does `dir1.replicatedSizeOfFiles` include the replicated size of file1? (It should, and the code looks correct, but no test explicitly validates this.) May be something like: ``` @Test public void testReplicatedSizePropagationThroughMultipleLevels() { // Create: /vol/bucket/dir1/dir2/dir3/file (size=100, replication=3x) // Verify: dir3.replicatedSize = 300 // Verify: dir2.replicatedSize = 300 // Verify: dir1.replicatedSize = 300 // Verify: bucket.replicatedSize = 300 } ``` -- 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]
