hadoop git commit: YARN-3592. Fix typos in RMNodeLabelsManager. Contributed by Sunil G.

2015-05-07 Thread devaraj 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 66988476d - a28cd02ba


YARN-3592. Fix typos in RMNodeLabelsManager. Contributed by Sunil G.


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

Branch: refs/heads/trunk
Commit: a28cd02ba026733e409807f3ea1b36f7d57bc273
Parents: 6698847
Author: Devaraj K deva...@apache.org
Authored: Fri May 8 10:54:36 2015 +0530
Committer: Devaraj K deva...@apache.org
Committed: Fri May 8 10:54:36 2015 +0530

--
 hadoop-yarn-project/CHANGES.txt   |  2 ++
 .../resourcemanager/nodelabels/RMNodeLabelsManager.java   | 10 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a28cd02b/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index f8a2cc0..a698a7d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -342,6 +342,8 @@ Release 2.8.0 - UNRELEASED
 YARN-3572. Correct typos in WritingYarnApplications.md.
 (Gabor Liptak via aajisaka)
 
+YARN-3592. Fix typos in RMNodeLabelsManager. (Sunil G via devaraj)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a28cd02b/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 25e5bc09..696b99b 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
@@ -46,11 +46,11 @@ import com.google.common.collect.ImmutableSet;
 
 public class RMNodeLabelsManager extends CommonNodeLabelsManager {
   protected static class Queue {
-protected SetString acccessibleNodeLabels;
+protected SetString accessibleNodeLabels;
 protected Resource resource;
 
 protected Queue() {
-  acccessibleNodeLabels =
+  accessibleNodeLabels =
   Collections.newSetFromMap(new ConcurrentHashMapString, Boolean());
   resource = Resource.newInstance(0, 0);
 }
@@ -98,7 +98,7 @@ public class RMNodeLabelsManager extends 
CommonNodeLabelsManager {
   // check if any queue contains this label
   for (EntryString, Queue entry : queueCollections.entrySet()) {
 String queueName = entry.getKey();
-SetString queueLabels = entry.getValue().acccessibleNodeLabels;
+SetString queueLabels = entry.getValue().accessibleNodeLabels;
 if (queueLabels.contains(label)) {
   throw new IOException(Cannot remove label= + label
   + , because queue= + queueName +  is using this label. 
@@ -275,7 +275,7 @@ public class RMNodeLabelsManager extends 
CommonNodeLabelsManager {
   continue;
 }
 
-q.acccessibleNodeLabels.addAll(labels);
+q.accessibleNodeLabels.addAll(labels);
 for (Host host : nodeCollections.values()) {
   for (EntryNodeId, Node nentry : host.nms.entrySet()) {
 NodeId nodeId = nentry.getKey();
@@ -468,7 +468,7 @@ public class RMNodeLabelsManager extends 
CommonNodeLabelsManager {
 }
 
 for (String label : nodeLabels) {
-  if (q.acccessibleNodeLabels.contains(label)) {
+  if (q.accessibleNodeLabels.contains(label)) {
 return true;
   }
 }

hadoop git commit: YARN-3592. Fix typos in RMNodeLabelsManager. Contributed by Sunil G.

2015-05-07 Thread devaraj 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d0fff5d32 - dce2381dc


YARN-3592. Fix typos in RMNodeLabelsManager. Contributed by Sunil G.

(cherry picked from commit a28cd02ba026733e409807f3ea1b36f7d57bc273)


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

Branch: refs/heads/branch-2
Commit: dce2381dc4a877fcbfb869f115152ecd44a92173
Parents: d0fff5d
Author: Devaraj K deva...@apache.org
Authored: Fri May 8 10:54:36 2015 +0530
Committer: Devaraj K deva...@apache.org
Committed: Fri May 8 10:55:53 2015 +0530

--
 hadoop-yarn-project/CHANGES.txt   |  2 ++
 .../resourcemanager/nodelabels/RMNodeLabelsManager.java   | 10 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/dce2381d/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index b49940d..0523f4f 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -297,6 +297,8 @@ Release 2.8.0 - UNRELEASED
 YARN-3572. Correct typos in WritingYarnApplications.md.
 (Gabor Liptak via aajisaka)
 
+YARN-3592. Fix typos in RMNodeLabelsManager. (Sunil G via devaraj)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/dce2381d/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 25e5bc09..696b99b 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
@@ -46,11 +46,11 @@ import com.google.common.collect.ImmutableSet;
 
 public class RMNodeLabelsManager extends CommonNodeLabelsManager {
   protected static class Queue {
-protected SetString acccessibleNodeLabels;
+protected SetString accessibleNodeLabels;
 protected Resource resource;
 
 protected Queue() {
-  acccessibleNodeLabels =
+  accessibleNodeLabels =
   Collections.newSetFromMap(new ConcurrentHashMapString, Boolean());
   resource = Resource.newInstance(0, 0);
 }
@@ -98,7 +98,7 @@ public class RMNodeLabelsManager extends 
CommonNodeLabelsManager {
   // check if any queue contains this label
   for (EntryString, Queue entry : queueCollections.entrySet()) {
 String queueName = entry.getKey();
-SetString queueLabels = entry.getValue().acccessibleNodeLabels;
+SetString queueLabels = entry.getValue().accessibleNodeLabels;
 if (queueLabels.contains(label)) {
   throw new IOException(Cannot remove label= + label
   + , because queue= + queueName +  is using this label. 
@@ -275,7 +275,7 @@ public class RMNodeLabelsManager extends 
CommonNodeLabelsManager {
   continue;
 }
 
-q.acccessibleNodeLabels.addAll(labels);
+q.accessibleNodeLabels.addAll(labels);
 for (Host host : nodeCollections.values()) {
   for (EntryNodeId, Node nentry : host.nms.entrySet()) {
 NodeId nodeId = nentry.getKey();
@@ -468,7 +468,7 @@ public class RMNodeLabelsManager extends 
CommonNodeLabelsManager {
 }
 
 for (String label : nodeLabels) {
-  if (q.acccessibleNodeLabels.contains(label)) {
+  if (q.accessibleNodeLabels.contains(label)) {
 return true;
   }
 }