SaketaChalamchala commented on code in PR #8964:
URL: https://github.com/apache/ozone/pull/8964#discussion_r2301296996
##########
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java:
##########
@@ -364,10 +384,103 @@ public void testSnapshotLimitWithFailures() throws
Exception {
assertEquals(OMException.ResultCodes.TOO_MANY_SNAPSHOTS,
omException.getResult());
}
- private void renameKey(String fromKey, String toKey, long offset)
+ @Test
+ public void testEntryDeletedTable() throws Exception {
+ when(getOzoneManager().isAdmin(any())).thenReturn(true);
+ Table<String, RepeatedOmKeyInfo> deletedTable =
getOmMetadataManager().getDeletedTable();
+
+ // 1. Create a second bucket with lexicographically higher name
+ String bucket1Name = getBucketName();
+ String bucket2Name = getBucketName() + "0";
+ String volumeName = getVolumeName();
+ OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucket2Name,
getOmMetadataManager());
+
+ // 2. Add and delete keys from both buckets
+ OmKeyInfo key1 = addKeyInBucket(volumeName, bucket1Name, "key1", 100L);
+ OmKeyInfo key2 = addKeyInBucket(volumeName, bucket2Name, "key2", 200L);
+ deleteKey(key1);
+ deleteKey(key2);
+
+ // 3. Verify deletedTable contains both deleted keys (2 rows)
+ assertEquals(2, getOmMetadataManager().countRowsInTable(deletedTable));
+
+ // 4. Create a snapshot on bucket1
+ createSnapshot(snapshotName1);
+
+ // 5. Verify deletedTable now only contains the key from bucket2 (1 row)
+ assertEquals(1, getOmMetadataManager().countRowsInTable(deletedTable));
+ // Verify the remaining entry is from bucket2
+ try (TableIterator<String, ? extends Table.KeyValue<String,
RepeatedOmKeyInfo>> iter = deletedTable.iterator()) {
+ iter.seekToFirst();
+ while (iter.hasNext()) {
+ String key = iter.next().getKey();
+
assertTrue(key.startsWith(getOmMetadataManager().getBucketKeyPrefix(volumeName,
bucket2Name)),
+ "Key should be from bucket2: " + key);
+ }
+ }
+
+
+ }
+
+ @Test
+ public void testEntryDeletedDirTable() throws Exception {
+ when(getOzoneManager().isAdmin(any())).thenReturn(true);
+ Table<String, OmKeyInfo> deletedDirTable =
getOmMetadataManager().getDeletedDirTable();
+
+ // 1. Create a second bucket with lexicographically higher name
+ String bucket1Name = getBucketName();
+ String bucket2Name = getBucketName() + "0";
+ String volumeName = getVolumeName();
+ OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucket2Name,
getOmMetadataManager());
+
+ // 2. Add and delete keys from both buckets
+ OmKeyInfo key1 = addKeyInBucket(volumeName, bucket1Name, "dir2", 100L);
+ OmKeyInfo key2 = addKeyInBucket(volumeName, bucket2Name, "dir20", 200L);
+ deleteDirectory(key1);
+ deleteDirectory(key2);
+
+ // 3. Verify deletedDirTable contains both deleted keys (2 rows)
+ assertEquals(2, getOmMetadataManager().countRowsInTable(deletedDirTable));
+
+ // 4. Create a snapshot on bucket1
+ createSnapshotForBucket(volumeName, bucket1Name, snapshotName1);
+
+ // 5. Verify deletedTable now only contains the key from bucket2 (1 row)
+ assertEquals(1, getOmMetadataManager().countRowsInTable(deletedDirTable));
+ // Verify the remaining entry is from bucket2
+ try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
iter = deletedDirTable.iterator()) {
+ while (iter.hasNext()) {
+ String key = iter.next().getKey();
+
assertTrue(key.startsWith(getOmMetadataManager().getBucketKeyPrefixFSO(volumeName,
bucket2Name)),
+ "Key should be from bucket2: " + key);
+ }
+ }
+ }
+
+ private void deleteDirectory(OmKeyInfo dirInfo) throws IOException {
+ String dirKey = getOmMetadataManager().getOzonePathKey(
+ getOmMetadataManager().getVolumeId(dirInfo.getVolumeName()),
+ getOmMetadataManager().getBucketId(dirInfo.getVolumeName(),
dirInfo.getBucketName()),
+ dirInfo.getParentObjectID(), dirInfo.getKeyName());
+ System.out.println("Deleting directory: " + dirKey);
Review Comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
