Copilot commented on code in PR #11017: URL: https://github.com/apache/ozone/pull/11017#discussion_r3788030333
########## hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/om/DownloadOMDB.java: ########## @@ -0,0 +1,138 @@ +/* + * 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.repair.om; + +import static org.apache.hadoop.hdds.utils.HddsServerUtil.OZONE_RATIS_SNAPSHOT_COMPLETE_FLAG_NAME; +import static org.apache.hadoop.ozone.OzoneConsts.OM_DB_NAME; +import static org.apache.hadoop.ozone.OzoneConsts.OM_SNAPSHOT_DIR; +import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_DB_CHECKPOINT_USE_INODE_BASED_KEY; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Collections; +import org.apache.commons.io.FileUtils; +import org.apache.hadoop.hdds.cli.HddsVersionProvider; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.utils.db.DBCheckpoint; +import org.apache.hadoop.ozone.OmUtils; +import org.apache.hadoop.ozone.om.helpers.OMNodeDetails; +import org.apache.hadoop.ozone.om.ratis_snapshot.OmRatisSnapshotProvider; +import org.apache.hadoop.ozone.repair.RepairTool; +import picocli.CommandLine; + +/** + * Tool to download OM metadata using the follower bootstrap checkpoint flow. + */ [email protected]( + name = "download", + description = "Downloads OM metadata (om.db and db.snapshots) from an OM node using the same " + + "checkpoint transfer flow as follower bootstrap.", + mixinStandardHelpOptions = true, + versionProvider = HddsVersionProvider.class +) +public class DownloadOMDB extends RepairTool { + + @CommandLine.Option( + names = {"--service-id", "--om-service-id"}, + description = "Ozone Manager Service ID", + required = false + ) + private String omServiceId; + + @CommandLine.Option( + names = {"--node-id"}, + description = "Node ID of the OM to download om.db from. Required when OM HA is configured.", + required = false + ) + private String nodeId; + + @CommandLine.Option( + names = {"--output-dir"}, + description = "Path where the downloaded OM metadata directory will be written. " + + "The output matches follower bootstrap layout: om.db and db.snapshots.", + required = true + ) + private Path outputDir; + + @CommandLine.Option( + names = {"--overwrite"}, + description = "Overwrite output directory if it already exists." + ) + private boolean overwrite; + + @Override + public void execute() throws Exception { + OzoneConfiguration conf = getOzoneConf(); + + if (nodeId == null && OmUtils.isServiceIdsDefined(conf)) { + error("This is an HA OM cluster; specify --node-id to select which OM to download from."); + return; + } + + OMNodeDetails omNodeDetails = + OMNodeDetails.getOMNodeDetailsFromConf(conf, omServiceId, nodeId); + if (omNodeDetails == null) { + error("Couldn't determine OM node from the given service-id: %s and node-id: %s.", + omServiceId, nodeId); + return; + } + + if (Files.exists(outputDir)) { + if (!overwrite) { + error("Output directory already exists: %s. Use --overwrite to replace it.", + outputDir.toAbsolutePath()); + return; + } + FileUtils.forceDelete(outputDir.toFile()); + } + Path parent = outputDir.toAbsolutePath().getParent(); + if (parent != null) { + Files.createDirectories(parent); + } + + // This tool intentionally follows the inode-based follower bootstrap transfer. + conf.setBoolean(OZONE_OM_DB_CHECKPOINT_USE_INODE_BASED_KEY, true); + + Path snapshotWorkDir = Files.createTempDirectory("ozone-omdb-bootstrap-"); + DBCheckpoint checkpoint = null; + try (OmRatisSnapshotProvider provider = new OmRatisSnapshotProvider( + conf, snapshotWorkDir.toFile(), + Collections.singletonMap(omNodeDetails.getNodeId(), omNodeDetails))) { + checkpoint = provider.downloadDBSnapshotFromLeader(omNodeDetails.getNodeId()); Review Comment: Non-HA configurations legitimately produce `OMNodeDetails` with a null node ID. Passing that null key into `Collections.singletonMap` and then `ConcurrentHashMap.putAll` in `OmRatisSnapshotProvider` throws `NullPointerException`, so the command cannot download from a non-HA OM even though both ID options are documented as optional. Use a non-null lookup key for the provider in this case. ########## hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/om/DownloadOMDB.java: ########## @@ -0,0 +1,138 @@ +/* + * 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.repair.om; + +import static org.apache.hadoop.hdds.utils.HddsServerUtil.OZONE_RATIS_SNAPSHOT_COMPLETE_FLAG_NAME; +import static org.apache.hadoop.ozone.OzoneConsts.OM_DB_NAME; +import static org.apache.hadoop.ozone.OzoneConsts.OM_SNAPSHOT_DIR; +import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_DB_CHECKPOINT_USE_INODE_BASED_KEY; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Collections; +import org.apache.commons.io.FileUtils; +import org.apache.hadoop.hdds.cli.HddsVersionProvider; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.utils.db.DBCheckpoint; +import org.apache.hadoop.ozone.OmUtils; +import org.apache.hadoop.ozone.om.helpers.OMNodeDetails; +import org.apache.hadoop.ozone.om.ratis_snapshot.OmRatisSnapshotProvider; +import org.apache.hadoop.ozone.repair.RepairTool; +import picocli.CommandLine; + +/** + * Tool to download OM metadata using the follower bootstrap checkpoint flow. + */ [email protected]( + name = "download", + description = "Downloads OM metadata (om.db and db.snapshots) from an OM node using the same " + + "checkpoint transfer flow as follower bootstrap.", + mixinStandardHelpOptions = true, + versionProvider = HddsVersionProvider.class +) +public class DownloadOMDB extends RepairTool { + + @CommandLine.Option( + names = {"--service-id", "--om-service-id"}, + description = "Ozone Manager Service ID", + required = false + ) + private String omServiceId; + + @CommandLine.Option( + names = {"--node-id"}, + description = "Node ID of the OM to download om.db from. Required when OM HA is configured.", + required = false + ) + private String nodeId; + + @CommandLine.Option( + names = {"--output-dir"}, + description = "Path where the downloaded OM metadata directory will be written. " + + "The output matches follower bootstrap layout: om.db and db.snapshots.", + required = true + ) + private Path outputDir; + + @CommandLine.Option( + names = {"--overwrite"}, + description = "Overwrite output directory if it already exists." + ) + private boolean overwrite; + + @Override + public void execute() throws Exception { + OzoneConfiguration conf = getOzoneConf(); + + if (nodeId == null && OmUtils.isServiceIdsDefined(conf)) { + error("This is an HA OM cluster; specify --node-id to select which OM to download from."); + return; + } + + OMNodeDetails omNodeDetails = + OMNodeDetails.getOMNodeDetailsFromConf(conf, omServiceId, nodeId); + if (omNodeDetails == null) { + error("Couldn't determine OM node from the given service-id: %s and node-id: %s.", + omServiceId, nodeId); + return; + } + + if (Files.exists(outputDir)) { + if (!overwrite) { + error("Output directory already exists: %s. Use --overwrite to replace it.", + outputDir.toAbsolutePath()); + return; + } + FileUtils.forceDelete(outputDir.toFile()); Review Comment: `--overwrite` deletes the existing metadata before the replacement has even been downloaded. Any network, authentication, unpacking, or disk failure after this line leaves the operator with neither the old copy nor a usable new one. Keep the existing directory until the checkpoint is fully constructed in staging, then replace it during the final promotion step. -- 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]
