upmerge from master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fc84e523 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fc84e523 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fc84e523 Branch: refs/heads/master Commit: fc84e52342bb48c17eb4795face50d35820a8d56 Parents: 16a0c8d 4ca7522 Author: å«ä¹ <[email protected]> Authored: Sun Feb 21 14:06:24 2016 +0800 Committer: å«ä¹ <[email protected]> Committed: Sun Feb 21 14:06:24 2016 +0800 ---------------------------------------------------------------------- CHANGELOG.md | 9 + README.markdown | 1 + bin/storm.cmd | 2 +- bin/storm.py | 4 +- examples/storm-starter/pom.xml | 10 + .../org/apache/storm/starter/clj/word_count.clj | 3 +- external/storm-hdfs/pom.xml | 23 +- pom.xml | 10 + storm-clojure/pom.xml | 74 ++++ .../src/clj/org/apache/storm/clojure.clj | 207 +++++++++++ .../src/clj/org/apache/storm/thrift.clj | 286 +++++++++++++++ storm-clojure/src/test/clj/clojure_test.clj | 158 +++++++++ storm-core/src/clj/org/apache/storm/clojure.clj | 207 ----------- .../org/apache/storm/command/dev_zookeeper.clj | 28 -- .../clj/org/apache/storm/command/get_errors.clj | 3 +- .../org/apache/storm/command/healthcheck.clj | 90 ----- .../clj/org/apache/storm/command/monitor.clj | 2 +- .../clj/org/apache/storm/command/rebalance.clj | 3 +- .../org/apache/storm/command/set_log_level.clj | 3 +- .../apache/storm/command/shell_submission.clj | 2 +- .../src/clj/org/apache/storm/daemon/common.clj | 121 ++++--- .../clj/org/apache/storm/daemon/executor.clj | 52 +-- .../clj/org/apache/storm/daemon/logviewer.clj | 19 +- .../src/clj/org/apache/storm/daemon/nimbus.clj | 104 +++--- .../clj/org/apache/storm/daemon/supervisor.clj | 205 +++++++---- .../src/clj/org/apache/storm/daemon/task.clj | 4 +- .../src/clj/org/apache/storm/daemon/worker.clj | 116 +++--- storm-core/src/clj/org/apache/storm/event.clj | 71 ---- .../clj/org/apache/storm/internal/clojure.clj | 201 +++++++++++ .../clj/org/apache/storm/internal/thrift.clj | 96 +++++ .../src/clj/org/apache/storm/local_state.clj | 134 ------- .../org/apache/storm/local_state_converter.clj | 24 ++ storm-core/src/clj/org/apache/storm/testing.clj | 37 +- storm-core/src/clj/org/apache/storm/thrift.clj | 286 --------------- storm-core/src/clj/org/apache/storm/timer.clj | 128 ------- storm-core/src/clj/org/apache/storm/ui/core.clj | 10 +- .../src/jvm/org/apache/storm/StormTimer.java | 241 +++++++++++++ storm-core/src/jvm/org/apache/storm/Thrift.java | 351 +++++++++++++++++++ .../org/apache/storm/command/DevZookeeper.java | 35 ++ .../org/apache/storm/command/HealthCheck.java | 125 +++++++ .../org/apache/storm/event/EventManager.java | 24 ++ .../org/apache/storm/event/EventManagerImp.java | 97 +++++ .../jvm/org/apache/storm/testing/NGrouping.java | 4 +- .../storm/testing/PythonShellMetricsBolt.java | 14 +- .../storm/testing/PythonShellMetricsSpout.java | 8 +- .../jvm/org/apache/storm/utils/LocalState.java | 112 +++++- .../src/jvm/org/apache/storm/utils/Utils.java | 7 + .../org/apache/storm/integration_test.clj | 259 +++++++------- .../org/apache/storm/testing4j_test.clj | 72 ++-- .../test/clj/org/apache/storm/clojure_test.clj | 64 ++-- .../test/clj/org/apache/storm/cluster_test.clj | 3 +- .../test/clj/org/apache/storm/drpc_test.clj | 23 +- .../test/clj/org/apache/storm/grouping_test.clj | 56 +-- .../storm/messaging/netty_integration_test.clj | 18 +- .../clj/org/apache/storm/messaging_test.clj | 14 +- .../test/clj/org/apache/storm/metrics_test.clj | 85 +++-- .../test/clj/org/apache/storm/nimbus_test.clj | 260 +++++++++----- .../scheduler/resource_aware_scheduler_test.clj | 3 +- .../clj/org/apache/storm/supervisor_test.clj | 159 +++++---- .../clj/org/apache/storm/tick_tuple_test.clj | 15 +- .../clj/org/apache/storm/transactional_test.clj | 3 +- 61 files changed, 3104 insertions(+), 1681 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/fc84e523/storm-core/src/clj/org/apache/storm/ui/core.clj ---------------------------------------------------------------------- diff --cc storm-core/src/clj/org/apache/storm/ui/core.clj index 4f616d6,27ac844..41b1989 --- a/storm-core/src/clj/org/apache/storm/ui/core.clj +++ b/storm-core/src/clj/org/apache/storm/ui/core.clj @@@ -145,11 -145,13 +145,13 @@@ (defn event-log-link [topology-id component-id host port secure?] - (logviewer-link host (Utils/eventLogsFilename topology-id (str port)) secure?)) + (logviewer-link host (Utils/eventLogsFilename topology-id port) secure?)) (defn worker-log-link [host port topology-id secure?] - (let [fname (Utils/logsFilename topology-id (str port))] - (logviewer-link host fname secure?))) + (if (or (empty? host) (let [port_str (str port "")] (or (empty? port_str) (= "0" port_str)))) + "" - (let [fname (Utils/logsFilename topology-id port)] ++ (let [fname (Utils/logsFilename topology-id (str port))] + (logviewer-link host fname secure?)))) (defn nimbus-log-link [host] (url-format "http://%s:%s/daemonlog?file=nimbus.log"; host (*STORM-CONF* LOGVIEWER-PORT)))
