[03/50] [abbrv] hadoop git commit: YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. (Anubhav Dhoot via kasha)
YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. (Anubhav Dhoot via kasha) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0c4b1126 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0c4b1126 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0c4b1126 Branch: refs/heads/HDFS-6994 Commit: 0c4b11267717eb451fa6ed4c586317f2db32fbd5 Parents: 53caeaa Author: Karthik Kambatla ka...@apache.org Authored: Tue Jan 6 04:41:45 2015 +0530 Committer: Karthik Kambatla ka...@apache.org Committed: Tue Jan 6 04:42:10 2015 +0530 -- hadoop-yarn-project/CHANGES.txt | 2 + .../reservation/AbstractReservationSystem.java | 2 + .../AbstractSchedulerPlanFollower.java | 3 +- .../reservation/FairSchedulerPlanFollower.java | 141 + .../reservation/ReservationConstants.java | 28 +++ .../scheduler/capacity/CapacityScheduler.java | 6 +- .../scheduler/capacity/PlanQueue.java | 2 - .../scheduler/fair/AllocationConfiguration.java | 14 ++ .../scheduler/fair/FSLeafQueue.java | 10 + .../scheduler/fair/FairScheduler.java | 104 +- .../scheduler/fair/QueueManager.java| 13 +- .../fair/ReservationQueueConfiguration.java | 11 + .../reservation/ReservationSystemTestUtil.java | 26 ++- .../TestCapacitySchedulerPlanFollower.java | 3 +- .../reservation/TestFairReservationSystem.java | 55 ++--- .../TestFairSchedulerPlanFollower.java | 203 +++ .../TestCapacitySchedulerDynamicBehavior.java | 3 +- .../scheduler/fair/FairSchedulerTestBase.java | 4 +- .../fair/TestFairSchedulerPreemption.java | 3 +- 19 files changed, 574 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c4b1126/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 63faa60..12c8066 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -70,6 +70,8 @@ Release 2.7.0 - UNRELEASED YARN-2738. [YARN-2574] Add FairReservationSystem for FairScheduler. (Anubhav Dhoot via kasha) +YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. +(Anubhav Dhoot via kasha) IMPROVEMENTS http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c4b1126/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java index fa0835a..8a15ac6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java @@ -204,6 +204,8 @@ public abstract class AbstractReservationSystem extends AbstractService // currently only capacity scheduler is supported if (scheduler instanceof CapacityScheduler) { return CapacitySchedulerPlanFollower.class.getName(); +} else if (scheduler instanceof FairScheduler) { + return FairSchedulerPlanFollower.class.getName(); } return null; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c4b1126/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java index 0de4dcf..ea7f27d 100644 ---
[02/34] hadoop git commit: YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. (Anubhav Dhoot via kasha)
YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. (Anubhav Dhoot via kasha) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2b281258 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2b281258 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2b281258 Branch: refs/heads/HDFS-EC Commit: 2b281258133701640c5857668dfeedf4651f5821 Parents: 9d740be Author: Karthik Kambatla ka...@apache.org Authored: Tue Jan 6 04:41:45 2015 +0530 Committer: Zhe Zhang z...@apache.org Committed: Mon Jan 12 10:17:58 2015 -0800 -- hadoop-yarn-project/CHANGES.txt | 2 + .../reservation/AbstractReservationSystem.java | 2 + .../AbstractSchedulerPlanFollower.java | 3 +- .../reservation/FairSchedulerPlanFollower.java | 141 + .../reservation/ReservationConstants.java | 28 +++ .../scheduler/capacity/CapacityScheduler.java | 6 +- .../scheduler/capacity/PlanQueue.java | 2 - .../scheduler/fair/AllocationConfiguration.java | 14 ++ .../scheduler/fair/FSLeafQueue.java | 10 + .../scheduler/fair/FairScheduler.java | 104 +- .../scheduler/fair/QueueManager.java| 13 +- .../fair/ReservationQueueConfiguration.java | 11 + .../reservation/ReservationSystemTestUtil.java | 26 ++- .../TestCapacitySchedulerPlanFollower.java | 3 +- .../reservation/TestFairReservationSystem.java | 55 ++--- .../TestFairSchedulerPlanFollower.java | 203 +++ .../TestCapacitySchedulerDynamicBehavior.java | 3 +- .../scheduler/fair/FairSchedulerTestBase.java | 4 +- .../fair/TestFairSchedulerPreemption.java | 3 +- 19 files changed, 574 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2b281258/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 63faa60..12c8066 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -70,6 +70,8 @@ Release 2.7.0 - UNRELEASED YARN-2738. [YARN-2574] Add FairReservationSystem for FairScheduler. (Anubhav Dhoot via kasha) +YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. +(Anubhav Dhoot via kasha) IMPROVEMENTS http://git-wip-us.apache.org/repos/asf/hadoop/blob/2b281258/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java index fa0835a..8a15ac6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java @@ -204,6 +204,8 @@ public abstract class AbstractReservationSystem extends AbstractService // currently only capacity scheduler is supported if (scheduler instanceof CapacityScheduler) { return CapacitySchedulerPlanFollower.class.getName(); +} else if (scheduler instanceof FairScheduler) { + return FairSchedulerPlanFollower.class.getName(); } return null; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2b281258/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java index 0de4dcf..ea7f27d 100644 ---
hadoop git commit: YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. (Anubhav Dhoot via kasha)
Repository: hadoop Updated Branches: refs/heads/branch-2 0c2d996c2 - 7adffad2b YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. (Anubhav Dhoot via kasha) (cherry picked from commit 0c4b11267717eb451fa6ed4c586317f2db32fbd5) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7adffad2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7adffad2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7adffad2 Branch: refs/heads/branch-2 Commit: 7adffad2bb17338c266fe1d3320f59b0c89fce4a Parents: 0c2d996 Author: Karthik Kambatla ka...@apache.org Authored: Tue Jan 6 04:41:45 2015 +0530 Committer: Karthik Kambatla ka...@apache.org Committed: Tue Jan 6 04:42:55 2015 +0530 -- hadoop-yarn-project/CHANGES.txt | 2 + .../reservation/AbstractReservationSystem.java | 2 + .../AbstractSchedulerPlanFollower.java | 3 +- .../reservation/FairSchedulerPlanFollower.java | 141 + .../reservation/ReservationConstants.java | 28 +++ .../scheduler/capacity/CapacityScheduler.java | 6 +- .../scheduler/capacity/PlanQueue.java | 2 - .../scheduler/fair/AllocationConfiguration.java | 14 ++ .../scheduler/fair/FSLeafQueue.java | 10 + .../scheduler/fair/FairScheduler.java | 104 +- .../scheduler/fair/QueueManager.java| 13 +- .../fair/ReservationQueueConfiguration.java | 11 + .../reservation/ReservationSystemTestUtil.java | 26 ++- .../TestCapacitySchedulerPlanFollower.java | 3 +- .../reservation/TestFairReservationSystem.java | 55 ++--- .../TestFairSchedulerPlanFollower.java | 203 +++ .../TestCapacitySchedulerDynamicBehavior.java | 3 +- .../scheduler/fair/FairSchedulerTestBase.java | 4 +- .../fair/TestFairSchedulerPreemption.java | 3 +- 19 files changed, 574 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7adffad2/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index c737a9a..8139c72 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -38,6 +38,8 @@ Release 2.7.0 - UNRELEASED YARN-2738. [YARN-2574] Add FairReservationSystem for FairScheduler. (Anubhav Dhoot via kasha) +YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. +(Anubhav Dhoot via kasha) IMPROVEMENTS http://git-wip-us.apache.org/repos/asf/hadoop/blob/7adffad2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java index fa0835a..8a15ac6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java @@ -204,6 +204,8 @@ public abstract class AbstractReservationSystem extends AbstractService // currently only capacity scheduler is supported if (scheduler instanceof CapacityScheduler) { return CapacitySchedulerPlanFollower.class.getName(); +} else if (scheduler instanceof FairScheduler) { + return FairSchedulerPlanFollower.class.getName(); } return null; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/7adffad2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java
hadoop git commit: YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. (Anubhav Dhoot via kasha)
Repository: hadoop Updated Branches: refs/heads/trunk 53caeaa16 - 0c4b11267 YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. (Anubhav Dhoot via kasha) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0c4b1126 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0c4b1126 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0c4b1126 Branch: refs/heads/trunk Commit: 0c4b11267717eb451fa6ed4c586317f2db32fbd5 Parents: 53caeaa Author: Karthik Kambatla ka...@apache.org Authored: Tue Jan 6 04:41:45 2015 +0530 Committer: Karthik Kambatla ka...@apache.org Committed: Tue Jan 6 04:42:10 2015 +0530 -- hadoop-yarn-project/CHANGES.txt | 2 + .../reservation/AbstractReservationSystem.java | 2 + .../AbstractSchedulerPlanFollower.java | 3 +- .../reservation/FairSchedulerPlanFollower.java | 141 + .../reservation/ReservationConstants.java | 28 +++ .../scheduler/capacity/CapacityScheduler.java | 6 +- .../scheduler/capacity/PlanQueue.java | 2 - .../scheduler/fair/AllocationConfiguration.java | 14 ++ .../scheduler/fair/FSLeafQueue.java | 10 + .../scheduler/fair/FairScheduler.java | 104 +- .../scheduler/fair/QueueManager.java| 13 +- .../fair/ReservationQueueConfiguration.java | 11 + .../reservation/ReservationSystemTestUtil.java | 26 ++- .../TestCapacitySchedulerPlanFollower.java | 3 +- .../reservation/TestFairReservationSystem.java | 55 ++--- .../TestFairSchedulerPlanFollower.java | 203 +++ .../TestCapacitySchedulerDynamicBehavior.java | 3 +- .../scheduler/fair/FairSchedulerTestBase.java | 4 +- .../fair/TestFairSchedulerPreemption.java | 3 +- 19 files changed, 574 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c4b1126/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 63faa60..12c8066 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -70,6 +70,8 @@ Release 2.7.0 - UNRELEASED YARN-2738. [YARN-2574] Add FairReservationSystem for FairScheduler. (Anubhav Dhoot via kasha) +YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. +(Anubhav Dhoot via kasha) IMPROVEMENTS http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c4b1126/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java index fa0835a..8a15ac6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java @@ -204,6 +204,8 @@ public abstract class AbstractReservationSystem extends AbstractService // currently only capacity scheduler is supported if (scheduler instanceof CapacityScheduler) { return CapacitySchedulerPlanFollower.class.getName(); +} else if (scheduler instanceof FairScheduler) { + return FairSchedulerPlanFollower.class.getName(); } return null; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c4b1126/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java index 0de4dcf..ea7f27d 100644 ---