diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java index 25ff417..f2fcd8f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java @@ -383,8 +383,8 @@ protected void checkRemoveFromClusterNodeLabels( @SuppressWarnings("unchecked") protected void internalRemoveFromClusterNodeLabels(Collection labelsToRemove) { // remove labels from nodes - for (String nodeName : nodeCollections.keySet()) { - Host host = nodeCollections.get(nodeName); + for (Entry entry : nodeCollections.entrySet()) { + Host host = entry.getValue(); if (null != host) { host.labels.removeAll(labelsToRemove); for (Node nm : host.nms.values()) {