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 2015/08/05 22:02:12 UTC
[1/3] storm git commit: STORM-859 Add regression test of STORM-856
Repository: storm
Updated Branches:
refs/heads/master 3b2c7fc41 -> 7f181188b
STORM-859 Add regression test of STORM-856
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/12cd0988
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/12cd0988
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/12cd0988
Branch: refs/heads/master
Commit: 12cd098826dba7a7b3a20bf90341449c5130eab8
Parents: 58372f0
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Jun 10 13:49:13 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Jun 10 13:49:13 2015 +0900
----------------------------------------------------------------------
.../test/clj/backtype/storm/nimbus_test.clj | 29 ++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/12cd0988/storm-core/test/clj/backtype/storm/nimbus_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/nimbus_test.clj b/storm-core/test/clj/backtype/storm/nimbus_test.clj
index f9502c2..00fb6d6 100644
--- a/storm-core/test/clj/backtype/storm/nimbus_test.clj
+++ b/storm-core/test/clj/backtype/storm/nimbus_test.clj
@@ -1180,3 +1180,32 @@
(is (thrown-cause? InvalidTopologyException
(submit-local-topology-with-opts nimbus "test" bad-config topology
(SubmitOptions.))))))))
+
+(deftest test-stateless-with-scheduled-topology-to-be-killed
+ ; tests regression of STORM-856
+ (with-inprocess-zookeeper zk-port
+ (with-local-tmp [nimbus-dir]
+ (letlocals
+ (bind conf (merge (read-storm-config)
+ {STORM-ZOOKEEPER-SERVERS ["localhost"]
+ STORM-CLUSTER-MODE "local"
+ STORM-ZOOKEEPER-PORT zk-port
+ STORM-LOCAL-DIR nimbus-dir}))
+ (bind cluster-state (cluster/mk-storm-cluster-state conf))
+ (bind nimbus (nimbus/service-handler conf (nimbus/standalone-nimbus)))
+ (bind topology (thrift/mk-topology
+ {"1" (thrift/mk-spout-spec (TestPlannerSpout. true) :parallelism-hint 3)}
+ {}))
+ (submit-local-topology nimbus "t1" {TOPOLOGY-MESSAGE-TIMEOUT-SECS 30} topology)
+ ; make transition for topology t1 to be killed -> nimbus applies this event to cluster state
+ (.killTopology nimbus "t1")
+ ; shutdown nimbus immediately to achieve nimbus doesn't handle event right now
+ (.shutdown nimbus)
+
+ ; in startup of nimbus it reads cluster state and take proper actions
+ ; in this case nimbus registers topology transition event to scheduler again
+ ; before applying STORM-856 nimbus was killed with NPE
+ (bind nimbus (nimbus/service-handler conf (nimbus/standalone-nimbus)))
+ (.shutdown nimbus)
+ (.disconnect cluster-state)
+ ))))
\ No newline at end of file
[2/3] storm git commit: Merge branch 'STORM-859' of
https://github.com/HeartSaVioR/storm into STORM-859
Posted by bo...@apache.org.
Merge branch 'STORM-859' of https://github.com/HeartSaVioR/storm into STORM-859
STORM-859: Add regression test of STORM-856
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ccf49d0e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ccf49d0e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ccf49d0e
Branch: refs/heads/master
Commit: ccf49d0e195820eb3ee3696a762e35077a18d472
Parents: 3b2c7fc 12cd098
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Aug 5 14:53:39 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Aug 5 14:53:39 2015 -0500
----------------------------------------------------------------------
.../test/clj/backtype/storm/nimbus_test.clj | 29 ++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-859 to Changelog
Posted by bo...@apache.org.
Added STORM-859 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7f181188
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7f181188
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7f181188
Branch: refs/heads/master
Commit: 7f181188b68962a7c32679c63ac6370d3640763c
Parents: ccf49d0
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Aug 5 15:01:19 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Aug 5 15:01:19 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7f181188/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index afcdacc..10a4ebe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
* STORM-942: Add FluxParser method parseInputStream() to eliminate disk usage
* STORM-67: Provide API for spouts to know how many pending messages there are
* STORM-918: Storm CLI could validate arguments/print usage
+ * STORM-859: Add regression test of STORM-856
## 0.10.0-beta2
* STORM-843: [storm-redis] Add Javadoc to storm-redis