This is an automated email from the ASF dual-hosted git repository.
agresch 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 6ff5689 STORM-3523 prevent supervisor restart freeing slot on FNF
exception
new 9a1f5a3 Merge pull request #3142 from agresch/agresch_storm_3523
6ff5689 is described below
commit 6ff56893479266f3a5656bdf26c07d40a4e1ae98
Author: Aaron Gresch <[email protected]>
AuthorDate: Mon Oct 14 09:57:48 2019 -0500
STORM-3523 prevent supervisor restart freeing slot on FNF exception
---
.../main/java/org/apache/storm/localizer/AsyncLocalizer.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
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 eaa6384..578be2b 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
@@ -21,6 +21,7 @@ package org.apache.storm.localizer;
import com.codahale.metrics.Meter;
import com.codahale.metrics.Timer;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
@@ -449,7 +450,15 @@ public class AsyncLocalizer implements AutoCloseable {
topoConfBlob.removeReference(pna);
}
- for (LocalResource lr : getLocalResources(pna)) {
+ List<LocalResource> localResources;
+ try {
+ localResources = getLocalResources(pna);
+ } catch (FileNotFoundException e) {
+ LOG.warn("Local resources for {} no longer available", pna, e);
+ return;
+ }
+
+ for (LocalResource lr : localResources) {
try {
removeBlobReference(lr.getBlobName(), pna,
lr.shouldUncompress());
} catch (Exception e) {
