hadoop git commit: YARN-3686. CapacityScheduler should trim default_node_label_expression. (Sunil G via wangda)

2015-05-26 Thread wangda 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 23994e824 - fb57a1aac


YARN-3686. CapacityScheduler should trim default_node_label_expression. (Sunil 
G via wangda)

(cherry picked from commit cdbd66be111c93c85a409d47284e588c453ecae9)


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

Branch: refs/heads/branch-2.7
Commit: fb57a1aac81139a4a1032dd91da83e14fdeea43d
Parents: 23994e8
Author: Wangda Tan wan...@apache.org
Authored: Tue May 26 15:58:47 2015 -0700
Committer: Wangda Tan wan...@apache.org
Committed: Tue May 26 16:29:27 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../api/records/impl/pb/QueueInfoPBImpl.java|  2 +-
 .../records/impl/pb/ResourceRequestPBImpl.java  |  2 +-
 .../CapacitySchedulerConfiguration.java |  7 ++-
 .../scheduler/TestSchedulerUtils.java   | 46 
 .../capacity/TestCapacityScheduler.java | 21 +
 6 files changed, 78 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/fb57a1aa/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 2b3b11d..f017496 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -128,6 +128,9 @@ Release 2.7.1 - UNRELEASED
 YARN-2238. filtering on UI sticks even if I move away from the page.
 (Jian He via xgong)
 
+YARN-3686. CapacityScheduler should trim default_node_label_expression. 
+(Sunil G via wangda)
+
 Release 2.7.0 - 2015-04-20
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fb57a1aa/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
index 4b83500..14a31be 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
@@ -356,7 +356,7 @@ public class QueueInfoPBImpl extends QueueInfo {
   public String getDefaultNodeLabelExpression() {
 QueueInfoProtoOrBuilder p = viaProto ? proto : builder;
 return (p.hasDefaultNodeLabelExpression()) ? p
-.getDefaultNodeLabelExpression() : null;
+.getDefaultNodeLabelExpression().trim() : null;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fb57a1aa/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
index 27fb5ae..791e6a3 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
@@ -193,7 +193,7 @@ public class ResourceRequestPBImpl extends  ResourceRequest 
{
 if (!p.hasNodeLabelExpression()) {
   return null;
 }
-return (p.getNodeLabelExpression());
+return (p.getNodeLabelExpression().trim());
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fb57a1aa/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.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/scheduler/capacity/CapacitySchedulerConfiguration.java

hadoop git commit: YARN-3686. CapacityScheduler should trim default_node_label_expression. (Sunil G via wangda)

2015-05-26 Thread wangda 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 7dba7005b - cdbd66be1


YARN-3686. CapacityScheduler should trim default_node_label_expression. (Sunil 
G via wangda)


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

Branch: refs/heads/trunk
Commit: cdbd66be111c93c85a409d47284e588c453ecae9
Parents: 7dba700
Author: Wangda Tan wan...@apache.org
Authored: Tue May 26 15:58:47 2015 -0700
Committer: Wangda Tan wan...@apache.org
Committed: Tue May 26 15:58:47 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../api/records/impl/pb/QueueInfoPBImpl.java|  2 +-
 .../records/impl/pb/ResourceRequestPBImpl.java  |  2 +-
 .../CapacitySchedulerConfiguration.java |  7 ++-
 .../scheduler/TestSchedulerUtils.java   | 47 
 .../capacity/TestCapacityScheduler.java | 21 +
 6 files changed, 79 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/cdbd66be/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 6cdd9f3..7d122ff 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -567,6 +567,9 @@ Release 2.7.1 - UNRELEASED
 YARN-2238. filtering on UI sticks even if I move away from the page.
 (Jian He via xgong)
 
+YARN-3686. CapacityScheduler should trim default_node_label_expression. 
+(Sunil G via wangda)
+
 Release 2.7.0 - 2015-04-20
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/cdbd66be/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
index 4f12da2..90aecf4 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
@@ -358,7 +358,7 @@ public class QueueInfoPBImpl extends QueueInfo {
   public String getDefaultNodeLabelExpression() {
 QueueInfoProtoOrBuilder p = viaProto ? proto : builder;
 return (p.hasDefaultNodeLabelExpression()) ? p
-.getDefaultNodeLabelExpression() : null;
+.getDefaultNodeLabelExpression().trim() : null;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/cdbd66be/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
index 27fb5ae..791e6a3 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
@@ -193,7 +193,7 @@ public class ResourceRequestPBImpl extends  ResourceRequest 
{
 if (!p.hasNodeLabelExpression()) {
   return null;
 }
-return (p.getNodeLabelExpression());
+return (p.getNodeLabelExpression().trim());
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/cdbd66be/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.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/scheduler/capacity/CapacitySchedulerConfiguration.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java
index

hadoop git commit: YARN-3686. CapacityScheduler should trim default_node_label_expression. (Sunil G via wangda)

2015-05-26 Thread wangda 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 3dec58dd7 - 0728a86b3


YARN-3686. CapacityScheduler should trim default_node_label_expression. (Sunil 
G via wangda)

(cherry picked from commit cdbd66be111c93c85a409d47284e588c453ecae9)


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

Branch: refs/heads/branch-2
Commit: 0728a86b3affd65a7f60edc2a461a98c0458415b
Parents: 3dec58d
Author: Wangda Tan wan...@apache.org
Authored: Tue May 26 15:58:47 2015 -0700
Committer: Wangda Tan wan...@apache.org
Committed: Tue May 26 16:00:17 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../api/records/impl/pb/QueueInfoPBImpl.java|  2 +-
 .../records/impl/pb/ResourceRequestPBImpl.java  |  2 +-
 .../CapacitySchedulerConfiguration.java |  7 ++-
 .../scheduler/TestSchedulerUtils.java   | 47 
 .../capacity/TestCapacityScheduler.java | 21 +
 6 files changed, 79 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0728a86b/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 0f4a4d7..9d78a6c 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -526,6 +526,9 @@ Release 2.7.1 - UNRELEASED
 YARN-2238. filtering on UI sticks even if I move away from the page.
 (Jian He via xgong)
 
+YARN-3686. CapacityScheduler should trim default_node_label_expression. 
+(Sunil G via wangda)
+
 Release 2.7.0 - 2015-04-20
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0728a86b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
index 4f12da2..90aecf4 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
@@ -358,7 +358,7 @@ public class QueueInfoPBImpl extends QueueInfo {
   public String getDefaultNodeLabelExpression() {
 QueueInfoProtoOrBuilder p = viaProto ? proto : builder;
 return (p.hasDefaultNodeLabelExpression()) ? p
-.getDefaultNodeLabelExpression() : null;
+.getDefaultNodeLabelExpression().trim() : null;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0728a86b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
index 27fb5ae..791e6a3 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
@@ -193,7 +193,7 @@ public class ResourceRequestPBImpl extends  ResourceRequest 
{
 if (!p.hasNodeLabelExpression()) {
   return null;
 }
-return (p.getNodeLabelExpression());
+return (p.getNodeLabelExpression().trim());
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0728a86b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.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/scheduler/capacity/CapacitySchedulerConfiguration.java