diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java index 82756611614c..5edf908a0377 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java @@ -22,7 +22,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.time.Duration; -import java.time.Instant; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -1815,7 +1814,7 @@ public List getExpiredMultipartUploads( mpuInfoTableIterator = getMultipartInfoTable().iterator()) { final long expiredCreationTimestamp = - Instant.now().minus(expireThreshold).toEpochMilli(); + expireThreshold.negated().plusMillis(Time.now()).toMillis(); ExpiredMultipartUploadInfo.Builder builder = ExpiredMultipartUploadInfo.newBuilder(); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java index 5239fa009029..b91d9915000a 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java @@ -51,7 +51,6 @@ import java.io.File; import java.time.Duration; -import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -777,7 +776,7 @@ private void testGetExpiredMPUs() throws Exception { final Duration expireThreshold = Duration.ofMillis(expireThresholdMillis); final long expiredMPUCreationTime = - Instant.now().minus(expireThreshold).toEpochMilli(); + expireThreshold.negated().plusMillis(Time.now()).toMillis(); // Add expired MPUs to multipartInfoTable. // The method under test does not check for expired open keys in the @@ -785,7 +784,7 @@ private void testGetExpiredMPUs() throws Exception { Set expiredMPUs = new HashSet<>(); for (int i = 0; i < numExpiredMPUs + numUnexpiredMPUs; i++) { final long creationTime = i < numExpiredMPUs ? - expiredMPUCreationTime : Instant.now().toEpochMilli(); + expiredMPUCreationTime : Time.now(); String uploadId = OMMultipartUploadUtils.getMultipartUploadId(); final OmMultipartKeyInfo mpuKeyInfo = OMRequestTestUtils