Merge branch 'trunk' into HDDS-48
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/84ac6bb1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/84ac6bb1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/84ac6bb1 Branch: refs/heads/trunk Commit: 84ac6bb1b1974ed7746c55ec79486525b1cca19b Parents: c104525 2911943 Author: Bharat Viswanadham <bha...@apache.org> Authored: Thu Jun 28 14:57:23 2018 -0700 Committer: Bharat Viswanadham <bha...@apache.org> Committed: Thu Jun 28 14:57:23 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/ha/ActiveStandbyElector.java | 5 +- .../apache/hadoop/ha/ZKFailoverController.java | 2 +- .../AbstractPreemptableResourceCalculator.java | 21 +- .../CapacitySchedulerPreemptionContext.java | 2 + .../CapacitySchedulerPreemptionUtils.java | 23 +- .../capacity/FifoCandidatesSelector.java | 45 ++-- .../capacity/IntraQueueCandidatesSelector.java | 9 +- .../capacity/PreemptableResourceCalculator.java | 7 +- .../capacity/PreemptionCandidatesSelector.java | 11 + .../ProportionalCapacityPreemptionPolicy.java | 129 +++++++--- ...QueuePriorityContainerCandidateSelector.java | 16 +- .../ReservedContainerCandidatesSelector.java | 16 +- .../monitor/capacity/TempQueuePerPartition.java | 8 +- .../CapacitySchedulerConfiguration.java | 17 ++ .../resourcemanager/TestRMEmbeddedElector.java | 22 ++ .../TestPreemptionForQueueWithPriorities.java | 58 +++++ ...apacityPreemptionPolicyPreemptToBalance.java | 254 +++++++++++++++++++ ...TestCapacitySchedulerSurgicalPreemption.java | 111 ++++++++ 18 files changed, 664 insertions(+), 92 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
