This is an automated email from the ASF dual-hosted git repository.
agupta 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 60e02bb28a HDDS-8453. KeyDeleting service should not reclaim snapshot
keys. (#5263)
60e02bb28a is described below
commit 60e02bb28a98e60ca3053e61494422558459d82f
Author: Sadanand Shenoy <[email protected]>
AuthorDate: Tue Sep 12 14:11:13 2023 +0530
HDDS-8453. KeyDeleting service should not reclaim snapshot keys. (#5263)
---
.../hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java | 9 +++++++--
.../java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java | 2 +-
.../hadoop/ozone/om/service/AbstractKeyDeletingService.java | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
index 9e77870125..d5c042bb03 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
@@ -43,7 +43,6 @@ import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
import org.apache.ozone.test.GenericTestUtils;
-import org.apache.ozone.test.tag.Flaky;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -381,7 +380,6 @@ public class TestDirectoryDeletingServiceWithFSO {
}
@Test
- @Flaky("HDDS-8453")
public void testDirDeletedTableCleanUpForSnapshot() throws Exception {
Table<String, OmKeyInfo> deletedDirTable =
cluster.getOzoneManager().getMetadataManager().getDeletedDirTable();
@@ -450,6 +448,13 @@ public class TestDirectoryDeletingServiceWithFSO {
assertTableRowCount(keyTable, 5);
assertTableRowCount(dirTable, 5);
+ long prevKdsRunCount = keyDeletingService.getRunCount().get();
+
+ // wait for at least 1 iteration of KeyDeletingService
+ GenericTestUtils.waitFor(
+ () -> (keyDeletingService.getRunCount().get() > prevKdsRunCount), 100,
+ 10000);
+
// KeyDeletingService and DirectoryDeletingService will not
// clean up because the paths are part of a snapshot.
assertTableRowCount(deletedDirTable, 0);
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 b96bf72888..2aee67e91c 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
@@ -1568,7 +1568,7 @@ public class OmMetadataManagerImpl implements
OMMetadataManager,
prevKeyTableDBKey = getOzonePathKey(volumeId,
bucketInfo.getObjectID(),
info.getParentObjectID(),
- info.getKeyName());
+ info.getFileName());
} else if (prevKeyTableDBKey == null) {
prevKeyTableDBKey = getOzoneKey(info.getVolumeName(),
info.getBucketName(),
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
index 7482919ef1..a966b9a60e 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
@@ -502,7 +502,7 @@ public abstract class AbstractKeyDeletingService extends
BackgroundService
volumeId,
bucketInfo.getObjectID(),
deletedKeyInfo.getParentObjectID(),
- deletedKeyInfo.getKeyName());
+ deletedKeyInfo.getFileName());
} else {
dbKey = ozoneManager.getMetadataManager().getOzoneKey(
deletedKeyInfo.getVolumeName(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
