You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by sa...@apache.org on 2023/03/01 12:25:18 UTC
[ozone] branch master updated: HDDS-7926. [hsync] Recon throws ClassCastException. (#4266)
This is an automated email from the ASF dual-hosted git repository.
sammichen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new f0c4d415c7 HDDS-7926. [hsync] Recon throws ClassCastException. (#4266)
f0c4d415c7 is described below
commit f0c4d415c76c99f1daec2b269b0906db0696dedf
Author: Arafat2198 <98...@users.noreply.github.com>
AuthorDate: Wed Mar 1 17:55:11 2023 +0530
HDDS-7926. [hsync] Recon throws ClassCastException. (#4266)
---
.../ozone/recon/tasks/FileSizeCountTask.java | 56 ++++++++++++++--------
.../ozone/recon/tasks/NSSummaryTaskWithLegacy.java | 14 ++++--
2 files changed, 45 insertions(+), 25 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 1d0da6e9f1..f3c18495e0 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
@@ -150,37 +150,51 @@ public class FileSizeCountTask implements ReconOmTask {
final Collection<String> taskTables = getTaskTables();
while (eventIterator.hasNext()) {
- OMDBUpdateEvent<String, OmKeyInfo> omdbUpdateEvent = eventIterator.next();
+ OMDBUpdateEvent<String, Object> 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();
+ Object value = omdbUpdateEvent.getValue();
+ Object oldValue = omdbUpdateEvent.getOldValue();
- try {
- switch (omdbUpdateEvent.getAction()) {
- case PUT:
- handlePutKeyEvent(omKeyInfo, fileSizeCountMap);
- break;
+ if (value instanceof OmKeyInfo) {
+ OmKeyInfo omKeyInfo = (OmKeyInfo) value;
+ OmKeyInfo omKeyInfoOld = (OmKeyInfo) oldValue;
- case DELETE:
- handleDeleteKeyEvent(updatedKey, omKeyInfo, fileSizeCountMap);
- break;
+ try {
+ switch (omdbUpdateEvent.getAction()) {
+ case PUT:
+ handlePutKeyEvent(omKeyInfo, fileSizeCountMap);
+ break;
- case UPDATE:
- handleDeleteKeyEvent(updatedKey, omdbUpdateEvent.getOldValue(),
- fileSizeCountMap);
- handlePutKeyEvent(omKeyInfo, fileSizeCountMap);
- break;
+ case DELETE:
+ handleDeleteKeyEvent(updatedKey, omKeyInfo, fileSizeCountMap);
+ break;
- default: LOG.trace("Skipping DB update event : {}",
- omdbUpdateEvent.getAction());
+ case UPDATE:
+ 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:
+ 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);
}
- } 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);
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 a2a9598261..6607f19dba 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,16 @@ public class NSSummaryTaskWithLegacy extends NSSummaryTaskDbEventHandler {
String updatedKey = omdbUpdateEvent.getKey();
try {
- OMDBUpdateEvent<String, OmKeyInfo> keyTableUpdateEvent =
- (OMDBUpdateEvent<String, OmKeyInfo>) omdbUpdateEvent;
- OmKeyInfo updatedKeyInfo = keyTableUpdateEvent.getValue();
- OmKeyInfo oldKeyInfo = keyTableUpdateEvent.getOldValue();
+ OMDBUpdateEvent<String, ?> keyTableUpdateEvent = omdbUpdateEvent;
+ Object value = keyTableUpdateEvent.getValue();
+ Object oldValue = keyTableUpdateEvent.getOldValue();
+ if (!(value instanceof OmKeyInfo)) {
+ LOG.warn("Unexpected value type {} for key {}. Skipping processing.",
+ value.getClass().getName(), updatedKey);
+ 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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org