(storm) branch master updated: STORM-4085 - Ensure that DownloadOrUpdate exception is caught (#3704)

[rzo1]

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f6732c26 STORM-4085 - Ensure that DownloadOrUpdate exception is 
caught (#3704)
2f6732c26 is described below

commit 2f6732c26c6fc9375389861798337b1e3ddb4e38
Author: paxadax <77935294+paxa...@users.noreply.github.com>
AuthorDate: Wed Oct 9 08:26:44 2024 +0100

    STORM-4085 - Ensure that DownloadOrUpdate exception is caught (#3704)
---
 .../java/org/apache/storm/localizer/AsyncLocalizer.java    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git 
a/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java 
b/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
index fb67ff80a..c9ad9e1c3 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
@@ -197,7 +197,7 @@ public class AsyncLocalizer implements AutoCloseable {
             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));
     }
 
@@ -206,7 +206,7 @@ public class AsyncLocalizer implements AutoCloseable {
             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));
     }
 
@@ -335,13 +335,11 @@ public class AsyncLocalizer implements AutoCloseable {
                 }
             }
             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());
         }
     }