You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/09/18 06:23:00 UTC
[1/3] storm git commit: do not remove storm-code in supervisor until
kill job
Repository: storm
Updated Branches:
refs/heads/master ed5ba74a9 -> 4523e54eb
do not remove storm-code in supervisor until kill job
nimbus maybe reschedule topology later
Signed-off-by: Xinze Chi <xm...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/646bac2b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/646bac2b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/646bac2b
Branch: refs/heads/master
Commit: 646bac2be59b8f51ff46307b2bfc3d540a28680d
Parents: 8eb4509
Author: Xinze Chi <xm...@gmail.com>
Authored: Tue Sep 8 17:57:29 2015 +0800
Committer: Xinze Chi <xm...@gmail.com>
Committed: Tue Sep 8 17:58:58 2015 +0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/646bac2b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index 73db9c0..2a7613d 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -485,7 +485,7 @@
;; resources don't exist
(if on-windows? (shutdown-disallowed-workers supervisor))
(doseq [storm-id downloaded-storm-ids]
- (when-not (assigned-storm-ids storm-id)
+ (when-not (storm-code-map storm-id)
(log-message "Removing code for storm id "
storm-id)
(try
[3/3] storm git commit: Added STORM-1037 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-1037 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4523e54e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4523e54e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4523e54e
Branch: refs/heads/master
Commit: 4523e54eba2ca7cf4b95aa664daa175fa0ae8185
Parents: 9b64747
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Sep 17 21:22:06 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Sep 17 21:22:06 2015 -0700
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4523e54e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fca2ee..3395e0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1037: do not remove storm-code in supervisor until kill job
* STORM-1007: Add more metrics to DisruptorQueue
* STORM-1011: HBaseBolt default mapper should handle null values
* STORM-1019: Added missing dependency version to use of org.codehaus.mojo:make-maven-plugin
[2/3] storm git commit: Merge branch 'master' of
https://github.com/XinzeChi/Apache-storm into STORM-1037
Posted by sr...@apache.org.
Merge branch 'master' of https://github.com/XinzeChi/Apache-storm into STORM-1037
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9b647476
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9b647476
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9b647476
Branch: refs/heads/master
Commit: 9b647476f3fa83b5be4a149a6d597cd438eea5f9
Parents: ed5ba74 646bac2
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Sep 17 19:26:59 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Sep 17 19:26:59 2015 -0700
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------