You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/01/08 21:20:59 UTC
[6/6] storm git commit: Merge branch 'STORM-2859' of
https://github.com/srdo/storm into STORM-2859
Merge branch 'STORM-2859' of https://github.com/srdo/storm into STORM-2859
STORM-2859: Fix a number of issues with NormalizedResources when resource totals are zero
This closes #2485
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e8dd1f7e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e8dd1f7e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e8dd1f7e
Branch: refs/heads/master
Commit: e8dd1f7e2df5e034a20573b89cb89e9f3529e373
Parents: 7ecb3d7 8853334
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 8 15:02:55 2018 -0600
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 8 15:02:55 2018 -0600
----------------------------------------------------------------------
storm-server/pom.xml | 2 +-
.../apache/storm/blobstore/BlobStoreUtils.java | 6 +-
.../org/apache/storm/daemon/nimbus/Nimbus.java | 5 +-
.../supervisor/timer/SupervisorHeartbeat.java | 16 +-
.../org/apache/storm/scheduler/Cluster.java | 9 +-
.../storm/scheduler/ISchedulingState.java | 5 +-
.../storm/scheduler/SupervisorDetails.java | 2 +-
.../apache/storm/scheduler/TopologyDetails.java | 2 +-
.../resource/NormalizedResourceOffer.java | 89 ----
.../resource/NormalizedResourceRequest.java | 194 ---------
.../scheduler/resource/NormalizedResources.java | 304 --------------
.../storm/scheduler/resource/RAS_Node.java | 4 +-
.../storm/scheduler/resource/RAS_Nodes.java | 1 -
.../resource/ResourceAwareScheduler.java | 1 -
.../storm/scheduler/resource/ResourceUtils.java | 16 +-
.../normalization/NormalizedResourceOffer.java | 114 ++++++
.../NormalizedResourceRequest.java | 190 +++++++++
.../normalization/NormalizedResources.java | 343 ++++++++++++++++
.../NormalizedResourcesWithMemory.java | 28 ++
.../normalization/ResourceMapArrayBridge.java | 89 ++++
.../normalization/ResourceNameNormalizer.java | 68 ++++
.../scheduling/BaseResourceAwareStrategy.java | 6 +-
.../DefaultResourceAwareStrategy.java | 15 +-
.../GenericResourceAwareStrategy.java | 3 -
.../org/apache/storm/utils/ServerUtils.java | 16 +-
.../resource/TestResourceAwareScheduler.java | 8 +-
.../TestUtilsForResourceAwareScheduler.java | 5 +-
.../normalization/NormalizedResourcesRule.java | 49 +++
.../normalization/NormalizedResourcesTest.java | 403 +++++++++++++++++++
.../ResourceMapArrayBridgeTest.java | 63 +++
.../scheduling/NormalizedResourcesRule.java | 50 ---
.../TestDefaultResourceAwareStrategy.java | 40 +-
.../TestGenericResourceAwareStrategy.java | 4 +-
33 files changed, 1422 insertions(+), 728 deletions(-)
----------------------------------------------------------------------