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/01/04 22:35:38 UTC
[1/4] storm git commit: Adding context
Repository: storm
Updated Branches:
refs/heads/master 59a960552 -> 0390012bd
Adding context
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/96939d49
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/96939d49
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/96939d49
Branch: refs/heads/master
Commit: 96939d49ff83c99b200c47dd5e077e270a36909a
Parents: 5689085
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Wed Dec 16 16:46:33 2015 -0600
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Wed Dec 16 16:46:33 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/executor.clj | 3 ++-
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 3 ++-
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 3 ++-
storm-core/src/clj/backtype/storm/daemon/worker.clj | 4 ++--
4 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/96939d49/storm-core/src/clj/backtype/storm/daemon/executor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/executor.clj b/storm-core/src/clj/backtype/storm/daemon/executor.clj
index 2aeb5e7..7a079fe 100644
--- a/storm-core/src/clj/backtype/storm/daemon/executor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/executor.clj
@@ -247,7 +247,8 @@
:transfer-fn (mk-executor-transfer-fn batch-transfer->worker storm-conf)
:suicide-fn (:suicide-fn worker)
:storm-cluster-state (cluster/mk-storm-cluster-state (:cluster-state worker)
- :acls (Utils/getWorkerACL storm-conf))
+ :acls (Utils/getWorkerACL storm-conf)
+ :context (ClusterStateContext. DaemonType/WORKER))
:type executor-type
;; TODO: should refactor this to be part of the executor specific map (spout or bolt with :common field)
:stats (mk-executor-stats <> (sampling-rate storm-conf))
http://git-wip-us.apache.org/repos/asf/storm/blob/96939d49/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 f97d386..6978547 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -175,7 +175,8 @@
:storm-cluster-state (cluster/mk-storm-cluster-state conf :acls (when
(Utils/isZkAuthenticationConfiguredStormServer
conf)
- NIMBUS-ZK-ACLS) :separate-zk-writer? true)
+ NIMBUS-ZK-ACLS)
+ :context (ClusterStateContext. DaemonType/NIMBUS))
:submit-lock (Object.)
:cred-update-lock (Object.)
:log-update-lock (Object.)
http://git-wip-us.apache.org/repos/asf/storm/blob/96939d49/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 3acc348..310b1c5 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -316,7 +316,8 @@
:storm-cluster-state (cluster/mk-storm-cluster-state conf :acls (when
(Utils/isZkAuthenticationConfiguredStormServer
conf)
- SUPERVISOR-ZK-ACLS))
+ SUPERVISOR-ZK-ACLS)
+ :context (ClusterStateContext. DaemonType/SUPERVISOR))
:local-state (supervisor-state conf)
:supervisor-id (.getSupervisorId isupervisor)
:assignment-id (.getAssignmentId isupervisor)
http://git-wip-us.apache.org/repos/asf/storm/blob/96939d49/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj
index d978315..09fe3a1 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -592,7 +592,7 @@
(let [storm-conf (read-supervisor-storm-conf conf storm-id)
storm-conf (override-login-config-with-system-property storm-conf)
acls (Utils/getWorkerACL storm-conf)
- cluster-state (cluster/mk-distributed-cluster-state conf :auth-conf storm-conf :acls acls)
+ cluster-state (cluster/mk-distributed-cluster-state conf :auth-conf storm-conf :acls acls :context (ClusterStateContext. DaemonType/WORKER))
storm-cluster-state (cluster/mk-storm-cluster-state cluster-state :acls acls)
initial-credentials (.credentials storm-cluster-state storm-id nil)
auto-creds (AuthUtils/GetAutoCredentials storm-conf)
@@ -759,4 +759,4 @@
(setup-default-uncaught-exception-handler)
(validate-distributed-mode! conf)
(let [worker (mk-worker conf nil storm-id assignment-id (Integer/parseInt port-str) worker-id)]
- (add-shutdown-hook-with-force-kill-in-1-sec #(.shutdown worker)))))
\ No newline at end of file
+ (add-shutdown-hook-with-force-kill-in-1-sec #(.shutdown worker)))))
[4/4] storm git commit: Added STORM-1397 to Changelog
Posted by bo...@apache.org.
Added STORM-1397 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0390012b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0390012b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0390012b
Branch: refs/heads/master
Commit: 0390012bdf5f0e79d5bb450cf9f16f7bc6bce7c1
Parents: a13ebd6
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 4 15:24:15 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 4 15:24:15 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0390012b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb3717b..5a0f634 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1397: Merge conflict from Pacemaker merge
* STORM-1373: Blobstore API sample example usage
* STORM-1409: StormClientErrorHandler is not used
* STORM-1411: Some fixes for storm-windowing
[2/4] storm git commit: Fixing missing includes.
Posted by bo...@apache.org.
Fixing missing includes.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6c958879
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6c958879
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6c958879
Branch: refs/heads/master
Commit: 6c95887945bd7fe845b9d399b5969d52cf7295da
Parents: 96939d4
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Wed Dec 16 17:00:51 2015 -0600
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Wed Dec 16 17:00:51 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/executor.clj | 1 +
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 1 +
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 1 +
storm-core/src/clj/backtype/storm/daemon/worker.clj | 1 +
4 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6c958879/storm-core/src/clj/backtype/storm/daemon/executor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/executor.clj b/storm-core/src/clj/backtype/storm/daemon/executor.clj
index 7a079fe..84c64aa 100644
--- a/storm-core/src/clj/backtype/storm/daemon/executor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/executor.clj
@@ -34,6 +34,7 @@
(:import [backtype.storm.daemon Shutdownable])
(:import [backtype.storm.metric.api IMetric IMetricsConsumer$TaskInfo IMetricsConsumer$DataPoint StateMetric])
(:import [backtype.storm Config Constants])
+ (:import [backtype.storm.cluster ClusterStateContext DaemonType])
(:import [backtype.storm.grouping LoadAwareCustomStreamGrouping LoadAwareShuffleGrouping LoadMapping ShuffleGrouping])
(:import [java.util.concurrent ConcurrentLinkedQueue])
(:require [backtype.storm [tuple :as tuple] [thrift :as thrift]
http://git-wip-us.apache.org/repos/asf/storm/blob/6c958879/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 6978547..287de02 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -47,6 +47,7 @@
BeginDownloadResult ListBlobsResult ComponentPageInfo TopologyPageInfo LogConfig LogLevel LogLevelAction
ProfileRequest ProfileAction NodeInfo])
(:import [backtype.storm.daemon Shutdownable])
+ (:import [backtype.storm.cluster ClusterStateContext DaemonType])
(:use [backtype.storm util config log timer zookeeper local-state])
(:require [backtype.storm [cluster :as cluster]
[converter :as converter]
http://git-wip-us.apache.org/repos/asf/storm/blob/6c958879/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 310b1c5..2568861 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -19,6 +19,7 @@
[backtype.storm.utils LocalState Time Utils]
[backtype.storm.daemon Shutdownable]
[backtype.storm Constants]
+ [backtype.storm.cluster ClusterStateContext DaemonType]
[java.net JarURLConnection]
[java.net URI]
[org.apache.commons.io FileUtils])
http://git-wip-us.apache.org/repos/asf/storm/blob/6c958879/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj
index 09fe3a1..f265bb2 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -36,6 +36,7 @@
(:import [backtype.storm.task WorkerTopologyContext])
(:import [backtype.storm Constants])
(:import [backtype.storm.security.auth AuthUtils])
+ (:import [backtype.storm.cluster ClusterStateContext DaemonType])
(:import [javax.security.auth Subject])
(:import [java.security PrivilegedExceptionAction])
(:import [org.apache.logging.log4j LogManager])
[3/4] storm git commit: Merge branch 'STORM-1397' of
https://github.com/knusbaum/incubator-storm into STORM-1397
Posted by bo...@apache.org.
Merge branch 'STORM-1397' of https://github.com/knusbaum/incubator-storm into STORM-1397
STORM-1397: Merge conflict from Pacemaker merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a13ebd6e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a13ebd6e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a13ebd6e
Branch: refs/heads/master
Commit: a13ebd6e568135c0b0124911da22d311f1b183be
Parents: 59a9605 6c95887
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 4 15:23:52 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 4 15:23:52 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/executor.clj | 4 +++-
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 4 +++-
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 4 +++-
storm-core/src/clj/backtype/storm/daemon/worker.clj | 5 +++--
4 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a13ebd6e/storm-core/src/clj/backtype/storm/daemon/executor.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a13ebd6e/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a13ebd6e/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------