Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STORM-4085 - Ensure that DownloadOrUpdate exception is caught #3704

Merged
merged 1 commit into from
Oct 9, 2024
Merged

STORM-4085 - Ensure that DownloadOrUpdate exception is caught #3704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ private LocalizedResource getUserArchive(String user, String key) {
throw new AssertionError("All user archives require a user present");
}
ConcurrentMap<String, LocalizedResource> keyToResource = userArchives.computeIfAbsent(user, (u) -> new ConcurrentHashMap<>());
return keyToResource.computeIfAbsent(key,
return keyToResource.computeIfAbsent(key,
(k) -> new LocalizedResource(key, localBaseDir, true, fsOps, conf, user, metricsRegistry));
}

Expand All @@ -206,7 +206,7 @@ private LocalizedResource getUserFile(String user, String key) {
throw new AssertionError("All user archives require a user present");
}
ConcurrentMap<String, LocalizedResource> keyToResource = userFiles.computeIfAbsent(user, (u) -> new ConcurrentHashMap<>());
return keyToResource.computeIfAbsent(key,
return keyToResource.computeIfAbsent(key,
(k) -> new LocalizedResource(key, localBaseDir, false, fsOps, conf, user, metricsRegistry));
}

Expand Down Expand Up @@ -335,13 +335,11 @@ void updateBlobs() {
}
}
for (CompletableFuture<?> f : futures) {
try {
f.get();
} catch (Exception e) {
updateBlobExceptions.mark();
LOG.warn("Could not update blob ({}), will retry again later." , e.getClass().getName());
}
f.get();
}
} catch (Exception e) {
updateBlobExceptions.mark();
LOG.warn("Could not update blob ({}), will retry again later.", e.getClass().getName());
}
}

Expand Down