Skip to content

HDDS-12601. Unknown tarball cleanup for Recon OM DB snapshot. #8084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sumitagrawl merged 1 commit into from
Mar 19, 2025
Merged

HDDS-12601. Unknown tarball cleanup for Recon OM DB snapshot. #8084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.HddsUtils;
Expand Down Expand Up @@ -555,6 +556,7 @@ public File getLastKnownDB(File reconDbDir, String fileNamePrefix) {
}
} catch (NumberFormatException nfEx) {
log.warn("Unknown file found in Recon DB dir : {}", fileName);
FileUtils.deleteQuietly(snapshotFile);
Comment on lines 558 to +559
Copy link
Contributor

@smengcl smengcl May 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we should have changed the logging as well to say:

Deleting unknown file found in Recon DB dir

}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...src/main/java/org/apache/hadoop/ozone/recon/spi/impl/OzoneManagerServiceProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,6 @@ connectionFactory, getOzoneManagerSnapshotUrl(),
// Untar the checkpoint file.
Path untarredDbDir = Paths.get(omSnapshotDBParentDir.getAbsolutePath(), snapshotFileName);
reconUtils.untarCheckpointFile(targetFile, untarredDbDir);
FileUtils.deleteQuietly(targetFile);

// Validate the presence of required SST files
File[] sstFiles = untarredDbDir.toFile().listFiles((dir, name) -> name.endsWith(".sst"));
Expand All @@ -430,6 +429,8 @@ connectionFactory, getOzoneManagerSnapshotUrl(),
LOG.error("Unable to obtain Ozone Manager DB Snapshot. ", e);
reconContext.updateHealthStatus(new AtomicBoolean(false));
reconContext.updateErrors(ReconContext.ErrorCode.GET_OM_DB_SNAPSHOT_FAILED);
} finally {
FileUtils.deleteQuietly(targetFile);
}
return null;
}
Expand Down