You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/12/21 15:46:51 UTC
[23/23] storm git commit: Merge branch 'STORM-898-merge'
Merge branch 'STORM-898-merge'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c7164ccd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c7164ccd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c7164ccd
Branch: refs/heads/master
Commit: c7164ccd4c8f8f9b3906e1f80d3c0ca7876099dd
Parents: 8f9ed06 eaf5b37
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Mon Dec 21 08:28:38 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Mon Dec 21 08:28:38 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
conf/defaults.yaml | 6 +
conf/user-resource-pools-example.yaml | 26 +
.../Resource_Aware_Scheduler_overview.md | 227 ++++
...ware_scheduler_default_eviction_strategy.svg | 3 +
.../starter/ResourceAwareExampleTopology.java | 9 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 14 +-
storm-core/src/jvm/backtype/storm/Config.java | 59 +-
.../jvm/backtype/storm/scheduler/Cluster.java | 71 +
.../storm/scheduler/SupervisorDetails.java | 8 +-
.../backtype/storm/scheduler/Topologies.java | 14 +
.../storm/scheduler/TopologyDetails.java | 157 ++-
.../storm/scheduler/resource/RAS_Node.java | 253 ++--
.../storm/scheduler/resource/RAS_Nodes.java | 160 +++
.../resource/ResourceAwareScheduler.java | 421 ++++--
.../storm/scheduler/resource/ResourceUtils.java | 51 +
.../scheduler/resource/SchedulingResult.java | 116 ++
.../scheduler/resource/SchedulingStatus.java | 40 +
.../backtype/storm/scheduler/resource/User.java | 346 +++++
.../resource/strategies/IStrategy.java | 37 -
.../strategies/ResourceAwareStrategy.java | 479 -------
.../eviction/DefaultEvictionStrategy.java | 126 ++
.../strategies/eviction/IEvictionStrategy.java | 47 +
.../DefaultSchedulingPriorityStrategy.java | 81 ++
.../priority/ISchedulingPriorityStrategy.java | 41 +
.../DefaultResourceAwareStrategy.java | 488 +++++++
.../strategies/scheduling/IStrategy.java | 50 +
.../storm/validation/ConfigValidation.java | 60 +-
.../validation/ConfigValidationAnnotations.java | 9 +
.../scheduler/resource_aware_scheduler_test.clj | 193 ++-
.../jvm/backtype/storm/TestConfigValidate.java | 84 ++
.../resource/TestResourceAwareScheduler.java | 1227 ++++++++++++++++++
.../storm/scheduler/resource/TestUser.java | 111 ++
.../TestUtilsForResourceAwareScheduler.java | 288 ++++
34 files changed, 4419 insertions(+), 884 deletions(-)
----------------------------------------------------------------------