This is an automated email from the ASF dual-hosted git repository.
ivandika pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new dd831d8c9b HDDS-11221. Resolve potential time discrepancy for expired
multipart upload cleanup (#6982)
dd831d8c9b is described below
commit dd831d8c9ba5d58021f0f6b4b6f3a56328ff208b
Author: Ivan Andika <[email protected]>
AuthorDate: Tue Jul 30 09:34:04 2024 +0800
HDDS-11221. Resolve potential time discrepancy for expired multipart upload
cleanup (#6982)
---
.../main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java | 3 +--
.../test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
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 8275661161..5edf908a03 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.io.UncheckedIOException;
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 class OmMetadataManagerImpl implements
OMMetadataManager,
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 5239fa0090..b91d991500 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 org.junit.jupiter.params.provider.MethodSource;
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 @@ public class TestOmMetadataManager {
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 @@ public class TestOmMetadataManager {
Set<String> 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
