Browse Source

HDDS-403. Fix createdOn and modifiedOn timestamp for volume, bucket, key. Contributed by Dinesh Chitlangia.

(cherry picked from commit 8fe4062bfc20ee181106eb68635d3404c50c9238)
Xiaoyu Yao 6 years ago
parent
commit
4b9f1d7639

+ 2 - 2
hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/client/HddsClientUtils.java

@@ -74,7 +74,7 @@ public final class HddsClientUtils {
    */
    */
   public static String formatDateTime(long millis) {
   public static String formatDateTime(long millis) {
     ZonedDateTime dateTime = ZonedDateTime.ofInstant(
     ZonedDateTime dateTime = ZonedDateTime.ofInstant(
-        Instant.ofEpochSecond(millis), DATE_FORMAT.get().getZone());
+        Instant.ofEpochMilli(millis), DATE_FORMAT.get().getZone());
     return DATE_FORMAT.get().format(dateTime);
     return DATE_FORMAT.get().format(dateTime);
   }
   }
 
 
@@ -85,7 +85,7 @@ public final class HddsClientUtils {
   public static long formatDateTime(String date) throws ParseException {
   public static long formatDateTime(String date) throws ParseException {
     Preconditions.checkNotNull(date, "Date string should not be null.");
     Preconditions.checkNotNull(date, "Date string should not be null.");
     return ZonedDateTime.parse(date, DATE_FORMAT.get())
     return ZonedDateTime.parse(date, DATE_FORMAT.get())
-        .toInstant().getEpochSecond();
+        .toInstant().toEpochMilli();
   }
   }
 
 
 
 

+ 2 - 2
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java

@@ -250,8 +250,8 @@ public class KeyManagerImpl implements KeyManager {
             .setKeyName(args.getKeyName())
             .setKeyName(args.getKeyName())
             .setOmKeyLocationInfos(Collections.singletonList(
             .setOmKeyLocationInfos(Collections.singletonList(
                 new OmKeyLocationInfoGroup(0, locations)))
                 new OmKeyLocationInfoGroup(0, locations)))
-            .setCreationTime(currentTime)
-            .setModificationTime(currentTime)
+            .setCreationTime(Time.now())
+            .setModificationTime(Time.now())
             .setDataSize(size)
             .setDataSize(size)
             .setReplicationType(type)
             .setReplicationType(type)
             .setReplicationFactor(factor)
             .setReplicationFactor(factor)