Repository: flink Updated Branches: refs/heads/master e766dba36 -> 8803304f4
[FLINK-1482] Log error instead of rethrowing it during shutdown hook Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8803304f Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8803304f Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8803304f Branch: refs/heads/master Commit: 8803304f4c79f7ec9049d83d767189c9e91f1705 Parents: e766dba Author: Ufuk Celebi <[email protected]> Authored: Thu Feb 5 18:42:22 2015 +0100 Committer: Ufuk Celebi <[email protected]> Committed: Thu Feb 5 18:43:32 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/flink/runtime/blob/BlobCache.java | 2 +- .../main/java/org/apache/flink/runtime/blob/BlobServer.java | 2 +- .../main/java/org/apache/flink/runtime/blob/BlobUtils.java | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/8803304f/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobCache.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobCache.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobCache.java index ef6d9e7..3f0fcb6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobCache.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobCache.java @@ -57,7 +57,7 @@ public final class BlobCache implements BlobService { LOG.info("Created BLOB cache storage directory " + storageDir); // Add shutdown hook to delete storage directory - BlobUtils.addDeleteDirectoryShutdownHook(storageDir); + BlobUtils.addDeleteDirectoryShutdownHook(storageDir, LOG); } /** http://git-wip-us.apache.org/repos/asf/flink/blob/8803304f/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java index 43e2d15..cf82a9b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java @@ -115,7 +115,7 @@ public final class BlobServer extends Thread implements BlobService{ LOG.info("Created BLOB server storage directory " + storageDir); // Add shutdown hook to delete storage directory - BlobUtils.addDeleteDirectoryShutdownHook(storageDir); + BlobUtils.addDeleteDirectoryShutdownHook(storageDir, LOG); } catch (IOException e) { throw new IOException("Could not create BlobServer with random port.", e); http://git-wip-us.apache.org/repos/asf/flink/blob/8803304f/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java index 2b604d1..751137a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java @@ -23,6 +23,7 @@ import org.apache.commons.io.FileUtils; import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.configuration.GlobalConfiguration; import org.apache.flink.runtime.jobgraph.JobID; +import org.slf4j.Logger; import java.io.File; import java.io.IOException; @@ -34,6 +35,7 @@ import java.util.UUID; import static com.google.common.base.Preconditions.checkNotNull; public class BlobUtils { + /** * Algorithm to be used for calculating the BLOB keys. */ @@ -197,7 +199,7 @@ public class BlobUtils { /** * Adds a shutdown hook to the JVM to delete the given directory. */ - static void addDeleteDirectoryShutdownHook(final File dir) { + static void addDeleteDirectoryShutdownHook(final File dir, final Logger errorLogger) { checkNotNull(dir); // Add shutdown hook to delete directory @@ -207,8 +209,8 @@ public class BlobUtils { try { FileUtils.deleteDirectory(dir); } - catch (IOException e) { - throw new RuntimeException("Error deleting directory " + dir + " during JVM shutdown: " + e.getMessage(), e); + catch (Throwable t) { + errorLogger.error("Error deleting directory " + dir + " during JVM shutdown: " + t.getMessage(), t); } } }));
