Skip to content

HDDS-12557. Added progress indicator for checkpoint tarball in leader OM #8085

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
adoroszlai merged 5 commits into from
Mar 20, 2025
Merged

HDDS-12557. Added progress indicator for checkpoint tarball in leader OM #8085

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60c1a07
HDDS-12557. Added progress indicator for checkpoint tarball in leader…
Mar 15, 2025
9d8c9b9
HDDS-12557. Used Apache Commons IO. Addressed comments. Removed estim…
Mar 19, 2025
1b07f94
Update hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozo…
SaketaChalamchala Mar 19, 2025
86da6c7
HDDS-12557. Moved totals logic to a helper function.
Mar 19, 2025
e4b5e54
rename to logEstimatedTarballSize
adoroszlai Mar 20, 2025
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
50 changes: 27 additions & 23 deletions ...p-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,34 +300,14 @@ private boolean getFilesForArchive(DBCheckpoint checkpoint,
}

AtomicLong copySize = new AtomicLong(0L);
// Get the active fs files.
Path dir = checkpoint.getCheckpointLocation();

// Log estimated total data transferred on first request.
if (sstFilesToExclude.isEmpty()) {
try {
Counters.PathCounters counters = Counters.longPathCounters();
CountingPathVisitor visitor = new CountingPathVisitor(
counters, SST_FILE_FILTER, TRUE);
Files.walkFileTree(dir, visitor);
int totalSnapshots = 0;
if (includeSnapshotData) {
Set<Path> snapshotPaths = getSnapshotDirs(checkpoint, false);
totalSnapshots = snapshotPaths.size();
for (Path snapshotDir: snapshotPaths) {
Files.walkFileTree(snapshotDir, visitor);
}
}
LOG.info("Estimates for Checkpoint Tarball Stream - " +
"Data size: {} KB, " + "SST files: {}{}",
counters.getByteCounter().get() / (1024),
counters.getFileCounter().get(),
(includeSnapshotData ? ", snapshots: " + totalSnapshots : ""));
} catch (Exception e) {
LOG.error("Could not estimate size of transfer to Checkpoint Tarball Stream.", e);
}
logTotals(checkpoint, includeSnapshotData);
}

// Get the active fs files.
Path dir = checkpoint.getCheckpointLocation();
if (!processDir(dir, copyFiles, hardLinkFiles, sstFilesToExclude,
new HashSet<>(), excluded, copySize, null)) {
return false;
Expand Down Expand Up @@ -358,6 +338,30 @@ private boolean getFilesForArchive(DBCheckpoint checkpoint,
compactionLogDir.getOriginalDir().toPath());
}

private void logTotals(
DBCheckpoint checkpoint, boolean includeSnapshotData) {
try {
Counters.PathCounters counters = Counters.longPathCounters();
CountingPathVisitor visitor = new CountingPathVisitor(
counters, SST_FILE_FILTER, TRUE);
Files.walkFileTree(checkpoint.getCheckpointLocation(), visitor);
int totalSnapshots = 0;
if (includeSnapshotData) {
Set<Path> snapshotPaths = getSnapshotDirs(checkpoint, false);
totalSnapshots = snapshotPaths.size();
for (Path snapshotDir: snapshotPaths) {
Files.walkFileTree(snapshotDir, visitor);
}
}
LOG.info("Estimates for Checkpoint Tarball Stream - Data size: {} KB, " + "SST files: {}{}",
counters.getByteCounter().get() / (1024),
counters.getFileCounter().get(),
(includeSnapshotData ? ", snapshots: " + totalSnapshots : ""));
} catch (Exception e) {
LOG.error("Could not estimate size of transfer to Checkpoint Tarball Stream.", e);
}
}

/**
* The snapshotInfo table may contain a snapshot that
* doesn't yet exist on the fs, so wait a few seconds for it.
Expand Down