Repository: storm Updated Branches: refs/heads/master 3600953b6 -> 2b7a75839
logs the storm version when starting Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b52988ab Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b52988ab Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b52988ab Branch: refs/heads/master Commit: b52988ab1d6c3ef853769ebb272e27caaf55ec38 Parents: 7041dd7 Author: Derek Dagit <[email protected]> Authored: Thu Dec 3 09:55:26 2015 -0600 Committer: Derek Dagit <[email protected]> Committed: Thu Dec 3 09:55:26 2015 -0600 ---------------------------------------------------------------------- storm-core/src/clj/backtype/storm/daemon/drpc.clj | 6 +++++- storm-core/src/clj/backtype/storm/daemon/logviewer.clj | 6 +++++- storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 8 ++++++-- storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 8 ++++++-- storm-core/src/clj/backtype/storm/ui/core.clj | 8 ++++++-- storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj | 8 ++++++-- 6 files changed, 34 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/b52988ab/storm-core/src/clj/backtype/storm/daemon/drpc.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/daemon/drpc.clj b/storm-core/src/clj/backtype/storm/daemon/drpc.clj index 40744fb..7ffb7d8 100644 --- a/storm-core/src/clj/backtype/storm/daemon/drpc.clj +++ b/storm-core/src/clj/backtype/storm/daemon/drpc.clj @@ -24,7 +24,8 @@ ThreadPoolExecutor ArrayBlockingQueue TimeUnit]) (:import [backtype.storm.daemon Shutdownable]) (:import [java.net InetAddress]) - (:import [backtype.storm.generated AuthorizationException]) + (:import [backtype.storm.generated AuthorizationException] + [backtype.storm.utils VersionInfo]) (:use [backtype.storm config log util]) (:use [backtype.storm.daemon common]) (:use [backtype.storm.ui helpers]) @@ -41,6 +42,8 @@ (defmeter drpc:num-fetchRequest-calls) (defmeter drpc:num-shutdown-calls) +(def STORM-VERSION (VersionInfo/getVersion)) + (defn timeout-check-secs [] 5) (defn acquire-queue [queues-atom function] @@ -205,6 +208,7 @@ (defn launch-server! ([] + (log-message "Starting drpc server for storm version '" STORM-VERSION "'") (let [conf (read-storm-config) worker-threads (int (conf DRPC-WORKER-THREADS)) queue-size (int (conf DRPC-QUEUE-SIZE)) http://git-wip-us.apache.org/repos/asf/storm/blob/b52988ab/storm-core/src/clj/backtype/storm/daemon/logviewer.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj index 80ee01a..78adef6 100644 --- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj +++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj @@ -20,7 +20,7 @@ (:use [hiccup core page-helpers form-helpers]) (:use [backtype.storm config util log timer]) (:use [backtype.storm.ui helpers]) - (:import [backtype.storm.utils Utils]) + (:import [backtype.storm.utils Utils VersionInfo]) (:import [org.slf4j LoggerFactory]) (:import [java.util Arrays]) (:import [java.util.zip GZIPInputStream]) @@ -46,6 +46,7 @@ (:gen-class)) (def ^:dynamic *STORM-CONF* (read-storm-config)) +(def STORM-VERSION (VersionInfo/getVersion)) (defmeter logviewer:num-log-page-http-requests) (defmeter logviewer:num-daemonlog-page-http-requests) @@ -1182,5 +1183,8 @@ daemonlog-root (log-root-dir (conf LOGVIEWER-APPENDER-NAME))] (setup-default-uncaught-exception-handler) (start-log-cleaner! conf log-root) + (log-message "Starting logviewer server for storm version '" + STORM-VERSION + "'") (start-logviewer! conf log-root daemonlog-root) (start-metrics-reporters))) http://git-wip-us.apache.org/repos/asf/storm/blob/b52988ab/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 71d4654..0ed2e59 100644 --- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj +++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj @@ -85,6 +85,8 @@ (defmeter nimbus:num-getComponentPageInfo-calls) (defmeter nimbus:num-shutdown-calls) +(def STORM-VERSION (VersionInfo/getVersion)) + (defn file-cache-map [conf] (TimeCacheMap. (int (conf NIMBUS-FILE-COPY-EXPIRATION-SECS)) @@ -1260,7 +1262,7 @@ (.getPort (:nimbus-host-port-info nimbus)) (current-time-secs) false ;is-leader - (str (VersionInfo/getVersion)))) + STORM-VERSION)) (.addToLeaderLockQueue (:leader-elector nimbus)) (cleanup-corrupt-topologies! nimbus) @@ -1951,7 +1953,9 @@ (add-shutdown-hook-with-force-kill-in-1-sec (fn [] (.shutdown service-handler) (.stop server))) - (log-message "Starting Nimbus server...") + (log-message "Starting nimbus server for storm version '" + STORM-VERSION + "'") (.serve server) service-handler)) http://git-wip-us.apache.org/repos/asf/storm/blob/b52988ab/storm-core/src/clj/backtype/storm/daemon/supervisor.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj index d659d57..e4ebddd 100644 --- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj +++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj @@ -46,6 +46,8 @@ (defmulti launch-worker (fn [supervisor & _] (cluster-mode (:conf supervisor)))) (defmulti mk-code-distributor cluster-mode) +(def STORM-VERSION (VersionInfo/getVersion)) + (defprotocol SupervisorDaemon (get-id [this]) (get-conf [this]) @@ -307,7 +309,7 @@ :isupervisor isupervisor :active (atom true) :uptime (uptime-computer) - :version (str (VersionInfo/getVersion)) + :version STORM-VERSION :worker-thread-pids-atom (atom {}) :storm-cluster-state (cluster/mk-storm-cluster-state conf :acls (when (Utils/isZkAuthenticationConfiguredStormServer @@ -968,7 +970,9 @@ (swap! (:worker-thread-pids-atom supervisor) assoc worker-id pid) )) -(defn -launch [supervisor] +(defn -launch + [supervisor] + (log-message "Starting supervisor for storm version '" STORM-VERSION "'") (let [conf (read-storm-config)] (validate-distributed-mode! conf) (let [supervisor (mk-supervisor conf nil supervisor)] http://git-wip-us.apache.org/repos/asf/storm/blob/b52988ab/storm-core/src/clj/backtype/storm/ui/core.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj index cc6632a..96079aa 100644 --- a/storm-core/src/clj/backtype/storm/ui/core.clj +++ b/storm-core/src/clj/backtype/storm/ui/core.clj @@ -57,6 +57,7 @@ (def ^:dynamic *UI-ACL-HANDLER* (mk-authorization-handler (*STORM-CONF* NIMBUS-AUTHORIZER) *STORM-CONF*)) (def ^:dynamic *UI-IMPERSONATION-HANDLER* (mk-authorization-handler (*STORM-CONF* NIMBUS-IMPERSONATION-AUTHORIZER) *STORM-CONF*)) (def http-creds-handler (AuthUtils/GetUiHttpCredentialsPlugin *STORM-CONF*)) +(def STORM-VERSION (VersionInfo/getVersion)) (defmeter ui:num-cluster-configuration-http-requests) (defmeter ui:num-cluster-summary-http-requests) @@ -376,7 +377,7 @@ (map #(.get_num_executors ^TopologySummary %)) (reduce +))] {"user" user - "stormVersion" (str (VersionInfo/getVersion)) + "stormVersion" STORM-VERSION "supervisors" (count sups) "topologies" topologies "slotsTotal" total-slots @@ -1285,4 +1286,7 @@ (catch Exception ex (log-error ex)))) -(defn -main [] (start-server!)) +(defn -main + [] + (log-message "Starting ui server for storm version '" STORM-VERSION "'") + (start-server!)) http://git-wip-us.apache.org/repos/asf/storm/blob/b52988ab/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj b/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj index 588f6aa..e9d5db5 100644 --- a/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj +++ b/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj @@ -19,12 +19,14 @@ [java.util.concurrent ConcurrentHashMap] [java.util.concurrent.atomic AtomicInteger] [backtype.storm.generated HBNodes - HBServerMessageType HBMessage HBMessageData HBPulse]) + HBServerMessageType HBMessage HBMessageData HBPulse] + [backtype.storm.utils VersionInfo]) (:use [clojure.string :only [replace-first split]] [backtype.storm log config util]) (:require [clojure.java.jmx :as jmx]) (:gen-class)) +(def STORM-VERSION (VersionInfo/getVersion)) ;; Stats Functions @@ -228,7 +230,9 @@ response))))) (defn launch-server! [] - (log-message "Starting Server.") + (log-message "Starting pacemaker server for storm version '" + STORM-VERSION + "'") (let [conf (override-login-config-with-system-property (read-storm-config))] (PacemakerServer. (mk-handler conf) conf)))
