Addressed review comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/664b0ce3 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/664b0ce3 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/664b0ce3 Branch: refs/heads/master Commit: 664b0ce39a26e92cbc7a08ebb1f099871d30ca9d Parents: af64a3a Author: Robert (Bobby) Evans <[email protected]> Authored: Tue Nov 3 14:56:23 2015 -0600 Committer: Robert (Bobby) Evans <[email protected]> Committed: Tue Nov 3 14:56:23 2015 -0600 ---------------------------------------------------------------------- storm-core/src/clj/backtype/storm/daemon/executor.clj | 2 +- storm-core/src/clj/backtype/storm/daemon/worker.clj | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/664b0ce3/storm-core/src/clj/backtype/storm/daemon/executor.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/daemon/executor.clj b/storm-core/src/clj/backtype/storm/daemon/executor.clj index f989654..2d50770 100644 --- a/storm-core/src/clj/backtype/storm/daemon/executor.clj +++ b/storm-core/src/clj/backtype/storm/daemon/executor.clj @@ -55,7 +55,7 @@ (.prepare grouping context (GlobalStreamId. component-id stream-id) target-tasks) (if (instance? LoadAwareCustomStreamGrouping grouping) (fn [task-id ^List values load] - (.chooseTasks grouping task-id values load)) + (.chooseTasks grouping task-id values load)) (fn [task-id ^List values load] (.chooseTasks grouping task-id values)))) http://git-wip-us.apache.org/repos/asf/storm/blob/664b0ce3/storm-core/src/clj/backtype/storm/daemon/worker.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj index 453801d..583606e 100644 --- a/storm-core/src/clj/backtype/storm/daemon/worker.clj +++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj @@ -313,6 +313,8 @@ [node (Integer/valueOf port-str)] )) +(def LOAD-REFRESH-INTERVAL-MS 5000) + (defn mk-refresh-load [worker] (let [local-tasks (set (:task-ids worker)) remote-tasks (set/difference (worker-outbound-tasks worker) local-tasks) @@ -331,7 +333,7 @@ (.setRemote load-mapping remote-load) (when (> now @next-update) (.sendLoadMetrics (:receiver worker) local-pop) - (reset! next-update (+ 5000 now)))))))) + (reset! next-update (+ LOAD-REFRESH-INTERVAL-MS now)))))))) (defn mk-refresh-connections [worker] (let [outbound-tasks (worker-outbound-tasks worker)
