storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kabh...@apache.org
Subject [1/3] storm git commit: STORM-2236 Close Localizer and AsyncLocalizer when supervisor is shutting down
Date Thu, 02 Feb 2017 15:33:51 GMT
Repository: storm
Updated Branches:
  refs/heads/1.x-branch b975dbdf0 -> 90ce07ac6


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/6bba1d13
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6bba1d13
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6bba1d13

Branch: refs/heads/1.x-branch
Commit: 6bba1d131127d0c104ed67e2548e91e2454f22e4
Parents: b975dbd
Author: Jungtaek Lim <kabhwan@gmail.com>
Authored: Wed Feb 1 17:45:54 2017 +0900
Committer: Jungtaek Lim <kabhwan@gmail.com>
Committed: Fri Feb 3 00:32:51 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/6bba1d13/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);


Mime
View raw message