Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/hadoop into trunk

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

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 Set<String> acccessibleNodeLabels;
+    protected Set<String> accessibleNodeLabels;
     protected Resource resource;
 
     protected Queue() {
-      acccessibleNodeLabels =
+      accessibleNodeLabels =
           Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
       resource = Resource.newInstance(0, 0);
     }
@@ -98,7 +98,7 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
       // check if any queue contains this label
       for (Entry<String, Queue> entry : queueCollections.entrySet()) {
         String queueName = entry.getKey();
-        Set<String> queueLabels = entry.getValue().acccessibleNodeLabels;
+        Set<String> 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 (Entry<NodeId, 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;
       }
     }