arp7 commented on a change in pull request #1196:
URL: https://github.com/apache/hadoop-ozone/pull/1196#discussion_r456631870
##########
File path:
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequest.java
##########
@@ -327,7 +344,164 @@ private OMRequest createKeyRequest(boolean
isMultipartKey, int partNumber) {
.setCmdType(OzoneManagerProtocolProtos.Type.CreateKey)
.setClientId(UUID.randomUUID().toString())
.setCreateKeyRequest(createKeyRequest).build();
+ }
+
+ @Test
+ public void testKeyCreateWithFileSystemPathsEnabled() throws Exception {
+
+ OzoneConfiguration configuration = new OzoneConfiguration();
+ configuration.setBoolean(OZONE_OM_ENABLE_FILESYSTEM_PATHS, true);
+ when(ozoneManager.getConfiguration()).thenReturn(configuration);
+ when(ozoneManager.getEnableFileSystemPaths()).thenReturn(true);
+
+ // Add volume and bucket entries to DB.
+ addVolumeAndBucketToDB(volumeName, bucketName,
+ omMetadataManager);
+
+
+ keyName = "dir1/dir2/dir3/file1";
+ createAndCheck(keyName);
+
+ // Key with leading '/'.
+ String keyName = "/a/b/c/file1";
+ createAndCheck(keyName);
+
+ // Commit openKey entry.
+ TestOMRequestUtils.addKeyToTable(false, volumeName, bucketName,
+ keyName.substring(1), 0L, RATIS, THREE, omMetadataManager);
+
+ // Now create another file in same dir path.
+ keyName = "/a/b/c/file2";
+ createAndCheck(keyName);
+
+ // Create key with multiple /'s
+ // converted to a/b/c/file5
+ keyName = "///a/b///c///file5";
+ createAndCheck(keyName);
+
+ // converted to a/b/c/.../file3
+ keyName = "///a/b///c//.../file3";
+ createAndCheck(keyName);
+
+ // converted to r1/r2
+ keyName = "././r1/r2/";
+ createAndCheck(keyName);
+
+ // converted to ..d1/d2/d3
+ keyName = "..d1/d2/d3/";
+ createAndCheck(keyName);
+
+ // Create a file, where a file already exists in the path.
+ // Now try with a file exists in path. Should fail.
+ keyName = "/a/b/c/file1/file3";
+ checkNotAFile(keyName);
+
+ // Empty keyName.
+ keyName = "";
+ checkNotAValidPath(keyName);
+
+ // Key name ends with /
+ keyName = "/a/./";
+ checkNotAValidPath(keyName);
+
+ keyName = "/////";
+ checkNotAValidPath(keyName);
+
+ keyName = "../../b/c";
+ checkNotAValidPath(keyName);
+
+ keyName = "../../b/c/";
+ checkNotAValidPath(keyName);
+
+ keyName = "../../b:/c/";
+ checkNotAValidPath(keyName);
+
+ keyName = ":/c/";
+ checkNotAValidPath(keyName);
+
+ keyName = "";
+ checkNotAValidPath(keyName);
+
+ }
+
+ private void checkNotAValidPath(String keyName) {
+ OMRequest omRequest = createKeyRequest(false, 0, keyName);
+ OMKeyCreateRequest omKeyCreateRequest = new OMKeyCreateRequest(omRequest);
+
+ try {
+ omKeyCreateRequest.preExecute(ozoneManager);
+ fail("checkNotAValidPath failed for path" + keyName);
+ } catch (IOException ex) {
+ Assert.assertTrue(ex instanceof OMException);
+ OMException omException = (OMException) ex;
+ Assert.assertEquals(OMException.ResultCodes.INVALID_KEY_NAME,
+ omException.getResult());
+ }
+
+
+ }
+ private void checkNotAFile(String keyName) throws Exception {
+ OMRequest omRequest = createKeyRequest(false, 0, keyName);
+
+ OMKeyCreateRequest omKeyCreateRequest = new OMKeyCreateRequest(omRequest);
+
+ omRequest = omKeyCreateRequest.preExecute(ozoneManager);
+
+ omKeyCreateRequest = new OMKeyCreateRequest(omRequest);
+
+ OMClientResponse omClientResponse =
+ omKeyCreateRequest.validateAndUpdateCache(ozoneManager,
+ 101L, ozoneManagerDoubleBufferHelper);
+
+ Assert.assertEquals(NOT_A_FILE,
+ omClientResponse.getOMResponse().getStatus());
+ }
+
+
+ private void createAndCheck(String keyName) throws Exception {
+ OMRequest omRequest = createKeyRequest(false, 0, keyName);
+
+ OMKeyCreateRequest omKeyCreateRequest = new OMKeyCreateRequest(omRequest);
+
+ omRequest = omKeyCreateRequest.preExecute(ozoneManager);
+
+ omKeyCreateRequest = new OMKeyCreateRequest(omRequest);
+
+ OMClientResponse omClientResponse =
+ omKeyCreateRequest.validateAndUpdateCache(ozoneManager,
+ 101L, ozoneManagerDoubleBufferHelper);
+
+ Assert.assertEquals(OK, omClientResponse.getOMResponse().getStatus());
+
+ checkCreatedPaths(omKeyCreateRequest, omRequest, keyName);
+ }
+
+ private void checkCreatedPaths(OMKeyCreateRequest omKeyCreateRequest,
+ OMRequest omRequest, String keyName) throws Exception {
+ keyName = omKeyCreateRequest.validateAndNormalizeKey(true, keyName);
Review comment:
Let's add a separate test case for `validateAndNormalizeKey` itself. All
it does is call `validateAndNormalizeKey` with bunch of hard-coded input and
asserts on the expected output.
##########
File path:
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequest.java
##########
@@ -327,7 +344,164 @@ private OMRequest createKeyRequest(boolean
isMultipartKey, int partNumber) {
.setCmdType(OzoneManagerProtocolProtos.Type.CreateKey)
.setClientId(UUID.randomUUID().toString())
.setCreateKeyRequest(createKeyRequest).build();
+ }
+
+ @Test
+ public void testKeyCreateWithFileSystemPathsEnabled() throws Exception {
+
+ OzoneConfiguration configuration = new OzoneConfiguration();
+ configuration.setBoolean(OZONE_OM_ENABLE_FILESYSTEM_PATHS, true);
+ when(ozoneManager.getConfiguration()).thenReturn(configuration);
+ when(ozoneManager.getEnableFileSystemPaths()).thenReturn(true);
+
+ // Add volume and bucket entries to DB.
+ addVolumeAndBucketToDB(volumeName, bucketName,
+ omMetadataManager);
+
+
+ keyName = "dir1/dir2/dir3/file1";
+ createAndCheck(keyName);
+
+ // Key with leading '/'.
+ String keyName = "/a/b/c/file1";
+ createAndCheck(keyName);
+
+ // Commit openKey entry.
+ TestOMRequestUtils.addKeyToTable(false, volumeName, bucketName,
+ keyName.substring(1), 0L, RATIS, THREE, omMetadataManager);
+
+ // Now create another file in same dir path.
+ keyName = "/a/b/c/file2";
+ createAndCheck(keyName);
+
+ // Create key with multiple /'s
+ // converted to a/b/c/file5
+ keyName = "///a/b///c///file5";
+ createAndCheck(keyName);
+
+ // converted to a/b/c/.../file3
+ keyName = "///a/b///c//.../file3";
+ createAndCheck(keyName);
+
+ // converted to r1/r2
+ keyName = "././r1/r2/";
+ createAndCheck(keyName);
+
+ // converted to ..d1/d2/d3
+ keyName = "..d1/d2/d3/";
+ createAndCheck(keyName);
+
+ // Create a file, where a file already exists in the path.
+ // Now try with a file exists in path. Should fail.
+ keyName = "/a/b/c/file1/file3";
+ checkNotAFile(keyName);
+
+ // Empty keyName.
+ keyName = "";
+ checkNotAValidPath(keyName);
+
+ // Key name ends with /
+ keyName = "/a/./";
+ checkNotAValidPath(keyName);
+
+ keyName = "/////";
+ checkNotAValidPath(keyName);
+
+ keyName = "../../b/c";
+ checkNotAValidPath(keyName);
+
+ keyName = "../../b/c/";
+ checkNotAValidPath(keyName);
+
+ keyName = "../../b:/c/";
+ checkNotAValidPath(keyName);
+
+ keyName = ":/c/";
+ checkNotAValidPath(keyName);
+
+ keyName = "";
+ checkNotAValidPath(keyName);
+
+ }
+
+ private void checkNotAValidPath(String keyName) {
+ OMRequest omRequest = createKeyRequest(false, 0, keyName);
+ OMKeyCreateRequest omKeyCreateRequest = new OMKeyCreateRequest(omRequest);
+
+ try {
+ omKeyCreateRequest.preExecute(ozoneManager);
+ fail("checkNotAValidPath failed for path" + keyName);
+ } catch (IOException ex) {
+ Assert.assertTrue(ex instanceof OMException);
+ OMException omException = (OMException) ex;
+ Assert.assertEquals(OMException.ResultCodes.INVALID_KEY_NAME,
+ omException.getResult());
+ }
+
+
+ }
+ private void checkNotAFile(String keyName) throws Exception {
+ OMRequest omRequest = createKeyRequest(false, 0, keyName);
+
+ OMKeyCreateRequest omKeyCreateRequest = new OMKeyCreateRequest(omRequest);
+
+ omRequest = omKeyCreateRequest.preExecute(ozoneManager);
+
+ omKeyCreateRequest = new OMKeyCreateRequest(omRequest);
+
+ OMClientResponse omClientResponse =
+ omKeyCreateRequest.validateAndUpdateCache(ozoneManager,
+ 101L, ozoneManagerDoubleBufferHelper);
+
+ Assert.assertEquals(NOT_A_FILE,
+ omClientResponse.getOMResponse().getStatus());
+ }
+
+
+ private void createAndCheck(String keyName) throws Exception {
+ OMRequest omRequest = createKeyRequest(false, 0, keyName);
+
+ OMKeyCreateRequest omKeyCreateRequest = new OMKeyCreateRequest(omRequest);
+
+ omRequest = omKeyCreateRequest.preExecute(ozoneManager);
+
+ omKeyCreateRequest = new OMKeyCreateRequest(omRequest);
+
+ OMClientResponse omClientResponse =
+ omKeyCreateRequest.validateAndUpdateCache(ozoneManager,
+ 101L, ozoneManagerDoubleBufferHelper);
+
+ Assert.assertEquals(OK, omClientResponse.getOMResponse().getStatus());
+
+ checkCreatedPaths(omKeyCreateRequest, omRequest, keyName);
+ }
+
+ private void checkCreatedPaths(OMKeyCreateRequest omKeyCreateRequest,
+ OMRequest omRequest, String keyName) throws Exception {
+ keyName = omKeyCreateRequest.validateAndNormalizeKey(true, keyName);
+ // Check intermediate directories created or not.
+ Path keyPath = Paths.get(keyName);
+ checkIntermediatePaths(keyPath);
Review comment:
Nice!
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: ozone-issues-h...@hadoop.apache.org
