make lookupKey work for directory path.

apache · Aug 13, 2020 · 3cecfc1 · 3cecfc1
1 parent bf4456b
commit 3cecfc1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java b/...-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java
@@ -47,6 +47,7 @@
 import org.apache.hadoop.ozone.om.OMConfigKeys;
 import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
 import org.apache.hadoop.ozone.om.helpers.OpenKeySession;
+import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.test.GenericTestUtils;
 
@@ -320,9 +321,11 @@ private void testDeleteCreatesFakeParentDir() throws Exception {
 
     // Deleting the only child should create the parent dir key if it does
     // not exist
-    String parentKey = o3fs.pathToKey(parent) + "/";
-    OzoneKeyDetails parentKeyInfo = getKey(parent, true);
-    assertEquals(parentKey, parentKeyInfo.getName());
+    String parentKey = o3fs.pathToKey(parent);
+    OzoneFileStatus fileStatus =
+        cluster.getClient().getObjectStore().getVolume(volumeName)
+        .getBucket(bucketName).getFileStatus(parentKey);
+    assertEquals(parent.toString(), fileStatus.getPath());
   }
 
 

diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -654,7 +654,6 @@ public OmKeyInfo lookupKey(OmKeyArgs args, String clientAddress)
     String keyName = OMClientRequest.validateAndNormalizeKey(
         enableFileSystemPaths, args.getKeyName());
 
-
     metadataManager.getLock().acquireReadLock(BUCKET_LOCK, volumeName,
         bucketName);
     OmKeyInfo value = null;