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/01/22 07:25:55 UTC
[5/6] storm git commit: Merge branch 'STORM-1450' of
https://github.com/jerrypeng/storm into STORM-1450-v2
Merge branch 'STORM-1450' of https://github.com/jerrypeng/storm into STORM-1450-v2
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1078504b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1078504b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1078504b
Branch: refs/heads/1.x-branch
Commit: 1078504bdd2f93fdb332c3422c4eacdb6d7d37f9
Parents: 86884e7 0529410
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jan 22 10:05:52 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jan 22 10:05:52 2016 +0900
----------------------------------------------------------------------
.../src/clj/org/apache/storm/daemon/nimbus.clj | 11 +-
.../jvm/org/apache/storm/scheduler/Cluster.java | 54 ++-
.../storm/scheduler/SchedulerAssignment.java | 3 +
.../scheduler/SchedulerAssignmentImpl.java | 14 +
.../apache/storm/scheduler/TopologyDetails.java | 2 +-
.../org/apache/storm/scheduler/WorkerSlot.java | 24 +-
.../scheduler/resource/ClusterStateData.java | 101 ++++++
.../storm/scheduler/resource/RAS_Node.java | 342 +++++++++----------
.../storm/scheduler/resource/RAS_Nodes.java | 122 +++----
.../resource/ResourceAwareScheduler.java | 44 ++-
.../DefaultResourceAwareStrategy.java | 135 ++++----
.../strategies/scheduling/IStrategy.java | 11 +-
.../scheduler/resource_aware_scheduler_test.clj | 8 +-
.../resource/TestResourceAwareScheduler.java | 161 +++++++++
14 files changed, 658 insertions(+), 374 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1078504b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------