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 18:37:13 UTC
[1/3] storm git commit: STORM-2222 Repeated NPEs thrown in nimbus if
rebalance fails
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch fabd37bdb -> 07410fe69
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/c9b80da9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c9b80da9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c9b80da9
Branch: refs/heads/1.0.x-branch
Commit: c9b80da918510e16ce239a4e8bfbb0b8c22f9358
Parents: a06f521
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:21:59 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/c9b80da9/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 e55e7eb..daccb83 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@ -276,7 +276,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))
@@ -320,7 +320,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!
@@ -373,7 +375,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/3] storm git commit: Merge branch '1.0.x-branch' of
https://github.com/knusbaum/incubator-storm into HEAD
Posted by kn...@apache.org.
Merge branch '1.0.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/61935a7d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/61935a7d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/61935a7d
Branch: refs/heads/1.0.x-branch
Commit: 61935a7debaca02710e4cb05301098b0a17f9de7
Parents: fabd37b c9b80da
Author: Kyle Nusbaum <kn...@yahoo-inc.com>
Authored: Thu Dec 22 12:34:30 2016 -0600
Committer: Kyle Nusbaum <kn...@yahoo-inc.com>
Committed: Thu Dec 22 12:34:30 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: Updating CHANGELOG
Posted by kn...@apache.org.
Updating CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/07410fe6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/07410fe6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/07410fe6
Branch: refs/heads/1.0.x-branch
Commit: 07410fe6901ff1c38b35fc04d7c115413b5c3335
Parents: 61935a7
Author: Kyle Nusbaum <kn...@yahoo-inc.com>
Authored: Thu Dec 22 12:37:00 2016 -0600
Committer: Kyle Nusbaum <kn...@yahoo-inc.com>
Committed: Thu Dec 22 12:37:00 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/07410fe6/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b5ddc4..823361c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.3
+ * STORM-2222: Repeated NPEs thrown in nimbus if rebalance fails
* STORM-2251: Integration test refers specific version of Storm which should be project version
* STORM-2234: heartBeatExecutorService in shellSpout don't work well with deactivate
* STORM-2216: Favor JSONValue.parseWithException