Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-10479. Can't remove all node labels after add node label without 

nodemanager port, broken by YARN-10647. Contributed by D M Murali Krishna Reddy

(cherry picked from commit 6857a05d6a)
This commit is contained in:
Eric Badger 2021-04-23 22:14:57 +00:00
parent 3b1cde2f42
commit 003deeeecf
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
View File

@ -95,6 +95,8 @@ public class CommonNodeLabelsManager extends AbstractService {
new ConcurrentHashMap<String, RMNodeLabel>(); new ConcurrentHashMap<String, RMNodeLabel>();
protected ConcurrentMap<String, Host> nodeCollections = protected ConcurrentMap<String, Host> nodeCollections =
new ConcurrentHashMap<String, Host>(); new ConcurrentHashMap<String, Host>();
private ConcurrentMap<NodeId, Boolean> isNodeLabelFromHost =
new ConcurrentHashMap<NodeId, Boolean>();
protected RMNodeLabel noNodeLabel; protected RMNodeLabel noNodeLabel;
@ -603,6 +605,11 @@ public class CommonNodeLabelsManager extends AbstractService {
addLabelsToNodeInHost(node, newLabels); addLabelsToNodeInHost(node, newLabels);
} }
protected boolean isNodeLabelExplicit(NodeId nodeId) {
return !isNodeLabelFromHost.containsKey(nodeId) ||
isNodeLabelFromHost.get(nodeId);
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
protected void internalUpdateLabelsOnNodes( protected void internalUpdateLabelsOnNodes(
Map<NodeId, Set<String>> nodeToLabels, NodeLabelUpdateOperation op) Map<NodeId, Set<String>> nodeToLabels, NodeLabelUpdateOperation op)
@ -637,6 +644,7 @@ public class CommonNodeLabelsManager extends AbstractService {
node.labels.addAll(labels); node.labels.addAll(labels);
} }
addNodeToLabels(node.nodeId, labels); addNodeToLabels(node.nodeId, labels);
isNodeLabelFromHost.put(node.nodeId, true);
} }
break; break;
case REPLACE: case REPLACE:
@ -646,10 +654,9 @@ public class CommonNodeLabelsManager extends AbstractService {
host.labels.addAll(labels); host.labels.addAll(labels);
for (Node node : host.nms.values()) { for (Node node : host.nms.values()) {
replaceNodeForLabels(node.nodeId, node.labels, labels); replaceNodeForLabels(node.nodeId, node.labels, labels);
if (node.labels != null) { replaceLabelsForNode(node.nodeId, node.labels, labels);
replaceLabelsForNode(node.nodeId, node.labels, labels);
}
node.labels = null; node.labels = null;
isNodeLabelFromHost.put(node.nodeId, true);
} }
break; break;
default: default:
@ -669,6 +676,7 @@ public class CommonNodeLabelsManager extends AbstractService {
nm.labels = new HashSet<String>(); nm.labels = new HashSet<String>();
} }
nm.labels.addAll(labels); nm.labels.addAll(labels);
isNodeLabelFromHost.put(nm.nodeId, false);
break; break;
case REPLACE: case REPLACE:
oldLabels = getLabelsByNode(nodeId); oldLabels = getLabelsByNode(nodeId);
@ -679,6 +687,7 @@ public class CommonNodeLabelsManager extends AbstractService {
} }
nm.labels.clear(); nm.labels.clear();
nm.labels.addAll(labels); nm.labels.addAll(labels);
isNodeLabelFromHost.put(nm.nodeId, false);
break; break;
default: default:
break; break;

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java
View File

@ -275,7 +275,7 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
Map<String, Host> before = cloneNodeMap(ImmutableSet.of(nodeId)); Map<String, Host> before = cloneNodeMap(ImmutableSet.of(nodeId));
Node nm = getNMInNodeSet(nodeId); Node nm = getNMInNodeSet(nodeId);
if (null != nm) { if (null != nm) {
if (null == nm.labels) { if (isNodeLabelExplicit(nm.nodeId)) {
// When node deactivated, remove the nm from node collection if no // When node deactivated, remove the nm from node collection if no
// labels explicitly set for this particular nm // labels explicitly set for this particular nm