hadoop git commit: YARN-3647. RMWebServices api's should use updated api from CommonNodeLabelsManager to get NodeLabel object. (Sunil G via wangda)

2015-05-27 Thread wangda 
Repository: hadoop
Updated Branches:
  refs/heads/trunk c46d4bafe - ec0a852a3


YARN-3647. RMWebServices api's should use updated api from 
CommonNodeLabelsManager to get NodeLabel object. (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/ec0a852a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ec0a852a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ec0a852a

Branch: refs/heads/trunk
Commit: ec0a852a37d5c91a62d3d0ff3ddbd9d58235b312
Parents: c46d4ba
Author: Wangda Tan wan...@apache.org
Authored: Wed May 27 12:51:20 2015 -0700
Committer: Wangda Tan wan...@apache.org
Committed: Wed May 27 12:51:20 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../nodelabels/CommonNodeLabelsManager.java | 17 ---
 .../nodelabels/RMNodeLabelsManager.java |  1 +
 .../resourcemanager/webapp/RMWebServices.java   | 27 +--
 .../webapp/TestRMWebServicesNodeLabels.java | 51 +---
 5 files changed, 62 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec0a852a/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 7d122ff..4c75a39 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -265,6 +265,9 @@ Release 2.8.0 - UNRELEASED
 YARN-3594. WintuilsProcessStubExecutor.startStreamReader leaks streams.
 (Lars Francke via junping_du)
 
+YARN-3647. RMWebServices api's should use updated api from 
CommonNodeLabelsManager 
+to get NodeLabel object. (Sunil G via wangda)
+
   OPTIMIZATIONS
 
 YARN-3339. TestDockerContainerExecutor should pull a single image and not

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec0a852a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
index 2d57ad6..f741f68 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
@@ -993,13 +993,18 @@ public class CommonNodeLabelsManager extends 
AbstractService {
 }
   }
   
-  private SetNodeLabel getLabelsInfoByNode(NodeId nodeId) {
-SetString labels = getLabelsByNode(nodeId, nodeCollections);
-if (labels.isEmpty()) {
-  return EMPTY_NODELABEL_SET;
+  public SetNodeLabel getLabelsInfoByNode(NodeId nodeId) {
+try {
+  readLock.lock();
+  SetString labels = getLabelsByNode(nodeId, nodeCollections);
+  if (labels.isEmpty()) {
+return EMPTY_NODELABEL_SET;
+  }
+  SetNodeLabel nodeLabels = createNodeLabelFromLabelNames(labels);
+  return nodeLabels;
+} finally {
+  readLock.unlock();
 }
-SetNodeLabel nodeLabels = createNodeLabelFromLabelNames(labels);
-return nodeLabels;
   }
 
   private SetNodeLabel createNodeLabelFromLabelNames(SetString labels) {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec0a852a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.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/nodelabels/RMNodeLabelsManager.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java
index 696b99b..10092ca 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java
@@ -34,6 +34,7 @@ import java.util.concurrent.ConcurrentMap;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.api.records.NodeId;

hadoop git commit: YARN-3647. RMWebServices api's should use updated api from CommonNodeLabelsManager to get NodeLabel object. (Sunil G via wangda)

2015-05-27 Thread wangda 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 3f321be24 - 8857cba72


YARN-3647. RMWebServices api's should use updated api from 
CommonNodeLabelsManager to get NodeLabel object. (Sunil G via wangda)

(cherry picked from commit ec0a852a37d5c91a62d3d0ff3ddbd9d58235b312)


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

Branch: refs/heads/branch-2
Commit: 8857cba72e70842ac6ffc593a1c98577850f2572
Parents: 3f321be
Author: Wangda Tan wan...@apache.org
Authored: Wed May 27 12:51:20 2015 -0700
Committer: Wangda Tan wan...@apache.org
Committed: Wed May 27 13:15:55 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../nodelabels/CommonNodeLabelsManager.java | 17 ---
 .../nodelabels/RMNodeLabelsManager.java |  1 +
 .../resourcemanager/webapp/RMWebServices.java   | 27 +--
 .../webapp/TestRMWebServicesNodeLabels.java | 51 +---
 5 files changed, 62 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/8857cba7/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 9d78a6c..58eb7ea 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -220,6 +220,9 @@ Release 2.8.0 - UNRELEASED
 YARN-3594. WintuilsProcessStubExecutor.startStreamReader leaks streams.
 (Lars Francke via junping_du)
 
+YARN-3647. RMWebServices api's should use updated api from 
CommonNodeLabelsManager 
+to get NodeLabel object. (Sunil G via wangda)
+
   OPTIMIZATIONS
 
 YARN-3339. TestDockerContainerExecutor should pull a single image and not

http://git-wip-us.apache.org/repos/asf/hadoop/blob/8857cba7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
index 2d57ad6..f741f68 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
@@ -993,13 +993,18 @@ public class CommonNodeLabelsManager extends 
AbstractService {
 }
   }
   
-  private SetNodeLabel getLabelsInfoByNode(NodeId nodeId) {
-SetString labels = getLabelsByNode(nodeId, nodeCollections);
-if (labels.isEmpty()) {
-  return EMPTY_NODELABEL_SET;
+  public SetNodeLabel getLabelsInfoByNode(NodeId nodeId) {
+try {
+  readLock.lock();
+  SetString labels = getLabelsByNode(nodeId, nodeCollections);
+  if (labels.isEmpty()) {
+return EMPTY_NODELABEL_SET;
+  }
+  SetNodeLabel nodeLabels = createNodeLabelFromLabelNames(labels);
+  return nodeLabels;
+} finally {
+  readLock.unlock();
 }
-SetNodeLabel nodeLabels = createNodeLabelFromLabelNames(labels);
-return nodeLabels;
   }
 
   private SetNodeLabel createNodeLabelFromLabelNames(SetString labels) {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/8857cba7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.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/nodelabels/RMNodeLabelsManager.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java
index 696b99b..10092ca 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java
@@ -34,6 +34,7 @@ import java.util.concurrent.ConcurrentMap;
 import org.apache.hadoop.conf.Configuration;
 import