HDDS-11518. Recon OmDB Insights show isKey=true for directories (apac…

…he#7260)
aswinshakil · Oct 3, 2024 · 8747c0e · 8747c0e
1 parent 5d2bbc3
commit 8747c0e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java
@@ -235,6 +235,7 @@ public Response getOpenKeyInfo(
             continue;
           }
           KeyEntityInfo keyEntityInfo = new KeyEntityInfo();
+          keyEntityInfo.setIsKey(omKeyInfo.isFile());
           keyEntityInfo.setKey(key);
           keyEntityInfo.setPath(omKeyInfo.getKeyName());
           keyEntityInfo.setInStateSince(omKeyInfo.getCreationTime());
@@ -549,6 +550,7 @@ private void getPendingForDeletionDirInfo(
           continue;
         }
         KeyEntityInfo keyEntityInfo = new KeyEntityInfo();
+        keyEntityInfo.setIsKey(omKeyInfo.isFile());
         keyEntityInfo.setKey(omKeyInfo.getFileName());
         keyEntityInfo.setPath(createPath(omKeyInfo));
         keyEntityInfo.setInStateSince(omKeyInfo.getCreationTime());
@@ -1257,6 +1259,7 @@ private KeyEntityInfo createKeyEntityInfoFromOmKeyInfo(String dbKey,
                                                          OmKeyInfo keyInfo) throws IOException {
     KeyEntityInfo keyEntityInfo = new KeyEntityInfo();
     keyEntityInfo.setKey(dbKey); // Set the DB key
+    keyEntityInfo.setIsKey(keyInfo.isFile());
     keyEntityInfo.setPath(ReconUtils.constructFullPath(keyInfo, reconNamespaceSummaryManager,
         omMetadataManager));
     keyEntityInfo.setSize(keyInfo.getDataSize());

diff --git a/...zone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightSearchEndpoint.java b/...zone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightSearchEndpoint.java
@@ -380,6 +380,7 @@ private KeyEntityInfo createKeyEntityInfoFromOmKeyInfo(String dbKey,
                                                          OmKeyInfo keyInfo) {
     KeyEntityInfo keyEntityInfo = new KeyEntityInfo();
     keyEntityInfo.setKey(dbKey); // Set the DB key
+    keyEntityInfo.setIsKey(keyInfo.isFile());
     keyEntityInfo.setPath(keyInfo.getKeyName()); // Assuming path is the same as key name
     keyEntityInfo.setInStateSince(keyInfo.getCreationTime());
     keyEntityInfo.setSize(keyInfo.getDataSize());

diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/KeyEntityInfo.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/KeyEntityInfo.java
@@ -143,7 +143,7 @@ public boolean isKey() {
     return isKey;
   }
 
-  public void setKey(boolean key) {
-    isKey = key;
+  public void setIsKey(boolean isKey) {
+    this.isKey = isKey;
   }
 }