From c8d8ee06ceb8ffce81549e71c4dd4db92cb80907 Mon Sep 17 00:00:00 2001 From: Siyao Meng <50227127+smengcl@users.noreply.github.com> Date: Wed, 6 Mar 2024 15:27:21 -0800 Subject: [PATCH 1/2] HDDS-10482. HDDS-10226 should set mod time for OMRequestTestUtils.createOmKeyInfo --- .../java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java | 1 + .../org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java | 1 + 2 files changed, 2 insertions(+) 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 15af3910e90f..312a76a35e00 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 @@ -698,6 +698,7 @@ private void testGetExpiredOpenKeysExcludeMPUKeys( RatisReplicationConfig.getInstance(ONE), new OmKeyLocationInfoGroup(0L, new ArrayList<>(), true)) .setCreationTime(expiredOpenKeyCreationTime) .build(); + assertTrue(keyInfo.getModificationTime() > 0L); final String uploadId = OMMultipartUploadUtils.getMultipartUploadId(); final OmMultipartKeyInfo multipartKeyInfo = OMRequestTestUtils. diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java index e85675e9b079..0ebd6946bd29 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java @@ -556,6 +556,7 @@ public static OmKeyInfo.Builder createOmKeyInfo(String volumeName, String bucket .setObjectID(0L) .setUpdateID(0L) .setCreationTime(Time.now()) + .setModificationTime(Time.now()) .addOmKeyLocationInfoGroup(omKeyLocationInfoGroup) .setDataSize(1000L); } From 61407c8ce93552b7d1480bf852274a8b1dd89e1a Mon Sep 17 00:00:00 2001 From: Siyao Meng <50227127+smengcl@users.noreply.github.com> Date: Wed, 6 Mar 2024 22:49:01 -0800 Subject: [PATCH 2/2] Address comment --- .../java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 312a76a35e00..1e2fb6a60a80 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 @@ -698,7 +698,7 @@ private void testGetExpiredOpenKeysExcludeMPUKeys( RatisReplicationConfig.getInstance(ONE), new OmKeyLocationInfoGroup(0L, new ArrayList<>(), true)) .setCreationTime(expiredOpenKeyCreationTime) .build(); - assertTrue(keyInfo.getModificationTime() > 0L); + assertThat(keyInfo.getModificationTime()).isPositive(); final String uploadId = OMMultipartUploadUtils.getMultipartUploadId(); final OmMultipartKeyInfo multipartKeyInfo = OMRequestTestUtils.