Skip to content

HDDS-12823. SnapshotDiffReportOzone#fromProtobuf empty token handling #8280

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
hemantk-12 merged 5 commits into from
Apr 21, 2025
Merged

HDDS-12823. SnapshotDiffReportOzone#fromProtobuf empty token handling #8280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2d568f
HDDS-12823. SnapshotDiffReportOzone#fromProtobuf empty token handling
peterxcli Apr 12, 2025
a6e4956
fix test
peterxcli Apr 14, 2025
b5197b3
Remove all string empty check from SnapshotDiffReportOzone#getToken
peterxcli Apr 15, 2025
7a30cb2
keep StringUtils.isNotEmpty
peterxcli Apr 15, 2025
50c6e5f
Relpcace null check on token with isNotEmpty
peterxcli Apr 15, 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
2 changes: 1 addition & 1 deletion ...-ozone/common/src/main/java/org/apache/hadoop/ozone/snapshot/SnapshotDiffReportOzone.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public static SnapshotDiffReportOzone fromProtobuf(
report.getDiffListList().stream()
.map(SnapshotDiffReportOzone::fromProtobufDiffReportEntry)
.collect(Collectors.toList()),
report.getToken());
report.hasToken() ? report.getToken() : null);
}

public static DiffType fromProtobufDiffType(
Expand Down
7 changes: 3 additions & 4 deletions ...ne/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.snapshot;

import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
import static org.apache.commons.lang3.StringUtils.leftPad;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DB_PROFILE;
import static org.apache.hadoop.ozone.OzoneAcl.AclScope.DEFAULT;
Expand Down Expand Up @@ -2092,7 +2093,6 @@ public void testSnapshotDiffWhenOmRestartAndReportIsPartiallyFetched()
bucketName, snapshot1, snapshot2, null, pageSize);

List<DiffReportEntry> diffReportEntries = diffReport.getDiffList();
String nextToken = diffReport.getToken();

// Restart the OM and no need to wait because snapDiff job finished before
// the restart.
Expand All @@ -2101,11 +2101,10 @@ public void testSnapshotDiffWhenOmRestartAndReportIsPartiallyFetched()
await(POLL_MAX_WAIT_MILLIS, POLL_INTERVAL_MILLIS,
() -> cluster.getOzoneManager().isRunning());

while (nextToken == null || !nextToken.isEmpty()) {
while (isNotEmpty(diffReport.getToken())) {
diffReport = fetchReportPage(volumeName, bucketName, snapshot1,
snapshot2, nextToken, pageSize);
snapshot2, diffReport.getToken(), pageSize);
diffReportEntries.addAll(diffReport.getDiffList());
nextToken = diffReport.getToken();
}
assertEquals(100, diffReportEntries.size());
}
Expand Down
2 changes: 1 addition & 1 deletion .../ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ public SnapshotDiffReport getSnapshotDiffReport(Path snapshotDir,
SnapshotDiffReportOzone report =
getSnapshotDiffReportOnceComplete(fromSnapshot, toSnapshot, "");
aggregated = report;
while (!report.getToken().isEmpty()) {
while (StringUtils.isNotEmpty(report.getToken())) {
LOG.info(
"Total Snapshot Diff length between snapshot {} and {} exceeds"
+ " max page size, Performing another " +
Expand Down
2 changes: 1 addition & 1 deletion ...fs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,7 @@ public SnapshotDiffReport getSnapshotDiffReport(Path snapshotDir,
getSnapshotDiffReportOnceComplete(fromSnapshot, toSnapshot, volume,
bucket, "");
aggregated = report;
while (!report.getToken().isEmpty()) {
while (StringUtils.isNotEmpty(report.getToken())) {
LOG.info(
"Total Snapshot Diff length between snapshot {} and {} exceeds"
+ " max page size, Performing another" +
Expand Down