ashishkumar50 commented on code in PR #4675:
URL: https://github.com/apache/ozone/pull/4675#discussion_r1188487743
##########
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java:
##########
@@ -1124,6 +1129,127 @@ public void
testCreateBucketWithECReplicationConfigWithoutReplicationParam() {
}
}
+
+ @Test
+ public void testKeyDeleteOrSkipTrashWhenTrashEnableFSO()
+ throws UnsupportedEncodingException {
+ // Create 100 keys
+ generateKeys("/volumefso1", "/bucket1",
+ BucketLayout.FILE_SYSTEM_OPTIMIZED.toString());
+
+ // Enable trash
+ String trashConfKey = generateSetConfString(
+ OMConfigKeys.OZONE_FS_TRASH_INTERVAL_KEY, "1");
+ String[] args =
+ new String[] {trashConfKey, "key", "delete",
+ "/volumefso1/bucket1/key4"};
+
+ // Delete one key from FSO bucket
+ execute(ozoneShell, args);
+
+ // Get key list in .Trash path
+ String prefixKey = "--prefix=.Trash";
+ args = new String[] {"key", "list", prefixKey, "o3://" +
+ omServiceId + "/volumefso1/bucket1/"};
+ out.reset();
+ execute(ozoneShell, args);
+
+ // One key should be present in .Trash
+ Assert.assertEquals(1, getNumOfKeys());
+
+ args = new String[] {"key", "list", "o3://" + omServiceId +
+ "/volumefso1/bucket1/", "-l ", "110"};
+ out.reset();
+ execute(ozoneShell, args);
+
+ // Total number of keys still 100.
+ Assert.assertEquals(100, getNumOfKeys());
+
+ // Skip Trash
+ args = new String[] {trashConfKey, "key", "delete",
+ "/volumefso1/bucket1/key5", "--skipTrash"};
+ execute(ozoneShell, args);
+
+ // .Trash should still contain 1 key
+ prefixKey = "--prefix=.Trash";
+ args = new String[] {"key", "list", prefixKey, "o3://" +
+ omServiceId + "/volumefso1/bucket1/"};
+ out.reset();
+ execute(ozoneShell, args);
+ Assert.assertEquals(1, getNumOfKeys());
+
+ args = new String[] {"key", "list", "o3://" + omServiceId +
+ "/volumefso1/bucket1/", "-l ", "110"};
+ out.reset();
+ execute(ozoneShell, args);
+ // Total number of keys now will be 99 as
+ // 1 key deleted without trash
+ Assert.assertEquals(99, getNumOfKeys());
Review Comment:
Added test for this.
--
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]
