From 8a6eaa8fc06da8564bfee7cbb784f1bdb3847888 Mon Sep 17 00:00:00 2001 From: Siyao Meng <50227127+smengcl@users.noreply.github.com> Date: Tue, 15 Aug 2023 14:33:04 -0700 Subject: [PATCH] Address Hemant's comments. --- .../java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java | 3 ++- .../hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java index 74068eb6b31..2a3fbcff78e 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java @@ -613,6 +613,7 @@ public boolean equals(Object o) { snapshotPath.equals(that.snapshotPath) && checkpointDir.equals(that.checkpointDir) && Objects.equals(deepClean, that.deepClean) && + Objects.equals(sstFiltered, that.sstFiltered) && Objects.equals(referencedSize, that.referencedSize); } @@ -622,6 +623,6 @@ public int hashCode() { snapshotStatus, creationTime, deletionTime, pathPreviousSnapshotId, globalPreviousSnapshotId, snapshotPath, checkpointDir, - deepClean, referencedSize); + deepClean, sstFiltered, referencedSize); } } diff --git a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java index a874c4f88c1..d6ea58a48f7 100644 --- a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java +++ b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java @@ -1211,7 +1211,7 @@ private static FileStatusAdapter getFileStatusAdapterForBucketSnapshot( Path path = new Path(pathStr); return new FileStatusAdapter( ozoneSnapshot.getReferencedSize(), ozoneSnapshot.getReferencedSize(), - path, true, (short)0, 0L, + path, true, (short) 0, 0L, ozoneSnapshot.getCreationTime(), 0L, FsPermission.getDirDefault().toShort(), owner, group, null, new BlockLocation[0],