Repository: storm Updated Branches: refs/heads/master 27bc183c0 -> 58372f0a6
use serialized value of delay secs for topo actions Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/128ee14f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/128ee14f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/128ee14f Branch: refs/heads/master Commit: 128ee14ff6f8571c973161805bceadf8cc2cfce8 Parents: 9579c0b Author: Derek Dagit <[email protected]> Authored: Mon Jun 8 20:20:42 2015 -0500 Committer: Derek Dagit <[email protected]> Committed: Mon Jun 8 20:20:42 2015 -0500 ---------------------------------------------------------------------- storm-core/src/clj/backtype/storm/converter.clj | 11 +++++++---- storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 8 ++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/128ee14f/storm-core/src/clj/backtype/storm/converter.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/converter.clj b/storm-core/src/clj/backtype/storm/converter.clj index 7bfc14b..63868cd 100644 --- a/storm-core/src/clj/backtype/storm/converter.clj +++ b/storm-core/src/clj/backtype/storm/converter.clj @@ -134,10 +134,13 @@ thrift-topology-action-options))) (defn clojurify-topology-action-options [^TopologyActionOptions topology-action-options] - (if (and topology-action-options (.is_set_kill_options topology-action-options)) - (clojurify-kill-options (.get_kill_options topology-action-options))) - (if (and topology-action-options (.is_set_rebalance_options topology-action-options)) - (clojurify-rebalance-options (.get_rebalance_options topology-action-options)))) + (if topology-action-options + (or (and (.is_set_kill_options topology-action-options) + (clojurify-kill-options + (.get_kill_options topology-action-options))) + (and (.is_set_rebalance_options topology-action-options) + (clojurify-rebalance-options + (.get_rebalance_options topology-action-options)))))) (defn thriftify-storm-base [storm-base] (doto (StormBase.) http://git-wip-us.apache.org/repos/asf/storm/blob/128ee14f/storm-core/src/clj/backtype/storm/daemon/nimbus.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj index b887ce2..40216e8 100644 --- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj +++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj @@ -170,7 +170,9 @@ } :killed {:startup (fn [] (delay-event nimbus storm-id - (:delay-secs storm-base) + (-> storm-base + :topology-action-options + :delay-secs) :remove) nil) :kill (kill-transition nimbus storm-id) @@ -182,7 +184,9 @@ } :rebalancing {:startup (fn [] (delay-event nimbus storm-id - (:delay-secs storm-base) + (-> storm-base + :topology-action-options + :delay-secs) :do-rebalance) nil) :kill (kill-transition nimbus storm-id)
