You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2016/12/22 20:25:17 UTC
[1/2] storm git commit: STORM-2222 Repeated NPEs thrown in nimbus if
rebalance fails
Repository: storm
Updated Branches:
refs/heads/1.x-branch fddd8c996 -> 6f1b72e7e
STORM-2222 Repeated NPEs thrown in nimbus if rebalance fails
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8f610a53
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8f610a53
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8f610a53
Branch: refs/heads/1.x-branch
Commit: 8f610a53a097d02946fea9dc832a978aec3dd9f5
Parents: 3e720c1
Author: Kyle Nusbaum <kn...@yahoo-inc.com>
Authored: Mon Nov 28 13:09:17 2016 -0600
Committer: Kyle Nusbaum <kn...@yahoo-inc.com>
Committed: Mon Nov 28 13:09:17 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8f610a53/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
index 2732d81..75c2823 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@ -291,7 +291,7 @@
(let [rebalance-options (:topology-action-options storm-base)]
(.update-storm! (:storm-cluster-state nimbus)
storm-id
- (-> {:topology-action-options nil}
+ (-> {}
(assoc-non-nil :component->executors (:component->executors rebalance-options))
(assoc-non-nil :num-workers (:num-workers rebalance-options)))))
(mk-assignments nimbus :scratch-topology-id storm-id))
@@ -335,7 +335,9 @@
:kill (kill-transition nimbus storm-id)
:do-rebalance (fn []
(do-rebalance nimbus storm-id status storm-base)
- (:type (:prev-status storm-base)))
+ {:status {:type (:type (:prev-status storm-base))}
+ :prev-status :rebalancing
+ :topology-action-options nil})
}})
(defn transition!
@@ -388,7 +390,7 @@
(defn delay-event [nimbus storm-id delay-secs event]
(log-message "Delaying event " event " for " delay-secs " secs for " storm-id)
(schedule (:timer nimbus)
- delay-secs
+ (or delay-secs 0)
#(try (transition! nimbus storm-id event false)
(catch Exception e (log-error e "Exception while trying transition for " storm-id " and event " event)))))
[2/2] storm git commit: Merge branch '1.x-branch' of
https://github.com/knusbaum/incubator-storm into HEAD
Posted by kn...@apache.org.
Merge branch '1.x-branch' of https://github.com/knusbaum/incubator-storm into HEAD
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6f1b72e7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6f1b72e7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6f1b72e7
Branch: refs/heads/1.x-branch
Commit: 6f1b72e7efbe2228519a05fdb96fedb085f501ff
Parents: fddd8c9 8f610a5
Author: Kyle Nusbaum <kn...@yahoo-inc.com>
Authored: Thu Dec 22 14:23:57 2016 -0600
Committer: Kyle Nusbaum <kn...@yahoo-inc.com>
Committed: Thu Dec 22 14:23:57 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6f1b72e7/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------