[3/3] hadoop git commit: YARN-3361. CapacityScheduler side changes to support non-exclusive node labels. Contributed by Wangda Tan

2015-04-14 Thread jianhe 
YARN-3361. CapacityScheduler side changes to support non-exclusive node labels. 
Contributed by Wangda Tan


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0fefda64
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0fefda64
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0fefda64

Branch: refs/heads/trunk
Commit: 0fefda645bca935b87b6bb8ca63e6f18340d59f5
Parents: b46ee1e
Author: Jian He jia...@apache.org
Authored: Tue Apr 14 11:36:37 2015 -0700
Committer: Jian He jia...@apache.org
Committed: Tue Apr 14 11:45:58 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt |3 +
 .../hadoop/yarn/server/utils/BuilderUtils.java  |1 +
 .../rmapp/attempt/RMAppAttemptImpl.java |   10 +-
 .../scheduler/AppSchedulingInfo.java|   25 +-
 .../scheduler/ResourceUsage.java|8 +
 .../scheduler/SchedulerApplicationAttempt.java  |   44 +-
 .../scheduler/SchedulerUtils.java   |   87 +-
 .../scheduler/capacity/AbstractCSQueue.java |  243 +++--
 .../scheduler/capacity/CSQueue.java |5 +-
 .../scheduler/capacity/CapacityScheduler.java   |   91 +-
 .../CapacitySchedulerConfiguration.java |5 +
 .../scheduler/capacity/LeafQueue.java   |  368 ---
 .../scheduler/capacity/ParentQueue.java |   59 +-
 .../scheduler/capacity/SchedulingMode.java  |   44 +
 .../server/resourcemanager/Application.java |4 +
 .../yarn/server/resourcemanager/MockAM.java |8 +-
 .../yarn/server/resourcemanager/MockRM.java |   35 +-
 .../capacity/TestApplicationLimits.java |8 +-
 .../scheduler/capacity/TestChildQueueOrder.java |   41 +-
 .../capacity/TestContainerAllocation.java   |  390 +--
 .../scheduler/capacity/TestLeafQueue.java   |  148 +--
 .../TestNodeLabelContainerAllocation.java   | 1027 ++
 .../scheduler/capacity/TestParentQueue.java |  111 +-
 .../scheduler/capacity/TestReservations.java|  101 +-
 .../scheduler/capacity/TestUtils.java   |2 +
 25 files changed, 1914 insertions(+), 954 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0fefda64/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 4961ae0..2933c79 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -72,6 +72,9 @@ Release 2.8.0 - UNRELEASED
 YARN-3443. Create a 'ResourceHandler' subsystem to ease addition of 
support 
 for new resource types on the NM. (Sidharta Seethana via junping_du)
 
+YARN-3361. CapacityScheduler side changes to support non-exclusive node
+labels. (Wangda Tan via jianhe)
+
   IMPROVEMENTS
 
 YARN-1880. Cleanup TestApplicationClientProtocolOnHA

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0fefda64/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java
index 68d4ef9..f2146c8 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java
@@ -313,6 +313,7 @@ public class BuilderUtils {
 request.setResourceName(r.getResourceName());
 request.setCapability(r.getCapability());
 request.setNumContainers(r.getNumContainers());
+request.setNodeLabelExpression(r.getNodeLabelExpression());
 return request;
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0fefda64/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.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/rmapp/attempt/RMAppAttemptImpl.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
index 1be1727..1071831 100644

[3/3] hadoop git commit: YARN-3361. CapacityScheduler side changes to support non-exclusive node labels. Contributed by Wangda Tan (cherry picked from commit 0fefda645bca935b87b6bb8ca63e6f18340d59f5)

2015-04-14 Thread jianhe 
YARN-3361. CapacityScheduler side changes to support non-exclusive node labels. 
Contributed by Wangda Tan
(cherry picked from commit 0fefda645bca935b87b6bb8ca63e6f18340d59f5)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9ebbf1bf
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9ebbf1bf
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9ebbf1bf

Branch: refs/heads/branch-2
Commit: 9ebbf1bfcea9942117727c08c6905dd444c230ae
Parents: 81bbee6
Author: Jian He jia...@apache.org
Authored: Tue Apr 14 11:36:37 2015 -0700
Committer: Jian He jia...@apache.org
Committed: Tue Apr 14 11:46:35 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt |3 +
 .../hadoop/yarn/server/utils/BuilderUtils.java  |1 +
 .../rmapp/attempt/RMAppAttemptImpl.java |   10 +-
 .../scheduler/AppSchedulingInfo.java|   25 +-
 .../scheduler/ResourceUsage.java|8 +
 .../scheduler/SchedulerApplicationAttempt.java  |   44 +-
 .../scheduler/SchedulerUtils.java   |   87 +-
 .../scheduler/capacity/AbstractCSQueue.java |  243 +++--
 .../scheduler/capacity/CSQueue.java |5 +-
 .../scheduler/capacity/CapacityScheduler.java   |   91 +-
 .../CapacitySchedulerConfiguration.java |5 +
 .../scheduler/capacity/LeafQueue.java   |  368 ---
 .../scheduler/capacity/ParentQueue.java |   59 +-
 .../scheduler/capacity/SchedulingMode.java  |   44 +
 .../server/resourcemanager/Application.java |4 +
 .../yarn/server/resourcemanager/MockAM.java |8 +-
 .../yarn/server/resourcemanager/MockRM.java |   35 +-
 .../capacity/TestApplicationLimits.java |8 +-
 .../scheduler/capacity/TestChildQueueOrder.java |   41 +-
 .../capacity/TestContainerAllocation.java   |  390 +--
 .../scheduler/capacity/TestLeafQueue.java   |  148 +--
 .../TestNodeLabelContainerAllocation.java   | 1027 ++
 .../scheduler/capacity/TestParentQueue.java |  111 +-
 .../scheduler/capacity/TestReservations.java|  101 +-
 .../scheduler/capacity/TestUtils.java   |2 +
 25 files changed, 1914 insertions(+), 954 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebbf1bf/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 478d0ae..059c5a3 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -24,6 +24,9 @@ Release 2.8.0 - UNRELEASED
 YARN-3443. Create a 'ResourceHandler' subsystem to ease addition of 
support 
 for new resource types on the NM. (Sidharta Seethana via junping_du)
 
+YARN-3361. CapacityScheduler side changes to support non-exclusive node
+labels. (Wangda Tan via jianhe)
+
   IMPROVEMENTS
 
 YARN-1880. Cleanup TestApplicationClientProtocolOnHA

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebbf1bf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java
index 68d4ef9..f2146c8 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java
@@ -313,6 +313,7 @@ public class BuilderUtils {
 request.setResourceName(r.getResourceName());
 request.setCapability(r.getCapability());
 request.setNumContainers(r.getNumContainers());
+request.setNodeLabelExpression(r.getNodeLabelExpression());
 return request;
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebbf1bf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.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/rmapp/attempt/RMAppAttemptImpl.java