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 2017/03/04 02:29:10 UTC
[1/3] storm git commit: STORM-2389 Avoid instantiating Event Logger
when topology.eventlogger.executors=0
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch ff427212b -> b03e64af5
STORM-2389 Avoid instantiating Event Logger when topology.eventlogger.executors=0
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c836bcd9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c836bcd9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c836bcd9
Branch: refs/heads/1.0.x-branch
Commit: c836bcd9516ba9ec43759fe3abd0d0d82840603d
Parents: ff42721
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Mar 2 18:54:18 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Mar 4 11:28:25 2017 +0900
----------------------------------------------------------------------
.../src/clj/org/apache/storm/daemon/common.clj | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c836bcd9/storm-core/src/clj/org/apache/storm/daemon/common.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/common.clj b/storm-core/src/clj/org/apache/storm/daemon/common.clj
index 74f2dac..4d1f0a9 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/common.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/common.clj
@@ -348,11 +348,18 @@
:conf {TOPOLOGY-TASKS 0})]
(.put_to_bolts topology SYSTEM-COMPONENT-ID system-bolt-spec)))
+(defn has-ackers? [storm-conf]
+ (or (nil? (storm-conf TOPOLOGY-ACKER-EXECUTORS)) (> (storm-conf TOPOLOGY-ACKER-EXECUTORS) 0)))
+
+(defn has-eventloggers? [storm-conf]
+ (or (nil? (storm-conf TOPOLOGY-EVENTLOGGER-EXECUTORS)) (> (storm-conf TOPOLOGY-EVENTLOGGER-EXECUTORS) 0)))
+
(defn system-topology! [storm-conf ^StormTopology topology]
(validate-basic! topology)
(let [ret (.deepCopy topology)]
(add-acker! storm-conf ret)
- (add-eventlogger! storm-conf ret)
+ (if (has-eventloggers? storm-conf)
+ (add-eventlogger! storm-conf ret))
(add-metric-components! storm-conf ret)
(add-system-components! storm-conf ret)
(add-metric-streams! ret)
@@ -361,12 +368,6 @@
ret
))
-(defn has-ackers? [storm-conf]
- (or (nil? (storm-conf TOPOLOGY-ACKER-EXECUTORS)) (> (storm-conf TOPOLOGY-ACKER-EXECUTORS) 0)))
-
-(defn has-eventloggers? [storm-conf]
- (or (nil? (storm-conf TOPOLOGY-EVENTLOGGER-EXECUTORS)) (> (storm-conf TOPOLOGY-EVENTLOGGER-EXECUTORS) 0)))
-
(defn num-start-executors [component]
(thrift/parallelism-hint (.get_common component)))
[3/3] storm git commit: STORM-2389: CHANGELOG
Posted by ka...@apache.org.
STORM-2389: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b03e64af
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b03e64af
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b03e64af
Branch: refs/heads/1.0.x-branch
Commit: b03e64af59f9e20b5bcad8bcd053776f733367d2
Parents: bf277b4
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Mar 4 11:29:01 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Mar 4 11:29:01 2017 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b03e64af/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e962f8..260c113 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
\ufeff## 1.0.4
+ * STORM-2389: Avoid instantiating Event Logger when topology.eventlogger.executors=0
* STORM-2386: Fail-back Blob deletion also fails in BlobSynchronizer.syncBlobs
* STORM-2360: Storm-Hive: Thrift version mismatch with storm-core
* STORM-2372: Pacemaker client doesn't clean up heartbeats properly
[2/3] storm git commit: Merge branch 'STORM-2389-1.0.x' into
1.0.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2389-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/bf277b4e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bf277b4e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bf277b4e
Branch: refs/heads/1.0.x-branch
Commit: bf277b4e59cfa69b1241860a75b33c6fce9e5a67
Parents: ff42721 c836bcd
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Mar 4 11:28:29 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Mar 4 11:28:29 2017 +0900
----------------------------------------------------------------------
.../src/clj/org/apache/storm/daemon/common.clj | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------