HDDS-10241. Improve the response for the Deleted Directories Insight …

…Endpoint. (apache#6124)

hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java

@@ -54,6 +54,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_FILE_TABLE;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_KEY_TABLE;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DELETED_TABLE;
@@ -536,8 +537,8 @@ private void getPendingForDeletionDirInfo(
           continue;
         }
         KeyEntityInfo keyEntityInfo = new KeyEntityInfo();
-        keyEntityInfo.setKey(key);
-        keyEntityInfo.setPath(omKeyInfo.getKeyName());
+        keyEntityInfo.setKey(omKeyInfo.getFileName());
+        keyEntityInfo.setPath(createPath(omKeyInfo));
         keyEntityInfo.setInStateSince(omKeyInfo.getCreationTime());
         keyEntityInfo.setSize(
             fetchSizeForDeletedDirectory(omKeyInfo.getObjectID()));
@@ -664,6 +665,12 @@ private void updateReplicatedAndUnReplicatedTotal(
     });
   }
 
+  private String createPath(OmKeyInfo omKeyInfo) {
+    return omKeyInfo.getVolumeName() + OM_KEY_PREFIX +
+        omKeyInfo.getBucketName() + OM_KEY_PREFIX + omKeyInfo.getKeyName();
+  }
+
+
   @VisibleForTesting
   public GlobalStatsDao getDao() {
     return this.globalStatsDao;

hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java

@@ -664,7 +664,7 @@ public void testGetDeletedDirInfoLimitParam() throws Exception {
     assertNotNull(keyInsightInfoResp);
     assertEquals(2,
         keyInsightInfoResp.getDeletedDirInfoList().size());
-    assertEquals("/sampleVol/bucketOne/dir_one",
+    assertEquals("dir_one",
         keyInsightInfoResp.getDeletedDirInfoList().get(0).getKey());
   }
 
@@ -696,7 +696,7 @@ public void testGetDeletedDirInfoPrevKeyParam() throws Exception {
     assertNotNull(keyInsightInfoResp);
     assertEquals(2,
         keyInsightInfoResp.getDeletedDirInfoList().size());
-    assertEquals("/sampleVol/bucketOne/dir_three",
+    assertEquals("dir_three",
         keyInsightInfoResp.getDeletedDirInfoList().get(0).getKey());
     assertEquals("/sampleVol/bucketOne/dir_two",
         keyInsightInfoResp.getLastKey());
@@ -729,7 +729,9 @@ public void testGetDeletedDirInfo() throws Exception {
     assertNotNull(keyInsightInfoResp);
     assertEquals(3,
         keyInsightInfoResp.getDeletedDirInfoList().size());
-    assertEquals("/sampleVol/bucketOne/dir_one",
+    assertEquals("sampleVol/bucketOne/dir_one", keyInsightInfoResp
+        .getDeletedDirInfoList().get(0).getPath());
+    assertEquals("dir_one",
         keyInsightInfoResp.getDeletedDirInfoList().get(0).getKey());
     assertEquals("/sampleVol/bucketOne/dir_two",
         keyInsightInfoResp.getLastKey());