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 2016/03/04 16:45:10 UTC
[1/3] storm git commit: Check if /backpressure/storm-id znode exists
before requesting children
Repository: storm
Updated Branches:
refs/heads/1.x-branch 66ce7cee9 -> 84e3444ec
Check if /backpressure/storm-id znode exists before requesting children
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4fdb14a0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4fdb14a0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4fdb14a0
Branch: refs/heads/1.x-branch
Commit: 4fdb14a0b24ca52ad6a3f4616965e75613472452
Parents: 3a6e3e4
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Thu Mar 3 12:38:01 2016 -0600
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Thu Mar 3 12:38:01 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/cluster.clj | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4fdb14a0/storm-core/src/clj/org/apache/storm/cluster.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/cluster.clj b/storm-core/src/clj/org/apache/storm/cluster.clj
index 9b01df9..5315f1a 100644
--- a/storm-core/src/clj/org/apache/storm/cluster.clj
+++ b/storm-core/src/clj/org/apache/storm/cluster.clj
@@ -486,11 +486,13 @@
(topology-backpressure
[this storm-id callback]
- "if the backpresure/storm-id dir is not empty, this topology has throttle-on, otherwise throttle-off."
+ "if the backpresure/storm-id dir is not empty, this topology has throttle-on, otherwise throttle-off.
+ The backpressure/storm-id dir may not exist if nimbus has shutdown the topology"
(when callback
(swap! backpressure-callback assoc storm-id callback))
(let [path (backpressure-storm-root storm-id)
- children (.get_children cluster-state path (not-nil? callback))]
+ children (if (.node_exists cluster-state path false)
+ (.get_children cluster-state path (not-nil? callback))) ]
(> (count children) 0)))
(setup-backpressure!
[2/3] storm git commit: Merge branch 'storm1601-1.x-branch' of
https://github.com/kishorvpatil/incubator-storm into STORM_1601-1.x
Posted by bo...@apache.org.
Merge branch 'storm1601-1.x-branch' of https://github.com/kishorvpatil/incubator-storm into STORM_1601-1.x
STORM-1601: Check if /backpressure/storm-id node exists before requesting children
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d91dbaf1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d91dbaf1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d91dbaf1
Branch: refs/heads/1.x-branch
Commit: d91dbaf10de987b15e68c8dc5cb46cdd4e32693a
Parents: 66ce7ce 4fdb14a
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Mar 4 09:30:56 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Mar 4 09:30:56 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/cluster.clj | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-1601 to Changelog
Posted by bo...@apache.org.
Added STORM-1601 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/84e3444e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/84e3444e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/84e3444e
Branch: refs/heads/1.x-branch
Commit: 84e3444ec470a6fbe1039326bda9bae808a3afe8
Parents: d91dbaf
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Mar 4 09:20:58 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Mar 4 09:31:20 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/84e3444e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 491e894..53c6d0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1601: Check if /backpressure/storm-id node exists before requesting children
* STORM-1574: Better handle backpressure exception etc.
* STORM-1587: Avoid NPE while prining Metrics
* STORM-1570: Storm SQL support for nested fields and array