You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/07/25 23:25:37 UTC
[1/3] git commit: fixed the validation logic in
validate-launched-once.
Repository: incubator-storm
Updated Branches:
refs/heads/master 5219f494e -> 556ac8af1
fixed the validation logic in validate-launched-once.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/c78e08fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/c78e08fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/c78e08fe
Branch: refs/heads/master
Commit: c78e08feef7044d262c0ea30d202faee94c28862
Parents: 5b425e4
Author: iwasakims <iw...@example.com>
Authored: Wed Jul 16 06:30:35 2014 -0700
Committer: iwasakims <iw...@example.com>
Committed: Wed Jul 16 06:30:35 2014 -0700
----------------------------------------------------------------------
storm-core/test/clj/backtype/storm/supervisor_test.clj | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/c78e08fe/storm-core/test/clj/backtype/storm/supervisor_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/supervisor_test.clj b/storm-core/test/clj/backtype/storm/supervisor_test.clj
index 1a27c1a..1bae991 100644
--- a/storm-core/test/clj/backtype/storm/supervisor_test.clj
+++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj
@@ -60,10 +60,11 @@
(defn validate-launched-once [launched supervisor->ports storm-id]
(let [counts (map count (vals launched))
- launched-supervisor->ports (apply merge-with concat
- (for [[s p] (keys launched)]
- {s [p]}
- ))]
+ launched-supervisor->ports (apply merge-with set/union
+ (for [[[s p] sids] launched
+ :when (some #(= % storm-id) sids)]
+ {s #{p}}))
+ supervisor->ports (map-val set supervisor->ports)]
(is (every? (partial = 1) counts))
(is (= launched-supervisor->ports supervisor->ports))
))
[3/3] git commit: Added STORM-415 to Changelog
Posted by bo...@apache.org.
Added STORM-415 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/556ac8af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/556ac8af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/556ac8af
Branch: refs/heads/master
Commit: 556ac8af1d0a0ee81473b126887e0f1cdc50080f
Parents: f155e6f
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Fri Jul 25 16:18:46 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Fri Jul 25 16:18:46 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/556ac8af/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43dd049..eafa3d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
* STORM-421: Memoize local hostname lookup in executor
* STORM-414: support logging level to multilang protocol spout and bolt
* STORM-321: Added a tool to see the current status of STORM JIRA and github pulls.
+ * STORM-415: validate-launched-once in supervisor-test can not handle multiple topologies
## 0.9.2-incubating
* STORM-66: send taskid on initial handshake
[2/3] git commit: Merge branch 'STORM-415' of
https://github.com/iwasakims/incubator-storm into STORM-415
Posted by bo...@apache.org.
Merge branch 'STORM-415' of https://github.com/iwasakims/incubator-storm into STORM-415
STORM-415: validate-launched-once in supervisor-test can not handle multiple topologies
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/f155e6f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/f155e6f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/f155e6f4
Branch: refs/heads/master
Commit: f155e6f445705e56b183e70f1ac64260ff74c0be
Parents: 5219f49 c78e08f
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Fri Jul 25 16:18:06 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Fri Jul 25 16:18:06 2014 -0500
----------------------------------------------------------------------
storm-core/test/clj/backtype/storm/supervisor_test.clj | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------