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 2018/03/28 21:22:20 UTC
[10/10] storm git commit: Merge branch 'heartbeats-promotion-v2' of
https://github.com/danny0405/storm into STORM-2693
Merge branch 'heartbeats-promotion-v2' of https://github.com/danny0405/storm into STORM-2693
STORM-2693: Heartbeats and assignments promotion for storm2.0
This closes #2433
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e6a3ac65
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e6a3ac65
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e6a3ac65
Branch: refs/heads/master
Commit: e6a3ac655db254d2e40a85eaeb932ea65cb6756d
Parents: 283f315 0dac58b
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Wed Mar 28 16:01:10 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Wed Mar 28 16:01:10 2018 -0500
----------------------------------------------------------------------
conf/defaults.yaml | 16 +
.../src/jvm/org/apache/storm/Config.java | 72 +-
.../src/jvm/org/apache/storm/StormTimer.java | 24 +-
.../src/jvm/org/apache/storm/Thrift.java | 42 +-
.../assignments/ILocalAssignmentsBackend.java | 116 +
.../assignments/InMemoryAssignmentBackend.java | 158 +
.../LocalAssignmentsBackendFactory.java | 48 +
.../org/apache/storm/cluster/ClusterUtils.java | 19 +-
.../org/apache/storm/cluster/DaemonType.java | 2 +
.../storm/cluster/IStormClusterState.java | 78 +-
.../storm/cluster/StormClusterStateImpl.java | 124 +-
.../apache/storm/cluster/ZKStateStorage.java | 15 +-
.../storm/cluster/ZKStateStorageFactory.java | 7 +-
.../org/apache/storm/daemon/worker/Worker.java | 57 +-
.../apache/storm/daemon/worker/WorkerState.java | 49 +-
.../jvm/org/apache/storm/generated/HBNodes.java | 32 +-
.../org/apache/storm/generated/HBRecords.java | 36 +-
.../jvm/org/apache/storm/generated/Nimbus.java | 5135 +++++++++++++-----
.../org/apache/storm/generated/Supervisor.java | 2968 ++++++++++
.../storm/generated/SupervisorAssignments.java | 478 ++
.../apache/storm/generated/SupervisorInfo.java | 177 +-
.../generated/SupervisorWorkerHeartbeat.java | 660 +++
.../generated/SupervisorWorkerHeartbeats.java | 561 ++
.../storm/generated/WorkerMetricList.java | 36 +-
.../storm/generated/WorkerTokenServiceType.java | 5 +-
.../grouping/LoadAwareShuffleGrouping.java | 8 +-
.../apache/storm/security/auth/IAuthorizer.java | 6 +-
.../security/auth/ThriftConnectionType.java | 5 +-
.../auth/authorizer/SimpleACLAuthorizer.java | 7 +-
.../SupervisorSimpleACLAuthorizer.java | 157 +
.../auth/kerberos/ServerCallbackHandler.java | 3 +-
.../jvm/org/apache/storm/stats/StatsUtil.java | 141 +-
.../apache/storm/topology/TopologyBuilder.java | 21 +-
.../apache/storm/utils/SupervisorClient.java | 88 +
storm-client/src/py/storm/Nimbus-remote | 21 +
storm-client/src/py/storm/Nimbus.py | 633 ++-
storm-client/src/py/storm/Supervisor-remote | 126 +
storm-client/src/py/storm/Supervisor.py | 694 +++
storm-client/src/py/storm/__init__.py | 2 +-
storm-client/src/py/storm/ttypes.py | 369 +-
storm-client/src/storm.thrift | 46 +-
.../LocalAssignmentsBackendTest.java | 102 +
.../cluster/StormClusterStateImplTest.java | 5 +-
.../apache/storm/command/shell_submission.clj | 2 +-
.../test/clj/org/apache/storm/nimbus_test.clj | 57 +-
.../storm/security/auth/nimbus_auth_test.clj | 4 +
.../org/apache/storm/stats/TestStatsUtil.java | 10 +-
.../java/org/apache/storm/DaemonConfig.java | 26 +
.../java/org/apache/storm/LocalCluster.java | 19 +
.../org/apache/storm/daemon/nimbus/Nimbus.java | 527 +-
.../storm/daemon/supervisor/BasicContainer.java | 40 +-
.../supervisor/BasicContainerLauncher.java | 13 +-
.../storm/daemon/supervisor/Container.java | 5 +-
.../daemon/supervisor/ContainerLauncher.java | 10 +-
.../storm/daemon/supervisor/LocalContainer.java | 7 +-
.../supervisor/LocalContainerLauncher.java | 7 +-
.../daemon/supervisor/ReadClusterState.java | 56 +-
.../daemon/supervisor/RunAsUserContainer.java | 19 +-
.../supervisor/RunAsUserContainerLauncher.java | 15 +-
.../storm/daemon/supervisor/Supervisor.java | 224 +-
.../daemon/supervisor/SupervisorUtils.java | 17 +-
.../timer/ReportWorkerHeartbeats.java | 112 +
.../supervisor/timer/SupervisorHeartbeat.java | 17 +-
.../timer/SynchronizeAssignments.java | 133 +
.../nimbus/AssignmentDistributionService.java | 312 ++
.../org/apache/storm/nimbus/ILeaderElector.java | 6 +-
.../IWorkerHeartbeatsRecoveryStrategy.java | 48 +
.../storm/nimbus/LeaderListenerCallback.java | 231 +
.../nimbus/NimbusHeartbeatsPressureTest.java | 241 +
...TimeOutWorkerHeartbeatsRecoveryStrategy.java | 80 +
...WorkerHeartbeatsRecoveryStrategyFactory.java | 53 +
.../storm/scheduler/SupervisorDetails.java | 27 +-
.../storm/zookeeper/LeaderElectorImp.java | 12 +-
.../org/apache/storm/zookeeper/Zookeeper.java | 145 +-
.../daemon/supervisor/BasicContainerTest.java | 244 +-
.../storm/daemon/supervisor/ContainerTest.java | 16 +-
76 files changed, 14135 insertions(+), 1949 deletions(-)
----------------------------------------------------------------------