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/fb19f0d9 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fb19f0d9 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fb19f0d9 Branch: refs/heads/master Commit: fb19f0d95cbecfd86cc534677b53302a58046bf6 Parents: 7b35428 6390d18 Author: å«ä¹ <[email protected]> Authored: Fri Mar 11 10:15:53 2016 +0800 Committer: å«ä¹ <[email protected]> Committed: Fri Mar 11 10:15:53 2016 +0800 ---------------------------------------------------------------------- CHANGELOG.md | 3 + conf/log4j2.xml | 2 +- .../org/apache/storm/starter/ManualDRPC.java | 53 +- .../src/clj/org/apache/storm/LocalDRPC.clj | 56 -- .../src/clj/org/apache/storm/converter.clj | 15 + .../src/clj/org/apache/storm/daemon/common.clj | 350 +----------- .../src/clj/org/apache/storm/daemon/drpc.clj | 215 +------- .../clj/org/apache/storm/daemon/executor.clj | 24 +- .../clj/org/apache/storm/daemon/logviewer.clj | 2 +- .../src/clj/org/apache/storm/daemon/nimbus.clj | 63 +-- .../clj/org/apache/storm/daemon/supervisor.clj | 7 +- .../src/clj/org/apache/storm/daemon/task.clj | 5 +- .../src/clj/org/apache/storm/daemon/worker.clj | 24 +- storm-core/src/clj/org/apache/storm/testing.clj | 100 ++-- .../clj/org/apache/storm/trident/testing.clj | 2 - storm-core/src/clj/org/apache/storm/ui/core.clj | 15 +- .../src/jvm/org/apache/storm/LocalDRPC.java | 72 +++ .../org/apache/storm/daemon/DaemonCommon.java | 22 + .../jvm/org/apache/storm/daemon/DrpcServer.java | 357 ++++++++++++ .../org/apache/storm/daemon/StormCommon.java | 537 +++++++++++++++++++ .../storm/utils/StormCommonInstaller.java | 43 ++ .../src/jvm/org/apache/storm/utils/Utils.java | 16 + .../org/apache/storm/integration_test.clj | 6 +- .../test/clj/org/apache/storm/drpc_test.clj | 27 +- .../test/clj/org/apache/storm/nimbus_test.clj | 121 +++-- .../apache/storm/security/auth/auth_test.clj | 3 +- .../storm/security/auth/drpc_auth_test.clj | 5 +- .../clj/org/apache/storm/supervisor_test.clj | 11 +- 28 files changed, 1322 insertions(+), 834 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/fb19f0d9/storm-core/src/clj/org/apache/storm/converter.clj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/fb19f0d9/storm-core/src/clj/org/apache/storm/daemon/executor.clj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/fb19f0d9/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/fb19f0d9/storm-core/src/clj/org/apache/storm/daemon/task.clj ---------------------------------------------------------------------- diff --cc storm-core/src/clj/org/apache/storm/daemon/task.clj index 707cdda,f6c536d..80255ad --- a/storm-core/src/clj/org/apache/storm/daemon/task.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/task.clj @@@ -27,7 -27,10 +27,8 @@@ (:import [org.apache.storm.generated ShellComponent JavaObject]) (:import [org.apache.storm.spout ShellSpout]) (:import [java.util Collection List ArrayList]) - (:import [org.apache.storm Thrift]) + (:import [org.apache.storm Thrift] + (org.apache.storm.daemon StormCommon)) - (:require [org.apache.storm - [stats :as stats]]) (:require [org.apache.storm.daemon.builtin-metrics :as builtin-metrics])) (defn mk-topology-context-builder [worker executor-data topology] http://git-wip-us.apache.org/repos/asf/storm/blob/fb19f0d9/storm-core/src/clj/org/apache/storm/daemon/worker.clj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/fb19f0d9/storm-core/src/clj/org/apache/storm/testing.clj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/fb19f0d9/storm-core/src/clj/org/apache/storm/ui/core.clj ---------------------------------------------------------------------- diff --cc storm-core/src/clj/org/apache/storm/ui/core.clj index a538876,c1ea340..885d754 --- a/storm-core/src/clj/org/apache/storm/ui/core.clj +++ b/storm-core/src/clj/org/apache/storm/ui/core.clj @@@ -21,13 -21,10 +21,11 @@@ ring.middleware.multipart-params) (:use [ring.middleware.json :only [wrap-json-params]]) (:use [hiccup core page-helpers]) - (:use [org.apache.storm config util log stats converter]) + (:use [org.apache.storm config util log converter]) (:use [org.apache.storm.ui helpers]) - (:use [org.apache.storm.daemon [common :only [ACKER-COMPONENT-ID ACKER-INIT-STREAM-ID ACKER-ACK-STREAM-ID - ACKER-FAIL-STREAM-ID mk-authorization-handler]]]) (:import [org.apache.storm.utils Time] [org.apache.storm.generated NimbusSummary] + [org.apache.storm.stats StatsUtil] [org.apache.storm.ui UIHelpers IConfigurator FilterConfiguration] [org.apache.storm.metric StormMetricsRegistry]) (:use [clojure.string :only [blank? lower-case trim split]]) http://git-wip-us.apache.org/repos/asf/storm/blob/fb19f0d9/storm-core/test/clj/org/apache/storm/nimbus_test.clj ---------------------------------------------------------------------- diff --cc storm-core/test/clj/org/apache/storm/nimbus_test.clj index 1f708cb,fa475e7..e15c7a6 --- a/storm-core/test/clj/org/apache/storm/nimbus_test.clj +++ b/storm-core/test/clj/org/apache/storm/nimbus_test.clj @@@ -22,11 -22,10 +22,11 @@@ TestAggregatesCounter TestPlannerSpout TestPlannerBolt] [org.apache.storm.nimbus InMemoryTopologyActionNotifier] [org.apache.storm.generated GlobalStreamId] - [org.apache.storm Thrift MockAutoCred]) + [org.apache.storm Thrift MockAutoCred] + [org.apache.storm.stats BoltExecutorStats StatsUtil]) (:import [org.apache.storm.testing.staticmocking MockedZookeeper]) (:import [org.apache.storm.scheduler INimbus]) - (:import [org.mockito Mockito]) + (:import [org.mockito Mockito Matchers]) (:import [org.mockito.exceptions.base MockitoAssertionError]) (:import [org.apache.storm.nimbus ILeaderElector NimbusInfo]) (:import [org.apache.storm.testing.staticmocking MockedCluster])
