YARN-10823. Fix default node label if no label is defined

apache · Sep 21, 2021 · ef560cd · ef560cd
1 parent f509d98
commit ef560cd
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...rg/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ConfiguredNodeLabels.java b/...rg/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ConfiguredNodeLabels.java
@@ -81,7 +81,13 @@ public void setLabelsByQueue(
    * @return all node labels
    */
   public Set<String> getAllConfiguredLabels() {
-    return configuredNodeLabelsByQueue.values().stream()
+    Set<String> nodeLabels = configuredNodeLabelsByQueue.values().stream()
         .flatMap(Set::stream).collect(Collectors.toSet());
+
+    if (nodeLabels.size() == 0) {
+      nodeLabels = NO_LABEL;
+    }
+
+    return nodeLabels;
   }
 }