From 09bfba34659581cdf531238c43e58c94621c73ee Mon Sep 17 00:00:00 2001 From: arafat Date: Tue, 1 Oct 2024 13:37:01 +0530 Subject: [PATCH 1/2] HDDS-11518. [Ozone][Om DBinsights] iskey Metadata info is hardcoded to true. --- .../org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java | 3 +++ .../hadoop/ozone/recon/api/OMDBInsightSearchEndpoint.java | 1 + .../org/apache/hadoop/ozone/recon/api/types/KeyEntityInfo.java | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) 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 index 4620b69fbe33..5e278a21f3f3 100644 --- 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/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightSearchEndpoint.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightSearchEndpoint.java index 58d2cd31076e..16b5f20b1206 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightSearchEndpoint.java +++ b/hadoop-ozone/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 index d7cd35991909..6f251bb1f3cc 100644 --- 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) { + public void setIsKey(boolean key) { isKey = key; } } From 594bfc99d49fbf9346a7ed49c0efe02e5184c9e0 Mon Sep 17 00:00:00 2001 From: arafat Date: Tue, 1 Oct 2024 13:45:33 +0530 Subject: [PATCH 2/2] Fixed checkstyle issues --- .../apache/hadoop/ozone/recon/api/types/KeyEntityInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 6f251bb1f3cc..8a56cbbd33f0 100644 --- 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 setIsKey(boolean key) { - isKey = key; + public void setIsKey(boolean isKey) { + this.isKey = isKey; } }