use uuid instead

sadanand48 · Jul 12, 2023 · d516343 · d516343
1 parent 44cd293
commit d516343
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneFSUtils.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneFSUtils.java
@@ -19,9 +19,11 @@
 
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.util.Time;
 
 import javax.annotation.Nonnull;
 import java.nio.file.Paths;
+import java.util.UUID;
 
 import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
 import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_DELIMITER;
@@ -278,4 +280,8 @@ public static String removeTrailingSlashIfNeeded(String key) {
       return key;
     }
   }
+
+  public static String generateUniqueTempSnapshotName() {
+    return "temp" + UUID.randomUUID() + SnapshotInfo.generateName(Time.now());
+  }
 }
diff --git a/.../ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java b/.../ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java
@@ -65,7 +65,6 @@
 import org.apache.hadoop.ozone.om.helpers.BucketLayout;
 import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
 import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
-import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
 import org.apache.hadoop.ozone.security.OzoneTokenIdentifier;
 import org.apache.hadoop.ozone.snapshot.SnapshotDiffReportOzone;
 import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse;
@@ -77,7 +76,6 @@
 import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_DELIMITER;
 import static org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.DONE;
 
-import org.apache.hadoop.util.Time;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -675,14 +673,14 @@ public SnapshotDiffReport getSnapshotDiffReport(Path snapshotDir,
       // current state.
       takeTemporaryToSnapshot = true;
       toSnapshot = createSnapshot(snapshotDir.toString(),
-          "temp" + "-to-" + SnapshotInfo.generateName(Time.now()));
+          OzoneFSUtils.generateUniqueTempSnapshotName());
     }
     if (fromSnapshot.isEmpty()) {
       // empty fromSnapshot implies diff b/w the current state
       // & the toSnapshot
       takeTemporaryFromSnapshot = true;
       fromSnapshot = createSnapshot(snapshotDir.toString(),
-          "temp" + "-from-" + SnapshotInfo.generateName(Time.now()));
+          OzoneFSUtils.generateUniqueTempSnapshotName());
     }
     try {
       SnapshotDiffReportOzone aggregated;

diff --git a/...fs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java b/...fs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java
@@ -75,7 +75,6 @@
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
 import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
 import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
-import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
 import org.apache.hadoop.ozone.security.OzoneTokenIdentifier;
 import org.apache.hadoop.ozone.snapshot.SnapshotDiffReportOzone;
 import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse;
@@ -84,7 +83,6 @@
 import org.apache.hadoop.security.token.TokenRenewer;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.hadoop.util.Time;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -1323,14 +1321,14 @@ public SnapshotDiffReport getSnapshotDiffReport(Path snapshotDir,
       // current state.
       takeTemporaryToSnapshot = true;
       toSnapshot = createSnapshot(snapshotDir.toString(),
-          "temp" + "-to-" + SnapshotInfo.generateName(Time.now()));
+          OzoneFSUtils.generateUniqueTempSnapshotName());
     }
     if (fromSnapshot.isEmpty()) {
       // empty fromSnapshot implies diff b/w the current state
       // & the toSnapshot
       takeTemporaryFromSnapshot = true;
       fromSnapshot = createSnapshot(snapshotDir.toString(),
-          "temp" + "-from-" + SnapshotInfo.generateName(Time.now()));
+          OzoneFSUtils.generateUniqueTempSnapshotName());
     }
     OFSPath ofsPath = new OFSPath(snapshotDir, config);
     String volume = ofsPath.getVolumeName();