Permalink
Browse files

Merge branch 'STORM-2389-1.0.x' into 1.0.x-branch

  • Loading branch information...
HeartSaVioR committed Mar 4, 2017
2 parents ff42721 + c836bcd commit bf277b4e59cfa69b1241860a75b33c6fce9e5a67
Showing with 8 additions and 7 deletions.
  1. +8 −7 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)))

0 comments on commit bf277b4

Please sign in to comment.