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:36 UTC
[26/27] storm git commit: Merge branch 'ClusterUtils' of
https://github.com/hustfxj/storm into STORM-1273
Merge branch 'ClusterUtils' of https://github.com/hustfxj/storm into STORM-1273
STORM-1273: port backtype.storm.cluster to java
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1b5d9a85
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1b5d9a85
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1b5d9a85
Branch: refs/heads/master
Commit: 1b5d9a85021ff4c7bb8e95a55a225277babb2378
Parents: 11232b5 0af6799
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Feb 24 09:45:14 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Feb 24 09:45:14 2016 -0600
----------------------------------------------------------------------
conf/defaults.yaml | 2 +-
.../src/clj/org/apache/storm/thrift.clj | 2 +-
storm-core/src/clj/org/apache/storm/cluster.clj | 700 -------------------
.../cluster_state/zookeeper_state_factory.clj | 165 -----
.../clj/org/apache/storm/command/heartbeats.clj | 6 +-
.../apache/storm/command/shell_submission.clj | 2 +-
.../src/clj/org/apache/storm/converter.clj | 23 +-
.../src/clj/org/apache/storm/daemon/common.clj | 12 +-
.../clj/org/apache/storm/daemon/executor.clj | 13 +-
.../src/clj/org/apache/storm/daemon/nimbus.clj | 161 +++--
.../clj/org/apache/storm/daemon/supervisor.clj | 38 +-
.../src/clj/org/apache/storm/daemon/worker.clj | 59 +-
.../clj/org/apache/storm/internal/thrift.clj | 2 +-
.../storm/pacemaker/pacemaker_state_factory.clj | 141 ----
storm-core/src/clj/org/apache/storm/stats.clj | 3 +-
storm-core/src/clj/org/apache/storm/testing.clj | 12 +-
storm-core/src/clj/org/apache/storm/ui/core.clj | 2 +-
storm-core/src/clj/org/apache/storm/util.clj | 11 +
.../src/clj/org/apache/storm/zookeeper.clj | 74 --
.../jvm/org/apache/storm/callback/Callback.java | 23 -
.../storm/callback/ZKStateChangedCallback.java | 25 +
.../org/apache/storm/cluster/ClusterState.java | 217 ------
.../storm/cluster/ClusterStateContext.java | 2 +-
.../storm/cluster/ClusterStateFactory.java | 28 -
.../org/apache/storm/cluster/ClusterUtils.java | 244 +++++++
.../org/apache/storm/cluster/ExecutorBeat.java | 44 ++
.../org/apache/storm/cluster/IStateStorage.java | 222 ++++++
.../storm/cluster/IStormClusterState.java | 122 ++++
.../storm/cluster/PaceMakerStateStorage.java | 216 ++++++
.../cluster/PaceMakerStateStorageFactory.java | 64 ++
.../storm/cluster/StateStorageFactory.java | 28 +
.../storm/cluster/StormClusterStateImpl.java | 686 ++++++++++++++++++
.../apache/storm/cluster/ZKStateStorage.java | 244 +++++++
.../storm/cluster/ZKStateStorageFactory.java | 36 +
.../apache/storm/pacemaker/PacemakerClient.java | 6 +-
.../testing/staticmocking/MockedCluster.java | 31 +
.../MockedPaceMakerStateStorageFactory.java | 32 +
.../org/apache/storm/zookeeper/Zookeeper.java | 77 +-
.../org/apache/storm/integration_test.clj | 13 +-
.../test/clj/org/apache/storm/cluster_test.clj | 202 +++---
.../storm/messaging/netty_integration_test.clj | 1 +
.../test/clj/org/apache/storm/nimbus_test.clj | 158 +++--
.../storm/pacemaker_state_factory_test.clj | 121 ++--
.../storm/security/auth/nimbus_auth_test.clj | 3 +-
.../clj/org/apache/storm/supervisor_test.clj | 163 +++--
45 files changed, 2554 insertions(+), 1882 deletions(-)
----------------------------------------------------------------------