You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ss...@apache.org on 2023/02/22 11:17:30 UTC
[ozone] branch master updated: HDDS-7993. [snapshot] Add testcase to handle snapshot name minimum-length (#4293)
This is an automated email from the ASF dual-hosted git repository.
sshenoy 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 6b1c62a88f HDDS-7993. [snapshot] Add testcase to handle snapshot name minimum-length (#4293)
6b1c62a88f is described below
commit 6b1c62a88f1270b50fff3c445b85c9e07825fc39
Author: jyotirmoy-gh <69...@users.noreply.github.com>
AuthorDate: Wed Feb 22 16:47:24 2023 +0530
HDDS-7993. [snapshot] Add testcase to handle snapshot name minimum-length (#4293)
---
.../org/apache/hadoop/fs/ozone/TestOzoneFsSnapshot.java | 10 ++++++++--
.../om/request/snapshot/TestOMSnapshotCreateRequest.java | 16 ++++++++++++++++
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsSnapshot.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsSnapshot.java
index dcbdebf9bf..4a1bf5a278 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsSnapshot.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsSnapshot.java
@@ -144,7 +144,8 @@ public class TestOzoneFsSnapshot {
*/
@ParameterizedTest
@ValueSource(strings = {"snap-1",
- "snap75795657617173401188448010125899089001363595171500499231286"})
+ "snap75795657617173401188448010125899089001363595171500499231286",
+ "sn1"})
public void testCreateSnapshotSuccess(String snapshotName)
throws Exception {
int res = ToolRunner.run(shell,
@@ -190,7 +191,12 @@ public class TestOzoneFsSnapshot {
"",
"",
"Can not create a Path from an empty string",
- -1)
+ -1),
+ Arguments.of("6th case: snapshot name length is less than 3 chars",
+ BUCKET_PATH,
+ "s1",
+ "Invalid snapshot name",
+ 1)
);
}
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java
index 972920e46d..c029ea39e3 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java
@@ -167,6 +167,8 @@ public class TestOMSnapshotCreateRequest {
"snap75795657617173401188448010125899089001363595171500499231286";
String name64 =
"snap156808943643007724443266605711479126926050896107709081166294";
+ String name2 = "s1";
+ String name3 = "sn1";
// name length = 63
when(ozoneManager.isOwner(any(), any())).thenReturn(true);
@@ -181,6 +183,20 @@ public class TestOMSnapshotCreateRequest {
LambdaTestUtils.intercept(OMException.class,
"Invalid snapshot name: " + name64,
() -> doPreExecute(omRequest2));
+
+ // name length = 3
+ when(ozoneManager.isOwner(any(), any())).thenReturn(true);
+ OMRequest omRequest3 = OMRequestTestUtils.createSnapshotRequest(
+ volumeName, bucketName, name3);
+ // should not throw any error
+ doPreExecute(omRequest3);
+
+ // name length = 2
+ OMRequest omRequest4 = OMRequestTestUtils.createSnapshotRequest(
+ volumeName, bucketName, name2);
+ LambdaTestUtils.intercept(OMException.class,
+ "Invalid snapshot name: " + name2,
+ () -> doPreExecute(omRequest4));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org