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 2018/02/02 04:19:00 UTC
[1/2] storm git commit: STORM-2853 Initialize tick tuple after
initializing spouts/bolts
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch 174f4862f -> 5b507eaf0
STORM-2853 Initialize tick tuple after initializing spouts/bolts
* this prevents newly-initializing executor in deactivated topology to show high CPU usage
* this is based on the fact that all the tasks in executor are for same component
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4841475a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4841475a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4841475a
Branch: refs/heads/1.0.x-branch
Commit: 4841475a7e642e8148d67b320941a6bdd8e4a230
Parents: 174f486
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Feb 1 10:08:48 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Feb 2 13:18:50 2018 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/executor.clj | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4841475a/storm-core/src/clj/org/apache/storm/daemon/executor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/executor.clj b/storm-core/src/clj/org/apache/storm/daemon/executor.clj
index e0c048f..98fc747 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/executor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/executor.clj
@@ -345,7 +345,7 @@
(when (seq data-points)
(task/send-unanchored task-data Constants/METRICS_STREAM_ID [task-info data-points]))))
-(defn setup-ticks! [worker executor-data]
+(defn setup-ticks! [executor-data]
(let [storm-conf (:storm-conf executor-data)
comp-id (:component-id executor-data)
tick-time-secs (storm-conf TOPOLOGY-TICK-TUPLE-FREQ-SECS)
@@ -357,7 +357,7 @@
(= :spout (:type executor-data))))
(log-message "Timeouts disabled for executor " comp-id ":" (:executor-id executor-data))
(schedule-recurring
- (:user-timer worker)
+ (:user-timer (:worker executor-data))
tick-time-secs
tick-time-secs
(fn []
@@ -385,14 +385,13 @@
(.setLowWaterMark ((:storm-conf executor-data) BACKPRESSURE-DISRUPTOR-LOW-WATERMARK))
(.setEnableBackpressure ((:storm-conf executor-data) TOPOLOGY-BACKPRESSURE-ENABLE)))
- ;; starting the batch-transfer->worker ensures that anything publishing to that queue
+ ;; starting the batch-transfer->worker ensures that anything publishing to that queue
;; doesn't block (because it's a single threaded queue and the caching/consumer started
;; trick isn't thread-safe)
system-threads [(start-batch-transfer->worker-handler! worker executor-data)]
handlers (with-error-reaction report-error-and-die
(mk-threads executor-data task-datas initial-credentials))
- threads (concat handlers system-threads)]
- (setup-ticks! worker executor-data)
+ threads (concat handlers system-threads)]
(log-message "Finished loading executor " component-id ":" (pr-str executor-id))
;; TODO: add method here to get rendered stats... have worker call that when heartbeating
@@ -622,6 +621,7 @@
)))))
(reset! open-or-prepare-was-called? true)
(log-message "Opened spout " component-id ":" (keys task-datas))
+ (setup-ticks! executor-data)
(setup-metrics! executor-data)
(fn []
@@ -845,6 +845,7 @@
)))))
(reset! open-or-prepare-was-called? true)
(log-message "Prepared bolt " component-id ":" (keys task-datas))
+ (setup-ticks! executor-data)
(setup-metrics! executor-data)
(let [receive-queue (:receive-queue executor-data)
[2/2] storm git commit: Merge branch 'STORM-2853-1.0.x-merge' into
1.0.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2853-1.0.x-merge' 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/5b507eaf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5b507eaf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5b507eaf
Branch: refs/heads/1.0.x-branch
Commit: 5b507eaf03d9e5304e1025233b86766b27eadd78
Parents: 174f486 4841475
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Feb 2 13:18:54 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Feb 2 13:18:54 2018 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/executor.clj | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------