From 94e6bbcc873c04034c55977653910b9921bc014c Mon Sep 17 00:00:00 2001 From: jiangzhileaf Date: Thu, 19 Jul 2018 16:37:22 +0800 Subject: [PATCH 1/2] Bug fix for blobstore sync. 1.Bug fix for blob sync frequency with time unit error. 2.Bug fix for blob sync delete file, add catch NoSuchFileException. 3.Bug fix for blob sync update blob flie, add catch FileNotFoundException --- .../main/java/org/apache/storm/blobstore/BlobStoreUtils.java | 3 +++ .../java/org/apache/storm/blobstore/LocalFsBlobStore.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java b/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java index c61c0b55118..0ba186ff038 100644 --- a/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java +++ b/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java @@ -12,6 +12,7 @@ package org.apache.storm.blobstore; +import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; @@ -191,6 +192,8 @@ public static boolean downloadUpdatedBlob(Map conf, BlobStore bl out.close(); } isSuccess = true; + } catch(FileNotFoundException fnf) { + LOG.warn("FileNotFoundException", fnf); } catch (IOException | AuthorizationException exception) { throw new RuntimeException(exception); } catch (KeyNotFoundException knf) { diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java b/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java index 7724b318252..445875885c9 100644 --- a/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java +++ b/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java @@ -19,6 +19,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; +import java.nio.file.NoSuchFileException; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -197,7 +198,7 @@ public void run() { throw new RuntimeException(e); } } - }, 0, ObjectReader.getInt(conf.get(DaemonConfig.NIMBUS_CODE_SYNC_FREQ_SECS))); + }, 0, ObjectReader.getInt(conf.get(DaemonConfig.NIMBUS_CODE_SYNC_FREQ_SECS))*1000); } @@ -374,7 +375,7 @@ private void deleteKeyIgnoringFileNotFound(String key) throws IOException { try { fbs.deleteKey(key); } catch (IOException e) { - if (e instanceof FileNotFoundException) { + if (e instanceof FileNotFoundException || e instanceof NoSuchFileException) { LOG.debug("Ignoring FileNotFoundException since we're about to delete such key... key: {}", key); } else { throw e; From a6fc2f933184c28f293fdd1d6aad562e983f21f8 Mon Sep 17 00:00:00 2001 From: Arun Mahadevan Date: Thu, 11 Oct 2018 11:33:36 -0700 Subject: [PATCH 2/2] STORM-3252: update log message --- .../main/java/org/apache/storm/blobstore/BlobStoreUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java b/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java index 0ba186ff038..b9f93db250d 100644 --- a/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java +++ b/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java @@ -193,7 +193,7 @@ public static boolean downloadUpdatedBlob(Map conf, BlobStore bl } isSuccess = true; } catch(FileNotFoundException fnf) { - LOG.warn("FileNotFoundException", fnf); + LOG.warn("Blobstore file for key '{}' does not exist or got deleted before it could be downloaded.", key, fnf); } catch (IOException | AuthorizationException exception) { throw new RuntimeException(exception); } catch (KeyNotFoundException knf) {