You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/09/23 01:41:02 UTC
[1/3] storm git commit: STORM-2101: fixes npe in compute-executors in
nimbus
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch bb67ea5d6 -> f2ad7fa71
STORM-2101: fixes npe in compute-executors in nimbus
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a065187b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a065187b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a065187b
Branch: refs/heads/1.0.x-branch
Commit: a065187b91a616243fc4fbfc215466bd6aa36dca
Parents: bb67ea5
Author: Alessandro Bellina <ab...@yahoo-inc.com>
Authored: Tue Sep 20 08:33:02 2016 -0500
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 23 10:40:31 2016 +0900
----------------------------------------------------------------------
.../src/clj/org/apache/storm/daemon/nimbus.clj | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a065187b/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 00d8fa6..e55e7eb 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@ -641,14 +641,16 @@
storm-conf (read-storm-conf-as-nimbus storm-id blob-store)
topology (read-storm-topology-as-nimbus storm-id blob-store)
task->component (storm-task-info topology storm-conf)]
- (->> (storm-task-info topology storm-conf)
- reverse-map
- (map-val sort)
- (join-maps component->executors)
- (map-val (partial apply partition-fixed))
- (mapcat second)
- (map to-executor-id)
- )))
+ (if (nil? component->executors)
+ []
+ (->> (storm-task-info topology storm-conf)
+ reverse-map
+ (map-val sort)
+ (join-maps component->executors)
+ (map-val (partial apply partition-fixed))
+ (mapcat second)
+ (map to-executor-id)
+ ))))
(defn- compute-executor->component [nimbus storm-id]
(let [conf (:conf nimbus)
[3/3] storm git commit: add STORM-2101 to CHANGELOG
Posted by ka...@apache.org.
add STORM-2101 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f2ad7fa7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f2ad7fa7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f2ad7fa7
Branch: refs/heads/1.0.x-branch
Commit: f2ad7fa71c54e7a8a043f02313e3812a211f2b8a
Parents: 591989c
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Sep 23 10:40:51 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 23 10:40:51 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f2ad7fa7/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 115340f..cd4219c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.3
+ * STORM-2101: fixes npe in compute-executors in nimbus
* STORM-2090: Add integration test for storm windowing
* STORM-2003: Make sure config contains TOPIC before get it
* STORM-1567: in defaults.yaml 'topology.disable.loadaware' should be 'topology.disable.loadaware.messaging'
[2/3] storm git commit: Merge branch 'STORM-2101-1.0.x' into
1.0.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2101-1.0.x' into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/591989c8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/591989c8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/591989c8
Branch: refs/heads/1.0.x-branch
Commit: 591989c8794ddba5e680bec699b3c0240b05565b
Parents: bb67ea5 a065187
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Sep 23 10:40:35 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 23 10:40:35 2016 +0900
----------------------------------------------------------------------
.../src/clj/org/apache/storm/daemon/nimbus.clj | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------