You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/11/02 23:48:45 UTC
[11/12] storm git commit: Merge branch 'STORM-2018-1.0.x' of
https://github.com/revans2/incubator-storm into STORM-2018-1.0.x
Merge branch 'STORM-2018-1.0.x' of https://github.com/revans2/incubator-storm into STORM-2018-1.0.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3232fa01
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3232fa01
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3232fa01
Branch: refs/heads/1.0.x-branch
Commit: 3232fa01f7824db5b613e6e5a04771cbda3e6c0f
Parents: cea2464 0065ed9
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Nov 3 08:39:37 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Nov 3 08:39:37 2016 +0900
----------------------------------------------------------------------
bin/storm.py | 6 +-
log4j2/cluster.xml | 2 +-
.../cluster_state/zookeeper_state_factory.clj | 5 +-
.../org/apache/storm/command/healthcheck.clj | 88 --
.../org/apache/storm/command/kill_workers.clj | 33 -
.../clj/org/apache/storm/daemon/executor.clj | 4 +-
.../apache/storm/daemon/local_supervisor.clj | 28 +
.../clj/org/apache/storm/daemon/logviewer.clj | 7 +-
.../clj/org/apache/storm/daemon/supervisor.clj | 1233 ------------------
.../src/clj/org/apache/storm/daemon/worker.clj | 1 +
storm-core/src/clj/org/apache/storm/event.clj | 71 -
.../storm/pacemaker/pacemaker_state_factory.clj | 7 +-
storm-core/src/clj/org/apache/storm/testing.clj | 74 +-
.../jvm/org/apache/storm/ProcessSimulator.java | 82 ++
.../src/jvm/org/apache/storm/StormTimer.java | 242 ++++
.../storm/callback/DefaultWatcherCallBack.java | 35 +
.../apache/storm/callback/WatcherCallBack.java | 24 +
.../storm/callback/ZKStateChangedCallback.java | 25 +
.../storm/cluster/ClusterStateFactory.java | 4 +-
.../org/apache/storm/cluster/ClusterUtils.java | 244 ++++
.../org/apache/storm/cluster/ExecutorBeat.java | 44 +
.../org/apache/storm/cluster/IStateStorage.java | 219 ++++
.../storm/cluster/IStormClusterState.java | 126 ++
.../storm/cluster/StateStorageFactory.java | 28 +
.../storm/cluster/StormClusterStateImpl.java | 720 ++++++++++
.../org/apache/storm/cluster/VersionedData.java | 36 +
.../apache/storm/cluster/ZKStateStorage.java | 252 ++++
.../org/apache/storm/command/HealthCheck.java | 126 ++
.../org/apache/storm/command/KillWorkers.java | 38 +
.../org/apache/storm/daemon/DaemonCommon.java | 22 +
.../storm/daemon/metrics/MetricsUtils.java | 19 +-
.../storm/daemon/supervisor/AdvancedFSOps.java | 350 +++++
.../storm/daemon/supervisor/BasicContainer.java | 634 +++++++++
.../supervisor/BasicContainerLauncher.java | 59 +
.../storm/daemon/supervisor/Container.java | 534 ++++++++
.../daemon/supervisor/ContainerLauncher.java | 96 ++
.../supervisor/ContainerRecoveryException.java | 29 +
.../DefaultUncaughtExceptionHandler.java | 31 +
.../supervisor/EventManagerPushCallback.java | 37 +
.../daemon/supervisor/ExitCodeCallback.java | 30 +
.../storm/daemon/supervisor/Killable.java | 50 +
.../storm/daemon/supervisor/LocalContainer.java | 85 ++
.../supervisor/LocalContainerLauncher.java | 60 +
.../daemon/supervisor/ReadClusterState.java | 327 +++++
.../daemon/supervisor/RunAsUserContainer.java | 96 ++
.../supervisor/RunAsUserContainerLauncher.java | 57 +
.../apache/storm/daemon/supervisor/Slot.java | 785 +++++++++++
.../daemon/supervisor/StandaloneSupervisor.java | 83 ++
.../storm/daemon/supervisor/Supervisor.java | 362 +++++
.../daemon/supervisor/SupervisorUtils.java | 321 +++++
.../supervisor/timer/SupervisorHealthCheck.java | 41 +
.../supervisor/timer/SupervisorHeartbeat.java | 87 ++
.../daemon/supervisor/timer/UpdateBlobs.java | 105 ++
.../org/apache/storm/event/EventManager.java | 24 +
.../org/apache/storm/event/EventManagerImp.java | 97 ++
.../apache/storm/localizer/AsyncLocalizer.java | 420 ++++++
.../org/apache/storm/localizer/ILocalizer.java | 70 +
.../localizer/LocalDownloadedResource.java | 146 +++
.../LocalizedResourceRetentionSet.java | 2 +-
.../storm/localizer/LocalizedResourceSet.java | 8 +-
.../org/apache/storm/localizer/Localizer.java | 38 +-
.../storm/metric/StormMetricsRegistry.java | 88 ++
.../org/apache/storm/nimbus/ILeaderElector.java | 6 +-
.../serialization/SerializationFactory.java | 17 +-
.../org/apache/storm/testing/FeederSpout.java | 27 +-
.../staticmocking/MockedSupervisorUtils.java | 31 +
.../apache/storm/trident/util/TridentUtils.java | 2 +-
.../jvm/org/apache/storm/utils/ConfigUtils.java | 536 ++++++++
.../org/apache/storm/utils/InprocMessaging.java | 69 +-
.../jvm/org/apache/storm/utils/LocalState.java | 112 +-
.../org/apache/storm/utils/NimbusClient.java | 19 +-
.../src/jvm/org/apache/storm/utils/Time.java | 51 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 1055 +++++++++++++--
.../storm/zookeeper/LeaderElectorImp.java | 124 ++
.../apache/storm/zookeeper/ZkEventTypes.java | 43 +
.../apache/storm/zookeeper/ZkKeeperStates.java | 41 +
.../org/apache/storm/zookeeper/Zookeeper.java | 463 +++++++
.../src/native/worker-launcher/impl/main.c | 20 +-
.../worker-launcher/impl/worker-launcher.c | 46 +-
.../worker-launcher/impl/worker-launcher.h | 2 +-
.../org/apache/storm/integration_test.clj | 99 +-
.../org/apache/storm/testing4j_test.clj | 11 +-
.../clj/org/apache/storm/logviewer_test.clj | 55 +-
.../test/clj/org/apache/storm/metrics_test.clj | 9 +-
.../test/clj/org/apache/storm/nimbus_test.clj | 10 +-
.../storm/security/auth/drpc_auth_test.clj | 32 +-
.../clj/org/apache/storm/supervisor_test.clj | 737 -----------
.../daemon/supervisor/BasicContainerTest.java | 490 +++++++
.../storm/daemon/supervisor/ContainerTest.java | 265 ++++
.../storm/daemon/supervisor/SlotTest.java | 515 ++++++++
.../storm/localizer/AsyncLocalizerTest.java | 190 +++
.../LocalizedResourceRetentionSetTest.java | 10 +-
.../localizer/LocalizedResourceSetTest.java | 12 +-
.../apache/storm/localizer/LocalizerTest.java | 9 +-
94 files changed, 11534 insertions(+), 2571 deletions(-)
----------------------------------------------------------------------