You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/02/07 02:27:44 UTC

[10/13] storm git commit: STORM-2236 Close Localizer and AsyncLocalizer when supervisor is shutting down

STORM-2236 Close Localizer and AsyncLocalizer when supervisor is shutting down

* this patch gets rid of alive non-daemon threads which prevent JVM process shutdown


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/64a9dd0b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/64a9dd0b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/64a9dd0b

Branch: refs/heads/1.0.x-branch
Commit: 64a9dd0b80bd7be9b9d45d7bf508e7d81ce2328b
Parents: 59ee79d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Feb 1 17:45:54 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Feb 7 10:40:59 2017 +0900

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/64a9dd0b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java
index 59a3e6e..a6adace 100644
--- a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java
+++ b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java
@@ -77,7 +77,7 @@ public class Supervisor implements DaemonCommon, AutoCloseable {
     private final StormTimer eventTimer;
     private final StormTimer blobUpdateTimer;
     private final Localizer localizer;
-    private final ILocalizer asyncLocalizer;
+    private final AsyncLocalizer asyncLocalizer;
     private EventManager eventManager;
     private ReadClusterState readState;
     
@@ -279,6 +279,8 @@ public class Supervisor implements DaemonCommon, AutoCloseable {
             if (readState != null) {
                 readState.close();
             }
+            asyncLocalizer.shutdown();
+            localizer.shutdown();
             getStormClusterState().disconnect();
         } catch (Exception e) {
             LOG.error("Error Shutting down", e);