YARN-11212. Fix CheckStyle.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeLabelsInfo.java

@@ -56,11 +56,11 @@ public NodeLabelsInfo(Set<String> nodeLabelsName) {
     }
   }
 
-  public NodeLabelsInfo(HashSet<NodeLabel> nodeLabels) {
+  public NodeLabelsInfo(Collection<NodeLabel> nodeLabels) {
     this.nodeLabelsInfo = new ArrayList<>();
-    for (NodeLabel label : nodeLabels) {
-      this.nodeLabelsInfo.add(new NodeLabelInfo(label));
-    }
+    nodeLabels.stream().forEach(nodeLabel -> {
+      this.nodeLabelsInfo.add(new NodeLabelInfo(nodeLabel));
+    });
   }
 
   public ArrayList<NodeLabelInfo> getNodeLabelsInfo() {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeToLabelsInfo.java

@@ -35,6 +35,12 @@ public NodeToLabelsInfo() {
     // JAXB needs this
   }
 
+  public NodeToLabelsInfo(HashMap<String, NodeLabelsInfo> nodeToLabels) {
+    if (nodeToLabels != null) {
+      this.nodeToLabels.putAll(nodeToLabels);
+    }
+  }
+
   public HashMap<String, NodeLabelsInfo> getNodeToLabels() {
     return nodeToLabels;
   }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java

@@ -951,7 +951,6 @@ private SubClusterInfo getNodeSubcluster(String nodeId)
   public NodesInfo getNodes(String states) {
 
     NodesInfo nodes = new NodesInfo();
-
     try {
       Map<SubClusterId, SubClusterInfo> subClustersActive = getActiveSubclusters();
       Class[] argsClasses = new Class[]{String.class};
@@ -962,13 +961,12 @@ public NodesInfo getNodes(String states) {
       nodesMap.values().stream().forEach(nodesInfo -> {
         nodes.addAll(nodesInfo.getNodes());
       });
-
     } catch (NotFoundException e) {
       LOG.error("Get all active sub cluster(s) error.", e);
     } catch (YarnException e) {
       LOG.error("getNodes error.", e);
     } catch (IOException e) {
-      LOG.error("getNodes error.", e);
+      LOG.error("getNodes error with io error.", e);
     }
 
     // Delete duplicate from all the node reports got from all the available
@@ -1398,10 +1396,9 @@ private <R> Map<SubClusterInfo, R> invokeConcurrent(Collection<SubClusterInfo> c
           R ret = clazz.cast(retObj);
           return ret;
         } catch (Exception e) {
-          String msg = String.format("SubCluster %s failed to call %s method.",
-              info.getSubClusterId(), request.getMethodName());
-          LOG.error(msg, e);
-          throw new YarnRuntimeException(msg, e);
+          LOG.error("SubCluster %s failed to call %s method.",
+              info.getSubClusterId(), request.getMethodName(), e);
+          return null;
         }
       });
     }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServiceUtil.java

@@ -31,6 +31,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Collection;
+import java.util.Set;
 import java.util.HashSet;
 import java.util.concurrent.TimeUnit;
 
@@ -518,7 +519,6 @@ protected static <T> String getMediaTypeFromHttpServletRequest(
   public static NodeToLabelsInfo mergeNodeToLabels(
       Map<SubClusterInfo, NodeToLabelsInfo> nodeToLabelsInfoMap) {
 
-    NodeToLabelsInfo result = new NodeToLabelsInfo();
     HashMap<String, NodeLabelsInfo> nodeToLabels = new HashMap<>();
     Collection<NodeToLabelsInfo> nodeToLabelsInfos = nodeToLabelsInfoMap.values();
 
@@ -527,7 +527,7 @@ public static NodeToLabelsInfo mergeNodeToLabels(
         String key = item.getKey();
         NodeLabelsInfo itemValue = item.getValue();
         NodeLabelsInfo nodeToLabelsValue = nodeToLabels.getOrDefault(item.getKey(), null);
-        HashSet<NodeLabel> hashSet = new HashSet<>();
+        Set<NodeLabel> hashSet = new HashSet<>();
         if (itemValue != null) {
           hashSet.addAll(itemValue.getNodeLabels());
         }
@@ -538,7 +538,6 @@ public static NodeToLabelsInfo mergeNodeToLabels(
       }
     });
 
-    result.setNodeToLabels(nodeToLabels);
-    return result;
+    return new NodeToLabelsInfo(nodeToLabels);
   }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockDefaultRequestInterceptorREST.java

@@ -292,11 +292,9 @@ public NodeToLabelsInfo getNodeToLabels(HttpServletRequest hsr) throws IOExcepti
     NodeLabelsInfo cpuNode = new NodeLabelsInfo(Collections.singleton("CPU"));
     NodeLabelsInfo gpuNode = new NodeLabelsInfo(Collections.singleton("GPU"));
 
-    NodeToLabelsInfo info = new NodeToLabelsInfo();
     HashMap<String, NodeLabelsInfo> nodeLabels = new HashMap<>();
     nodeLabels.put("node1", cpuNode);
     nodeLabels.put("node2", gpuNode);
-    info.setNodeToLabels(nodeLabels);
-    return info;
+    return new NodeToLabelsInfo(nodeLabels);
   }
 }