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/02 15:33:45 UTC
[1/3] storm git commit: STORM-2236 Close Localizer and AsyncLocalizer
when supervisor is shutting down
Repository: storm
Updated Branches:
refs/heads/master a49483da0 -> 1445a955a
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/44cfe3d0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/44cfe3d0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/44cfe3d0
Branch: refs/heads/master
Commit: 44cfe3d0b2ada74a1513826817b04fc904be783e
Parents: 4c5e34e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Feb 1 17:45:54 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Feb 1 17:45:54 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/44cfe3d0/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 ce5c6ab..b71493c 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;
@@ -274,6 +274,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);
[2/3] storm git commit: Merge branch 'STORM-2336' of
https://github.com/HeartSaVioR/storm into STORM-2336-merge
Posted by ka...@apache.org.
Merge branch 'STORM-2336' of https://github.com/HeartSaVioR/storm into STORM-2336-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a4593613
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a4593613
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a4593613
Branch: refs/heads/master
Commit: a459361331361191c7fee438573c3f2b36abeaec
Parents: a49483d 44cfe3d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Feb 3 00:28:55 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Feb 3 00:28:55 2017 +0900
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] storm git commit: STORM-2336: CHANGELOG
Posted by ka...@apache.org.
STORM-2336: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1445a955
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1445a955
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1445a955
Branch: refs/heads/master
Commit: 1445a955a79d1d831715f309400c7368ca337d6a
Parents: a459361
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Feb 3 00:33:30 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Feb 3 00:33:30 2017 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1445a955/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e606dd..2f25a40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -196,6 +196,7 @@
* STORM-1769: Added a test to check local nimbus with notifier plugin
## 1.1.0
+ * STORM-2336: Close Localizer and AsyncLocalizer when supervisor is shutting down
* STORM-2335: Fix broken Topology visualization with empty ':transferred' in executor stats
* STORM-2331: Emitting from JavaScript should work when not anchoring.
* STORM-2320: DRPC client printer class reusable for local and remote DRPC.