Skip to content

Commit 2f6732c

Browse files
authored
STORM-4085 - Ensure that DownloadOrUpdate exception is caught (#3704)
1 parent 1e8eee6 commit 2f6732c

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ private LocalizedResource getUserArchive(String user, String key) {
197197
throw new AssertionError("All user archives require a user present");
198198
}
199199
ConcurrentMap<String, LocalizedResource> keyToResource = userArchives.computeIfAbsent(user, (u) -> new ConcurrentHashMap<>());
200-
return keyToResource.computeIfAbsent(key,
200+
return keyToResource.computeIfAbsent(key,
201201
(k) -> new LocalizedResource(key, localBaseDir, true, fsOps, conf, user, metricsRegistry));
202202
}
203203

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

@@ -335,13 +335,11 @@ void updateBlobs() {
335335
}
336336
}
337337
for (CompletableFuture<?> f : futures) {
338-
try {
339-
f.get();
340-
} catch (Exception e) {
341-
updateBlobExceptions.mark();
342-
LOG.warn("Could not update blob ({}), will retry again later." , e.getClass().getName());
343-
}
338+
f.get();
344339
}
340+
} catch (Exception e) {
341+
updateBlobExceptions.mark();
342+
LOG.warn("Could not update blob ({}), will retry again later.", e.getClass().getName());
345343
}
346344
}
347345

0 commit comments

Comments
 (0)