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 2017/07/31 02:07:18 UTC
[19/20] storm git commit: Merge branch 'STORM-2497' of
https://github.com/revans2/incubator-storm into STORM-2497-merge
Merge branch 'STORM-2497' of https://github.com/revans2/incubator-storm into STORM-2497-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3ab7ffbc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3ab7ffbc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3ab7ffbc
Branch: refs/heads/master
Commit: 3ab7ffbc31b54b0d747bda4c9b5051912357445e
Parents: 4dfd4ae b4d3395
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Jul 31 11:05:32 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Jul 31 11:05:32 2017 +0900
----------------------------------------------------------------------
conf/defaults.yaml | 11 +-
dev-tools/checkstyle.xslt | 40 +
dev-tools/find-checkstyle-issues.py | 38 +
docs/Resource_Aware_Scheduler_overview.md | 132 +-
docs/STORM-UI-REST-API.md | 29 +-
.../starter/ResourceAwareExampleTopology.java | 177 +-
external/storm-mongodb/pom.xml | 2 +-
external/storm-pmml/pom.xml | 2 +-
storm-client-misc/pom.xml | 2 +-
.../src/jvm/org/apache/storm/Config.java | 16 +-
.../jvm/org/apache/storm/StormSubmitter.java | 61 +-
.../coordination/BatchSubtopologyBuilder.java | 19 +-
.../org/apache/storm/daemon/StormCommon.java | 4 +-
.../storm/daemon/supervisor/AdvancedFSOps.java | 35 +-
.../storm/drpc/LinearDRPCTopologyBuilder.java | 26 +-
.../org/apache/storm/generated/Assignment.java | 413 +++--
.../org/apache/storm/generated/BoltStats.java | 440 ++---
.../apache/storm/generated/ClusterSummary.java | 108 +-
.../storm/generated/ClusterWorkerHeartbeat.java | 52 +-
.../storm/generated/CommonAggregateStats.java | 44 +-
.../storm/generated/ComponentPageInfo.java | 264 +--
.../org/apache/storm/generated/Credentials.java | 44 +-
.../apache/storm/generated/ExecutorStats.java | 168 +-
.../jvm/org/apache/storm/generated/HBNodes.java | 32 +-
.../org/apache/storm/generated/HBRecords.java | 36 +-
.../storm/generated/LSApprovedWorkers.java | 44 +-
.../generated/LSSupervisorAssignments.java | 48 +-
.../apache/storm/generated/LSTopoHistory.java | 64 +-
.../storm/generated/LSTopoHistoryList.java | 36 +-
.../storm/generated/LSWorkerHeartbeat.java | 36 +-
.../apache/storm/generated/ListBlobsResult.java | 32 +-
.../apache/storm/generated/LocalAssignment.java | 147 +-
.../apache/storm/generated/LocalStateData.java | 48 +-
.../org/apache/storm/generated/LogConfig.java | 48 +-
.../jvm/org/apache/storm/generated/Nimbus.java | 36 +-
.../org/apache/storm/generated/NodeInfo.java | 32 +-
.../storm/generated/RebalanceOptions.java | 44 +-
.../storm/generated/SettableBlobMeta.java | 36 +-
.../apache/storm/generated/SharedMemory.java | 711 ++++++++
.../org/apache/storm/generated/SpoutStats.java | 252 +--
.../org/apache/storm/generated/StormBase.java | 92 +-
.../apache/storm/generated/StormTopology.java | 531 +++++-
.../apache/storm/generated/SupervisorInfo.java | 152 +-
.../storm/generated/SupervisorPageInfo.java | 72 +-
.../storm/generated/SupervisorSummary.java | 44 +-
.../storm/generated/TopologyHistoryInfo.java | 32 +-
.../apache/storm/generated/TopologyInfo.java | 160 +-
.../storm/generated/TopologyPageInfo.java | 934 ++++++++++-
.../apache/storm/generated/TopologyStats.java | 220 +--
.../apache/storm/generated/WorkerResources.java | 206 ++-
.../apache/storm/generated/WorkerSummary.java | 44 +-
.../storm/metric/cgroup/CGroupMemoryLimit.java | 16 +
.../jvm/org/apache/storm/scheduler/Cluster.java | 837 ----------
.../jvm/org/apache/storm/scheduler/INimbus.java | 49 -
.../org/apache/storm/scheduler/IScheduler.java | 47 -
.../org/apache/storm/scheduler/ISupervisor.java | 45 -
.../storm/scheduler/SchedulerAssignment.java | 29 +-
.../scheduler/SchedulerAssignmentImpl.java | 141 +-
.../storm/scheduler/SupervisorDetails.java | 4 +-
.../org/apache/storm/scheduler/Topologies.java | 87 -
.../apache/storm/scheduler/TopologyDetails.java | 514 ------
.../org/apache/storm/scheduler/WorkerSlot.java | 43 +-
.../storm/scheduler/resource/Component.java | 54 -
.../storm/scheduler/resource/RAS_Node.java | 529 ------
.../storm/scheduler/resource/RAS_Nodes.java | 138 --
.../storm/scheduler/resource/ResourceUtils.java | 207 ---
.../scheduler/resource/SchedulingResult.java | 116 --
.../scheduler/resource/SchedulingState.java | 56 -
.../scheduler/resource/SchedulingStatus.java | 40 -
.../apache/storm/scheduler/resource/User.java | 350 ----
.../DefaultResourceAwareStrategy.java | 757 ---------
.../strategies/scheduling/IStrategy.java | 47 -
.../topology/BaseConfigurationDeclarer.java | 9 +-
.../ComponentConfigurationDeclarer.java | 36 +
.../apache/storm/topology/ResourceDeclarer.java | 30 +
.../storm/topology/SharedOffHeapWithinNode.java | 38 +
.../topology/SharedOffHeapWithinWorker.java | 36 +
.../org/apache/storm/topology/SharedOnHeap.java | 38 +
.../apache/storm/topology/TopologyBuilder.java | 33 +-
.../TransactionalTopologyBuilder.java | 47 +-
.../jvm/org/apache/storm/trident/Stream.java | 7 +
.../org/apache/storm/trident/TridentState.java | 7 +
.../apache/storm/trident/TridentTopology.java | 5 +
.../org/apache/storm/trident/graph/Group.java | 12 +
.../operation/DefaultResourceDeclarer.java | 24 +-
.../trident/operation/ITridentResource.java | 8 +
.../topology/TridentTopologyBuilder.java | 46 +-
.../apache/storm/utils/ThriftTopologyUtils.java | 40 +-
storm-client/src/py/storm/Nimbus.py | 14 +-
storm-client/src/py/storm/ttypes.py | 1561 +++++++++++-------
storm-client/src/storm.thrift | 24 +-
.../org/apache/storm/scheduler/ClusterTest.java | 111 --
storm-core/src/clj/org/apache/storm/ui/core.clj | 9 +
.../templates/topology-page-template.html | 100 +-
.../apache/storm/trident/integration_test.clj | 2 +-
.../scheduler/multitenant_scheduler_test.clj | 101 +-
.../clj/org/apache/storm/scheduler_test.clj | 19 +-
.../java/org/apache/storm/DaemonConfig.java | 92 +-
.../container/ResourceIsolationInterface.java | 51 +-
.../storm/container/cgroup/CgroupManager.java | 161 +-
.../org/apache/storm/daemon/nimbus/Nimbus.java | 179 +-
.../storm/daemon/nimbus/TopologyResources.java | 255 ++-
.../storm/daemon/supervisor/BasicContainer.java | 200 ++-
.../storm/daemon/supervisor/Container.java | 145 +-
.../daemon/supervisor/ReadClusterState.java | 17 +-
.../apache/storm/daemon/supervisor/Slot.java | 73 +-
.../apache/storm/localizer/AsyncLocalizer.java | 28 +-
.../logging/filters/AccessLoggingFilter.java | 36 +-
.../org/apache/storm/scheduler/Cluster.java | 1050 ++++++++++++
.../org/apache/storm/scheduler/Component.java | 88 +
.../storm/scheduler/DefaultScheduler.java | 9 +-
.../apache/storm/scheduler/EvenScheduler.java | 25 +-
.../org/apache/storm/scheduler/INimbus.java | 47 +
.../org/apache/storm/scheduler/IScheduler.java | 47 +
.../storm/scheduler/ISchedulingState.java | 275 +++
.../org/apache/storm/scheduler/ISupervisor.java | 50 +
.../storm/scheduler/SingleTopologyCluster.java | 46 +
.../org/apache/storm/scheduler/Topologies.java | 139 ++
.../apache/storm/scheduler/TopologyDetails.java | 573 +++++++
.../storm/scheduler/resource/RAS_Node.java | 465 ++++++
.../storm/scheduler/resource/RAS_Nodes.java | 152 ++
.../resource/ResourceAwareScheduler.java | 438 ++---
.../storm/scheduler/resource/ResourceUtils.java | 175 ++
.../scheduler/resource/SchedulingResult.java | 88 +
.../scheduler/resource/SchedulingStatus.java | 41 +
.../apache/storm/scheduler/resource/User.java | 228 +++
.../eviction/DefaultEvictionStrategy.java | 68 +-
.../strategies/eviction/IEvictionStrategy.java | 17 +-
.../DefaultSchedulingPriorityStrategy.java | 47 +-
.../priority/ISchedulingPriorityStrategy.java | 13 +-
.../DefaultResourceAwareStrategy.java | 741 +++++++++
.../strategies/scheduling/IStrategy.java | 48 +
.../test/java/org/apache/storm/TestCgroups.java | 5 +-
.../apache/storm/daemon/nimbus/NimbusTest.java | 56 +
.../daemon/supervisor/BasicContainerTest.java | 2 +
.../org/apache/storm/scheduler/ClusterTest.java | 111 ++
.../resource/TestResourceAwareScheduler.java | 910 +++-------
.../storm/scheduler/resource/TestUser.java | 96 +-
.../TestUtilsForResourceAwareScheduler.java | 159 +-
.../eviction/TestDefaultEvictionStrategy.java | 791 ++-------
.../TestDefaultResourceAwareStrategy.java | 216 +--
141 files changed, 12285 insertions(+), 8927 deletions(-)
----------------------------------------------------------------------