Merge branch 'STORM-2134' of https://github.com/jerrypeng/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cbf7eda9 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cbf7eda9 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cbf7eda9 Branch: refs/heads/master Commit: cbf7eda91df17a6e98c26d6c2ad191e69a54b238 Parents: 3a5ecf5 f621cf2 Author: Boyang Jerry Peng <jerryp...@yahoo-inc.com> Authored: Thu Oct 13 15:04:27 2016 -0500 Committer: Boyang Jerry Peng <jerryp...@yahoo-inc.com> Committed: Thu Oct 13 15:04:27 2016 -0500 ---------------------------------------------------------------------- docs/Resource_Aware_Scheduler_overview.md | 253 +++- .../ras_new_strategy_network_cdf_random.png | Bin 0 -> 157859 bytes ...tegy_network_metric_cdf_yahoo_topologies.png | Bin 0 -> 152034 bytes ...rategy_network_metric_improvement_random.png | Bin 0 -> 68976 bytes .../ras_new_strategy_network_metric_random.png | Bin 0 -> 79004 bytes ...strategy_network_metric_yahoo_topologies.png | Bin 0 -> 75195 bytes docs/images/ras_new_strategy_runtime_random.png | Bin 0 -> 76534 bytes docs/images/ras_new_strategy_runtime_yahoo.png | Bin 0 -> 71727 bytes pom.xml | 6 + storm-core/pom.xml | 16 + .../storm/scheduler/resource/RAS_Node.java | 12 + .../storm/scheduler/resource/ResourceUtils.java | 22 + .../DefaultResourceAwareStrategy.java | 673 +++++---- .../resource/TestResourceAwareScheduler.java | 1393 +++++++++--------- .../TestUtilsForResourceAwareScheduler.java | 74 +- .../eviction/TestDefaultEvictionStrategy.java | 751 ++++++++++ .../TestDefaultResourceAwareStrategy.java | 8 +- 17 files changed, 2190 insertions(+), 1018 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/cbf7eda9/pom.xml ----------------------------------------------------------------------
