From 0332cb2ef8ae249f8c8dae7bdff257f79043653b Mon Sep 17 00:00:00 2001 From: arafat Date: Fri, 10 Feb 2023 13:59:13 +0530 Subject: [PATCH 1/9] HDDS-7926. [hsync] Recon throws ClassCastException. --- .../ozone/recon/tasks/FileSizeCountTask.java | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java index 03ff12349749..c32877fc2afd 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java @@ -26,6 +26,7 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.hdds.utils.db.TableIterator; +import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; import org.apache.hadoop.ozone.recon.ReconUtils; import org.hadoop.ozone.recon.schema.UtilizationSchemaDefinition; import org.hadoop.ozone.recon.schema.tables.daos.FileCountBySizeDao; @@ -122,28 +123,46 @@ public Pair process(OMUpdateEventBatch events) { final Collection taskTables = getTaskTables(); while (eventIterator.hasNext()) { - OMDBUpdateEvent omdbUpdateEvent = eventIterator.next(); + OMDBUpdateEvent omdbUpdateEvent = eventIterator.next(); // Filter event inside process method to avoid duping if (!taskTables.contains(omdbUpdateEvent.getTable())) { continue; } String updatedKey = omdbUpdateEvent.getKey(); - OmKeyInfo omKeyInfo = omdbUpdateEvent.getValue(); + + // Get the updated and old OM Key Info objects + Object omKeyInfo = omdbUpdateEvent.getValue(); + Object oldOmKeyInfo = omdbUpdateEvent.getOldValue(); + + OmKeyInfo keyInfo, oldKeyInfo; + // Handle the case where the updated OM Key Info is a RepeatedOmKeyInfo object + if (omKeyInfo instanceof RepeatedOmKeyInfo) { + // Handle RepeatedOmKeyInfo object + RepeatedOmKeyInfo repeatedKeyInfo = (RepeatedOmKeyInfo) omKeyInfo; + keyInfo = repeatedKeyInfo.getOmKeyInfoList().get(0); + oldKeyInfo = repeatedKeyInfo.getOmKeyInfoList().get(0); + } + // Handle the case where the updated OM Key Info is an OmKeyInfo object + else { + // Handle OmKeyInfo object + keyInfo = (OmKeyInfo) omKeyInfo; + oldKeyInfo = (OmKeyInfo) oldOmKeyInfo; + } try { switch (omdbUpdateEvent.getAction()) { case PUT: - handlePutKeyEvent(omKeyInfo, fileSizeCountMap); + handlePutKeyEvent(keyInfo, fileSizeCountMap); break; case DELETE: - handleDeleteKeyEvent(updatedKey, omKeyInfo, fileSizeCountMap); + handleDeleteKeyEvent(updatedKey, keyInfo, fileSizeCountMap); break; case UPDATE: - handleDeleteKeyEvent(updatedKey, omdbUpdateEvent.getOldValue(), + handleDeleteKeyEvent(updatedKey, oldKeyInfo, fileSizeCountMap); - handlePutKeyEvent(omKeyInfo, fileSizeCountMap); + handlePutKeyEvent(keyInfo, fileSizeCountMap); break; default: LOG.trace("Skipping DB update event : {}", From c4494155e78f3686f8c2368b01b7e36c2d4b3a03 Mon Sep 17 00:00:00 2001 From: arafat Date: Mon, 13 Feb 2023 13:17:44 +0530 Subject: [PATCH 2/9] Made review changes --- .../ozone/recon/tasks/FileSizeCountTask.java | 85 +++++++++++-------- 1 file changed, 51 insertions(+), 34 deletions(-) diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java index c32877fc2afd..11128a5c877a 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java @@ -128,55 +128,72 @@ public Pair process(OMUpdateEventBatch events) { if (!taskTables.contains(omdbUpdateEvent.getTable())) { continue; } + OMDBUpdateEvent.OMDBUpdateAction event = omdbUpdateEvent.getAction(); String updatedKey = omdbUpdateEvent.getKey(); - - // Get the updated and old OM Key Info objects Object omKeyInfo = omdbUpdateEvent.getValue(); Object oldOmKeyInfo = omdbUpdateEvent.getOldValue(); - OmKeyInfo keyInfo, oldKeyInfo; - // Handle the case where the updated OM Key Info is a RepeatedOmKeyInfo object + List omKeyInfoList, oldOmKeyInfoList; if (omKeyInfo instanceof RepeatedOmKeyInfo) { // Handle RepeatedOmKeyInfo object RepeatedOmKeyInfo repeatedKeyInfo = (RepeatedOmKeyInfo) omKeyInfo; - keyInfo = repeatedKeyInfo.getOmKeyInfoList().get(0); - oldKeyInfo = repeatedKeyInfo.getOmKeyInfoList().get(0); - } - // Handle the case where the updated OM Key Info is an OmKeyInfo object - else { + RepeatedOmKeyInfo repeatedOldKeyInfo = (RepeatedOmKeyInfo) oldOmKeyInfo; + omKeyInfoList = repeatedKeyInfo.getOmKeyInfoList(); + oldOmKeyInfoList = repeatedOldKeyInfo.getOmKeyInfoList(); + int size = Math.min(omKeyInfoList.size(), oldOmKeyInfoList.size()); + for (int i = 0; i < size; i++) { + OmKeyInfo keyInfo = omKeyInfoList.get(i); + OmKeyInfo oldKeyInfo = oldOmKeyInfoList.get(i); + if (!processEvent(updatedKey, keyInfo, oldKeyInfo, event, + fileSizeCountMap)) { + return new ImmutablePair<>(getTaskName(), false); + } + } + } else { // Handle OmKeyInfo object - keyInfo = (OmKeyInfo) omKeyInfo; - oldKeyInfo = (OmKeyInfo) oldOmKeyInfo; + OmKeyInfo keyInfo = (OmKeyInfo) omKeyInfo; + OmKeyInfo oldKeyInfo = (OmKeyInfo) oldOmKeyInfo; + if (!processEvent(updatedKey, keyInfo, oldKeyInfo, event, + fileSizeCountMap)) { + return new ImmutablePair<>(getTaskName(), false); + } } + } + writeCountsToDB(false, fileSizeCountMap); + LOG.info("Completed a 'process' run of FileSizeCountTask."); + return new ImmutablePair<>(getTaskName(), true); + } - try { - switch (omdbUpdateEvent.getAction()) { - case PUT: - handlePutKeyEvent(keyInfo, fileSizeCountMap); - break; + public boolean processEvent(String updatedKey, OmKeyInfo keyInfo, + OmKeyInfo oldKeyInfo, + OMDBUpdateEvent.OMDBUpdateAction event, + Map fileSizeCountMap) { + try { + switch (event) { + case PUT: + handlePutKeyEvent(keyInfo, fileSizeCountMap); + break; - case DELETE: - handleDeleteKeyEvent(updatedKey, keyInfo, fileSizeCountMap); - break; + case DELETE: + handleDeleteKeyEvent(updatedKey, keyInfo, fileSizeCountMap); + break; - case UPDATE: - handleDeleteKeyEvent(updatedKey, oldKeyInfo, - fileSizeCountMap); - handlePutKeyEvent(keyInfo, fileSizeCountMap); - break; + case UPDATE: + handleDeleteKeyEvent(updatedKey, oldKeyInfo, + fileSizeCountMap); + handlePutKeyEvent(keyInfo, fileSizeCountMap); + break; - default: LOG.trace("Skipping DB update event : {}", - omdbUpdateEvent.getAction()); - } - } catch (Exception e) { - LOG.error("Unexpected exception while processing key {}.", - updatedKey, e); - return new ImmutablePair<>(getTaskName(), false); + default: + LOG.trace("Skipping DB update event : {}", + event); } + } catch (Exception e) { + LOG.error("Unexpected exception while processing key {}.", + updatedKey, e); + return false; } - writeCountsToDB(false, fileSizeCountMap); - LOG.info("Completed a 'process' run of FileSizeCountTask."); - return new ImmutablePair<>(getTaskName(), true); + return true; } /** From 84a1e600c6d485080f3564f2c8b54ca0b9aebda1 Mon Sep 17 00:00:00 2001 From: arafat Date: Sun, 19 Feb 2023 12:02:36 +0530 Subject: [PATCH 3/9] Made changes to ignore the RepeatedOmKeyInfo object --- .../ozone/recon/tasks/FileSizeCountTask.java | 88 +++++++------------ 1 file changed, 30 insertions(+), 58 deletions(-) diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java index 11128a5c877a..2e553761c1dc 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java @@ -26,7 +26,6 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.hdds.utils.db.TableIterator; -import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; import org.apache.hadoop.ozone.recon.ReconUtils; import org.hadoop.ozone.recon.schema.UtilizationSchemaDefinition; import org.hadoop.ozone.recon.schema.tables.daos.FileCountBySizeDao; @@ -123,40 +122,45 @@ public Pair process(OMUpdateEventBatch events) { final Collection taskTables = getTaskTables(); while (eventIterator.hasNext()) { - OMDBUpdateEvent omdbUpdateEvent = eventIterator.next(); + OMDBUpdateEvent omdbUpdateEvent = eventIterator.next(); // Filter event inside process method to avoid duping if (!taskTables.contains(omdbUpdateEvent.getTable())) { continue; } - OMDBUpdateEvent.OMDBUpdateAction event = omdbUpdateEvent.getAction(); String updatedKey = omdbUpdateEvent.getKey(); - Object omKeyInfo = omdbUpdateEvent.getValue(); - Object oldOmKeyInfo = omdbUpdateEvent.getOldValue(); + Object value = omdbUpdateEvent.getValue(); - List omKeyInfoList, oldOmKeyInfoList; - if (omKeyInfo instanceof RepeatedOmKeyInfo) { - // Handle RepeatedOmKeyInfo object - RepeatedOmKeyInfo repeatedKeyInfo = (RepeatedOmKeyInfo) omKeyInfo; - RepeatedOmKeyInfo repeatedOldKeyInfo = (RepeatedOmKeyInfo) oldOmKeyInfo; - omKeyInfoList = repeatedKeyInfo.getOmKeyInfoList(); - oldOmKeyInfoList = repeatedOldKeyInfo.getOmKeyInfoList(); - int size = Math.min(omKeyInfoList.size(), oldOmKeyInfoList.size()); - for (int i = 0; i < size; i++) { - OmKeyInfo keyInfo = omKeyInfoList.get(i); - OmKeyInfo oldKeyInfo = oldOmKeyInfoList.get(i); - if (!processEvent(updatedKey, keyInfo, oldKeyInfo, event, - fileSizeCountMap)) { - return new ImmutablePair<>(getTaskName(), false); + if (value instanceof OmKeyInfo) { + OmKeyInfo omKeyInfo = (OmKeyInfo) value; + + try { + switch (omdbUpdateEvent.getAction()) { + case PUT: + handlePutKeyEvent(omKeyInfo, fileSizeCountMap); + break; + + case DELETE: + handleDeleteKeyEvent(updatedKey, omKeyInfo, fileSizeCountMap); + break; + + case UPDATE: + handleDeleteKeyEvent(updatedKey, omdbUpdateEvent.getOldValue(), + fileSizeCountMap); + handlePutKeyEvent(omKeyInfo, fileSizeCountMap); + break; + + default: + LOG.trace("Skipping DB update event : {}", + omdbUpdateEvent.getAction()); } - } - } else { - // Handle OmKeyInfo object - OmKeyInfo keyInfo = (OmKeyInfo) omKeyInfo; - OmKeyInfo oldKeyInfo = (OmKeyInfo) oldOmKeyInfo; - if (!processEvent(updatedKey, keyInfo, oldKeyInfo, event, - fileSizeCountMap)) { + } catch (Exception e) { + LOG.error("Unexpected exception while processing key {}.", + updatedKey, e); return new ImmutablePair<>(getTaskName(), false); } + } else { + LOG.warn("Unexpected value type {} for key {}. Skipping processing.", + value.getClass().getName(), updatedKey); } } writeCountsToDB(false, fileSizeCountMap); @@ -164,38 +168,6 @@ public Pair process(OMUpdateEventBatch events) { return new ImmutablePair<>(getTaskName(), true); } - public boolean processEvent(String updatedKey, OmKeyInfo keyInfo, - OmKeyInfo oldKeyInfo, - OMDBUpdateEvent.OMDBUpdateAction event, - Map fileSizeCountMap) { - try { - switch (event) { - case PUT: - handlePutKeyEvent(keyInfo, fileSizeCountMap); - break; - - case DELETE: - handleDeleteKeyEvent(updatedKey, keyInfo, fileSizeCountMap); - break; - - case UPDATE: - handleDeleteKeyEvent(updatedKey, oldKeyInfo, - fileSizeCountMap); - handlePutKeyEvent(keyInfo, fileSizeCountMap); - break; - - default: - LOG.trace("Skipping DB update event : {}", - event); - } - } catch (Exception e) { - LOG.error("Unexpected exception while processing key {}.", - updatedKey, e); - return false; - } - return true; - } - /** * Populate DB with the counts of file sizes calculated * using the dao. From 4146f15f05acd6e13bac116e96fdea689fa2d2ec Mon Sep 17 00:00:00 2001 From: arafat Date: Mon, 27 Feb 2023 12:58:17 +0530 Subject: [PATCH 4/9] Added a check for classCast exception in NSSummaryTaskWithLegacy --- .../hadoop/ozone/recon/tasks/FileSizeCountTask.java | 11 ++++++----- .../ozone/recon/tasks/NSSummaryTaskWithLegacy.java | 13 +++++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java index 2e553761c1dc..bfaa03d3e42f 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java @@ -122,16 +122,18 @@ public Pair process(OMUpdateEventBatch events) { final Collection taskTables = getTaskTables(); while (eventIterator.hasNext()) { - OMDBUpdateEvent omdbUpdateEvent = eventIterator.next(); + OMDBUpdateEvent omdbUpdateEvent = eventIterator.next(); // Filter event inside process method to avoid duping if (!taskTables.contains(omdbUpdateEvent.getTable())) { continue; } String updatedKey = omdbUpdateEvent.getKey(); Object value = omdbUpdateEvent.getValue(); + Object oldValue = omdbUpdateEvent.getOldValue(); - if (value instanceof OmKeyInfo) { + if (value instanceof OmKeyInfo || oldValue instanceof OmKeyInfo) { OmKeyInfo omKeyInfo = (OmKeyInfo) value; + OmKeyInfo omKeyInfoOld = (OmKeyInfo) oldValue; try { switch (omdbUpdateEvent.getAction()) { @@ -144,8 +146,7 @@ public Pair process(OMUpdateEventBatch events) { break; case UPDATE: - handleDeleteKeyEvent(updatedKey, omdbUpdateEvent.getOldValue(), - fileSizeCountMap); + handleDeleteKeyEvent(updatedKey, omKeyInfoOld, fileSizeCountMap); handlePutKeyEvent(omKeyInfo, fileSizeCountMap); break; @@ -159,7 +160,7 @@ public Pair process(OMUpdateEventBatch events) { return new ImmutablePair<>(getTaskName(), false); } } else { - LOG.warn("Unexpected value type {} for key {}. Skipping processing.", + LOG.debug("Unexpected value type {} for key {}. Skipping processing.", value.getClass().getName(), updatedKey); } } diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java index a2a9598261e5..22e2368f9260 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java @@ -87,10 +87,15 @@ public boolean processWithLegacy(OMUpdateEventBatch events) { String updatedKey = omdbUpdateEvent.getKey(); try { - OMDBUpdateEvent keyTableUpdateEvent = - (OMDBUpdateEvent) omdbUpdateEvent; - OmKeyInfo updatedKeyInfo = keyTableUpdateEvent.getValue(); - OmKeyInfo oldKeyInfo = keyTableUpdateEvent.getOldValue(); + OMDBUpdateEvent keyTableUpdateEvent = omdbUpdateEvent; + Object value = keyTableUpdateEvent.getValue(); + Object oldValue = keyTableUpdateEvent.getOldValue(); + if (!(value instanceof OmKeyInfo) || !(value instanceof OmKeyInfo)) { + LOG.debug("Unexpected value type for key. Skipping processing."); + continue; + } + OmKeyInfo updatedKeyInfo = (OmKeyInfo) value; + OmKeyInfo oldKeyInfo = (OmKeyInfo) oldValue; // KeyTable entries belong to both Legacy and OBS buckets. // Check bucket layout and if it's OBS From 394aa7ad66d8392d968dc4dd12540ce384e6fe8a Mon Sep 17 00:00:00 2001 From: arafat Date: Mon, 27 Feb 2023 18:11:30 +0530 Subject: [PATCH 5/9] Fixed bugs --- .../hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java index 22e2368f9260..5cb8ecaee16a 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java @@ -90,7 +90,7 @@ public boolean processWithLegacy(OMUpdateEventBatch events) { OMDBUpdateEvent keyTableUpdateEvent = omdbUpdateEvent; Object value = keyTableUpdateEvent.getValue(); Object oldValue = keyTableUpdateEvent.getOldValue(); - if (!(value instanceof OmKeyInfo) || !(value instanceof OmKeyInfo)) { + if (!(value instanceof OmKeyInfo) || !(oldValue instanceof OmKeyInfo)) { LOG.debug("Unexpected value type for key. Skipping processing."); continue; } From 1ca9fdc87a247e55d8bdd7db06867b1329c7edfc Mon Sep 17 00:00:00 2001 From: arafat Date: Mon, 27 Feb 2023 20:04:00 +0530 Subject: [PATCH 6/9] Fixed bugs and failing UT's --- .../hadoop/ozone/recon/tasks/FileSizeCountTask.java | 11 ++++++++--- .../ozone/recon/tasks/NSSummaryTaskWithLegacy.java | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java index bfaa03d3e42f..ca5109bb21ba 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java @@ -131,7 +131,7 @@ public Pair process(OMUpdateEventBatch events) { Object value = omdbUpdateEvent.getValue(); Object oldValue = omdbUpdateEvent.getOldValue(); - if (value instanceof OmKeyInfo || oldValue instanceof OmKeyInfo) { + if (value instanceof OmKeyInfo) { OmKeyInfo omKeyInfo = (OmKeyInfo) value; OmKeyInfo omKeyInfoOld = (OmKeyInfo) oldValue; @@ -146,8 +146,13 @@ public Pair process(OMUpdateEventBatch events) { break; case UPDATE: - handleDeleteKeyEvent(updatedKey, omKeyInfoOld, fileSizeCountMap); - handlePutKeyEvent(omKeyInfo, fileSizeCountMap); + if (omKeyInfoOld != null) { + handleDeleteKeyEvent(updatedKey, omKeyInfoOld, fileSizeCountMap); + handlePutKeyEvent(omKeyInfo, fileSizeCountMap); + } else { + LOG.warn("Update event does not have the old keyInfo for {}.", + updatedKey); + } break; default: diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java index 5cb8ecaee16a..ead270291681 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java @@ -90,7 +90,7 @@ public boolean processWithLegacy(OMUpdateEventBatch events) { OMDBUpdateEvent keyTableUpdateEvent = omdbUpdateEvent; Object value = keyTableUpdateEvent.getValue(); Object oldValue = keyTableUpdateEvent.getOldValue(); - if (!(value instanceof OmKeyInfo) || !(oldValue instanceof OmKeyInfo)) { + if (!(value instanceof OmKeyInfo)) { LOG.debug("Unexpected value type for key. Skipping processing."); continue; } From 3e91e0c88a8a977f104142e2a5d4b22c4b0f1cd7 Mon Sep 17 00:00:00 2001 From: arafat Date: Tue, 28 Feb 2023 14:02:32 +0530 Subject: [PATCH 7/9] Made code changes as per review --- .../hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java index ead270291681..62e5f1840fa6 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java @@ -91,7 +91,8 @@ public boolean processWithLegacy(OMUpdateEventBatch events) { Object value = keyTableUpdateEvent.getValue(); Object oldValue = keyTableUpdateEvent.getOldValue(); if (!(value instanceof OmKeyInfo)) { - LOG.debug("Unexpected value type for key. Skipping processing."); + LOG.debug("Unexpected value type for key. Skipping processing.", + value.getClass().getName(), updatedKey); continue; } OmKeyInfo updatedKeyInfo = (OmKeyInfo) value; From f376d69d6a323ecbae1e4b41fefc720d74823c9f Mon Sep 17 00:00:00 2001 From: arafat Date: Wed, 1 Mar 2023 01:20:01 +0530 Subject: [PATCH 8/9] Fixed the log messages --- .../hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java index 62e5f1840fa6..467e7fee3bed 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java @@ -91,7 +91,7 @@ public boolean processWithLegacy(OMUpdateEventBatch events) { Object value = keyTableUpdateEvent.getValue(); Object oldValue = keyTableUpdateEvent.getOldValue(); if (!(value instanceof OmKeyInfo)) { - LOG.debug("Unexpected value type for key. Skipping processing.", + LOG.debug("Unexpected value type {} for key {}. Skipping processing.", value.getClass().getName(), updatedKey); continue; } From 1b9a97dc3406e324a038e99a17511a48f97fd7b9 Mon Sep 17 00:00:00 2001 From: arafat Date: Wed, 1 Mar 2023 13:08:29 +0530 Subject: [PATCH 9/9] Changed log level to warn --- .../org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java | 2 +- .../hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java index ca5109bb21ba..018cf3363e01 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTask.java @@ -165,7 +165,7 @@ public Pair process(OMUpdateEventBatch events) { return new ImmutablePair<>(getTaskName(), false); } } else { - LOG.debug("Unexpected value type {} for key {}. Skipping processing.", + LOG.warn("Unexpected value type {} for key {}. Skipping processing.", value.getClass().getName(), updatedKey); } } diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java index 467e7fee3bed..6607f19dba51 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java @@ -91,7 +91,7 @@ public boolean processWithLegacy(OMUpdateEventBatch events) { Object value = keyTableUpdateEvent.getValue(); Object oldValue = keyTableUpdateEvent.getOldValue(); if (!(value instanceof OmKeyInfo)) { - LOG.debug("Unexpected value type {} for key {}. Skipping processing.", + LOG.warn("Unexpected value type {} for key {}. Skipping processing.", value.getClass().getName(), updatedKey); continue; }