swamirishi commented on code in PR #9132:
URL: https://github.com/apache/ozone/pull/9132#discussion_r2603735139
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java:
##########
@@ -4240,89 +4245,153 @@ private void stopTrashEmptier() {
}
/**
- * Replace the current OM DB with the new DB checkpoint.
+ * Replaces the OM DB with checkpoint data from leader.
+ * Only backs up and replaces directories/files that are present in
checkpointLocation.
*
- * @param lastAppliedIndex the last applied index in the current OM DB.
- * @param checkpointPath path to the new DB checkpoint
- * @return location of backup of the original DB
+ * @param lastAppliedIndex last applied transaction index
+ * @param oldDB current DB directory
+ * @param checkpointLocation checkpoint data directory from leader
+ * @return backup directory containing original state (only changed items)
+ * @throws IOException if operations fail
*/
- File replaceOMDBWithCheckpoint(long lastAppliedIndex, File oldDB,
- Path checkpointPath) throws IOException {
+ File replaceOMDBWithCheckpoint(long lastAppliedIndex, File oldDB, Path
checkpointLocation)
+ throws IOException {
- // Take a backup of the current DB
- String dbBackupName = OzoneConsts.OM_DB_BACKUP_PREFIX +
- lastAppliedIndex + "_" + System.currentTimeMillis();
+ // Create single parent backup directory
+ String dbBackupName = OzoneConsts.OM_DB_BACKUP_PREFIX + lastAppliedIndex
+ + "_" + System.currentTimeMillis();
File dbDir = oldDB.getParentFile();
-
- // Backup the active fs and snapshot dirs.
File dbBackupDir = new File(dbDir, dbBackupName);
+
if (!dbBackupDir.mkdirs()) {
- throw new IOException("Failed to make db backup dir: " +
- dbBackupDir);
+ throw new IOException("Failed to create backup directory: " +
dbBackupDir);
}
- File dbBackup = new File(dbBackupDir, oldDB.getName());
- File dbSnapshotsDir = new File(dbDir, OM_SNAPSHOT_DIR);
- File dbSnapshotsBackup = new File(dbBackupDir, OM_SNAPSHOT_DIR);
- Files.move(oldDB.toPath(), dbBackup.toPath());
- if (dbSnapshotsDir.exists()) {
- Files.move(dbSnapshotsDir.toPath(),
- dbSnapshotsBackup.toPath());
+
+ // Only backup items that are present in checkpointLocation
+ // Track what we backed up for selective restore
+ Set<String> backedUpItems = new HashSet<>();
+
+ if (Files.exists(checkpointLocation) &&
Files.isDirectory(checkpointLocation)) {
+ try (Stream<Path> checkpointContents = Files.list(checkpointLocation)) {
+ for (Path checkpointItem :
checkpointContents.collect(Collectors.toList())) {
+ Path fileName = checkpointItem.getFileName();
+ if (fileName == null) {
+ LOG.warn("Skipping path with no file name: {}", checkpointItem);
+ continue;
+ }
+ String itemName = fileName.toString();
+ // Skip backup directories, raft logs, and marker files
+ if (itemName.startsWith(OzoneConsts.OM_DB_BACKUP_PREFIX)
Review Comment:
Why is this entire check required? Checkpoint is never going to have these
values ever
--
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]
