You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by we...@apache.org on 2023/02/06 16:24:35 UTC
[ozone] branch master updated: HDDS-7764. Potential discrepancy of key creation time may cause premature open key clean up. (#4242)
This is an automated email from the ASF dual-hosted git repository.
weichiu 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 19467c4987 HDDS-7764. Potential discrepancy of key creation time may cause premature open key clean up. (#4242)
19467c4987 is described below
commit 19467c49879b8d580ff240bd8dbf6c0ec11e47c9
Author: Tsz-Wo Nicholas Sze <sz...@apache.org>
AuthorDate: Mon Feb 6 08:24:26 2023 -0800
HDDS-7764. Potential discrepancy of key creation time may cause premature open key clean up. (#4242)
---
.../main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java | 4 ++--
.../test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java | 2 +-
.../test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java | 6 +++---
3 files changed, 6 insertions(+), 6 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 cc5054c1aa..127e3ceb12 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
@@ -20,7 +20,6 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Paths;
import java.time.Duration;
-import java.time.Instant;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -104,6 +103,7 @@ import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.BUCK
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.VOLUME_NOT_FOUND;
import static org.apache.hadoop.ozone.OzoneConsts.OM_SNAPSHOT_DIR;
+import org.apache.hadoop.util.Time;
import org.apache.ratis.util.ExitUtils;
import org.eclipse.jetty.util.StringUtil;
import org.slf4j.Logger;
@@ -1406,7 +1406,7 @@ public class OmMetadataManagerImpl implements OMMetadataManager {
keyValueTableIterator = getOpenKeyTable(bucketLayout).iterator()) {
final long expiredCreationTimestamp =
- Instant.now().minus(expireThreshold).toEpochMilli();
+ expireThreshold.negated().plusMillis(Time.now()).toMillis();
OpenKey.Builder builder = OpenKey.newBuilder();
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
index d418950bd5..b8fdffbd77 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
@@ -125,7 +125,7 @@ public class TestKeyManagerUnit {
metadataManager = omTestManagers.getMetadataManager();
keyManager = (KeyManagerImpl)omTestManagers.getKeyManager();
writeClient = omTestManagers.getWriteClient();
- startDate = Instant.now();
+ startDate = Instant.ofEpochMilli(Time.now());
}
@After
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 1ff17bce38..815a1b4baf 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
@@ -34,6 +34,7 @@ import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OpenKey;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OpenKeyBucket;
+import org.apache.hadoop.util.Time;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.io.TempDir;
@@ -48,7 +49,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import java.time.Instant;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -593,7 +593,7 @@ public class TestOmMetadataManager {
final Duration expireThreshold = Duration.ofMillis(expireThresholdMillis);
final long expiredOpenKeyCreationTime =
- Instant.now().minus(expireThreshold).toEpochMilli();
+ expireThreshold.negated().plusMillis(Time.now()).toMillis();
// Add expired keys to open key table.
// The method under test does not check for expired open keys in the
@@ -601,7 +601,7 @@ public class TestOmMetadataManager {
Set<String> expiredKeys = new HashSet<>();
for (int i = 0; i < numExpiredOpenKeys + numUnexpiredOpenKeys; i++) {
final long creationTime = i < numExpiredOpenKeys ?
- expiredOpenKeyCreationTime : Instant.now().toEpochMilli();
+ expiredOpenKeyCreationTime : Time.now();
final OmKeyInfo keyInfo = OMRequestTestUtils.createOmKeyInfo(volumeName,
bucketName, "expired" + i, HddsProtos.ReplicationType.RATIS,
HddsProtos.ReplicationFactor.ONE, 0L, creationTime);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org