Skip to content

STORM-2101: fixes npe in compute-executors in nimbus #1694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Sep 23, 2016
Merged

STORM-2101: fixes npe in compute-executors in nimbus #1694

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,16 +637,17 @@
storm-conf (read-storm-conf-as-nimbus storm-id blob-store)
topology (read-storm-topology-as-nimbus storm-id blob-store)
task->component (get-clojurified-task-info topology storm-conf)]
(->> (StormCommon/stormTaskInfo topology storm-conf)
(Utils/reverseMap)
clojurify-structure
(map-val sort)
((fn [ & maps ] (Utils/joinMaps (into-array Map (into [component->executors] maps)))))
(clojurify-structure)
(map-val (partial apply (fn part-fixed [a b] (Utils/partitionFixed a b))))
(mapcat second)
(map to-executor-id)
)))
(if (nil? component->executors)
[]
(->> (StormCommon/stormTaskInfo topology storm-conf)
(Utils/reverseMap)
clojurify-structure
(map-val sort)
((fn [ & maps ] (Utils/joinMaps (into-array Map (into [component->executors] maps)))))
(clojurify-structure)
(map-val (partial apply (fn part-fixed [a b] (Utils/partitionFixed a b))))
(mapcat second)
(map to-executor-id)))))

(defn- compute-executor->component [nimbus storm-id]
(let [conf (:conf nimbus)
Expand Down