You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/02/24 17:17:32 UTC
[22/27] storm git commit: Merge branch 'master' into ClusterUtils
Merge branch 'master' into ClusterUtils
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/581cd298
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/581cd298
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/581cd298
Branch: refs/heads/master
Commit: 581cd29876fab988477ac661174cad5ffbeced1e
Parents: 3717f39 58050a5
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Tue Feb 23 19:54:31 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Tue Feb 23 19:56:06 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 2 +
.../src/clj/org/apache/storm/daemon/nimbus.clj | 2 +-
.../clj/org/apache/storm/daemon/supervisor.clj | 8 +-
.../src/clj/org/apache/storm/daemon/worker.clj | 3 +-
.../clj/org/apache/storm/process_simulator.clj | 49 ------------
storm-core/src/clj/org/apache/storm/testing.clj | 9 ++-
storm-core/src/clj/org/apache/storm/ui/core.clj | 4 +-
.../jvm/org/apache/storm/ProcessSimulator.java | 82 ++++++++++++++++++++
8 files changed, 98 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/581cd298/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
index 7d28075,28a6fb8..e43bab9
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@@ -1212,10 -1212,10 +1212,10 @@@
(.deleteBlob blob-store key nimbus-subject))
(log-debug "Creating list of key entries for blobstore inside zookeeper" all-keys "local" locally-available-active-keys)
(doseq [key locally-available-active-keys]
- (.setup-blobstore! storm-cluster-state key (:nimbus-host-port-info nimbus) (get-version-for-key key nimbus-host-port-info conf)))))
+ (.setupBlobstore storm-cluster-state key (:nimbus-host-port-info nimbus) (get-version-for-key key nimbus-host-port-info conf)))))
(defn- get-errors [storm-cluster-state storm-id component-id]
- (->> (apply clojurify-error (.errors storm-cluster-state storm-id component-id))
- (->> (.errors storm-cluster-state storm-id component-id)
++ (->> (map clojurify-error (.errors storm-cluster-state storm-id component-id))
(map #(doto (ErrorInfo. (:error %) (:time-secs %))
(.set_host (:host %))
(.set_port (:port %))))))
http://git-wip-us.apache.org/repos/asf/storm/blob/581cd298/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
index a6f3a62,a34d461..0cee414
--- a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
@@@ -35,7 -35,7 +35,7 @@@
(:use [org.apache.storm.daemon common])
(:import [org.apache.storm.command HealthCheck])
(:require [org.apache.storm.daemon [worker :as worker]]
- [org.apache.storm [process-simulator :as psim]]
- [org.apache.storm [cluster :as cluster]]
++
[clojure.set :as set])
(:import [org.apache.thrift.transport TTransportException])
(:import [org.apache.zookeeper data.ACL ZooDefs$Ids ZooDefs$Perms])
http://git-wip-us.apache.org/repos/asf/storm/blob/581cd298/storm-core/src/clj/org/apache/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/org/apache/storm/daemon/worker.clj
index a75dc35,db4a61a..af88f6a
--- a/storm-core/src/clj/org/apache/storm/daemon/worker.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/worker.clj
@@@ -19,8 -19,9 +19,9 @@@
(:require [clj-time.core :as time])
(:require [clj-time.coerce :as coerce])
(:require [org.apache.storm.daemon [executor :as executor]])
- (:require [org.apache.storm [cluster :as cluster]])
+
(:require [clojure.set :as set])
+ (:import [java.io File])
(:import [java.util.concurrent Executors]
[org.apache.storm.hooks IWorkerHook BaseWorkerHook]
[uk.org.lidalia.sysoutslf4j.context SysOutOverSLF4J])
http://git-wip-us.apache.org/repos/asf/storm/blob/581cd298/storm-core/src/clj/org/apache/storm/testing.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/581cd298/storm-core/src/clj/org/apache/storm/ui/core.clj
----------------------------------------------------------------------