YARN-11536. Fix CheckStyle.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RouterCLI.java

@@ -349,6 +349,7 @@ private int handlePolicy(String[] args)
     opts.addOption(saveOpt);
     opts.addOption(batchSaveOpt);
     opts.addOption(formatOpt);
+    opts.addOption(fileOpt);
 
     // Parse command line arguments.
     CommandLine cliParser;
@@ -418,8 +419,20 @@ private int handleSavePolicy(String policy) {
   }
 
   private int handBatchSavePolicies(String format, String policyFile) {
+
+    if(StringUtils.isBlank(format)) {
+      LOG.error("Batch Save Federation Policies. Format is Empty.");
+      return EXIT_ERROR;
+    }
+
+    if(StringUtils.isBlank(policyFile)) {
+      LOG.error("Batch Save Federation Policies. policyFile is Empty.");
+      return EXIT_ERROR;
+    }
+
     LOG.info("Batch Save Federation Policies. Format = {}, PolicyFile = {}.",
         format, policyFile);
+
     switch (format) {
     case FORMAT_XML:
       return parseXml2Policies(policyFile);
@@ -561,14 +574,18 @@ private String parsePolicyWeightsNode(Element queueElement, String weightType) {
     List<String> amRmPolicyWeights = new ArrayList<>();
     if (amrmPolicyWeightsNode.getNodeType() == Node.ELEMENT_NODE) {
       Element amrmPolicyWeightsElement = (Element) amrmPolicyWeightsNode;
-      NodeList subClusterIdInfoList = amrmPolicyWeightsElement.getElementsByTagName(XML_TAG_SUBCLUSTERIDINFO);
+      NodeList subClusterIdInfoList =
+          amrmPolicyWeightsElement.getElementsByTagName(XML_TAG_SUBCLUSTERIDINFO);
       for (int i = 0; i < subClusterIdInfoList.getLength(); i++) {
         Node subClusterIdInfoNode = subClusterIdInfoList.item(i);
         if (subClusterIdInfoNode.getNodeType() == Node.ELEMENT_NODE) {
           Element subClusterIdInfoElement = (Element) subClusterIdInfoNode;
-          String subClusterId = subClusterIdInfoElement.getElementsByTagName("id").item(0).getTextContent();
-          String weight = subClusterIdInfoElement.getElementsByTagName("weight").item(0).getTextContent();
-          LOG.debug("WeightType[{}] - SubCluster ID: {}, Weight: {}.", weightType, subClusterId, weight);
+          String subClusterId =
+              subClusterIdInfoElement.getElementsByTagName("id").item(0).getTextContent();
+          String weight =
+              subClusterIdInfoElement.getElementsByTagName("weight").item(0).getTextContent();
+          LOG.debug("WeightType[{}] - SubCluster ID: {}, Weight: {}.",
+              weightType, subClusterId, weight);
           amRmPolicyWeights.add(subClusterId + ":" + weight);
         }
       }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/FederationRMAdminInterceptor.java

@@ -1057,6 +1057,7 @@ private void saveFederationQueuePolicy(FederationQueueWeight federationQueueWeig
    *
    * @param policyWeight policyWeight.
    * @return Map of SubClusterWeight.
+   * @throws YarnException exceptions from yarn servers.
    */
   protected Map<SubClusterIdInfo, Float> getSubClusterWeightMap(String policyWeight)
       throws YarnException {

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

@@ -2267,11 +2267,13 @@ public void testGetBatchSaveFederationQueuePoliciesRetrieved() {
     Assert.assertEquals(totalGoodBefore + 1,
         metrics.getNumSucceededBatchSaveFederationQueuePoliciesRetrieved());
     Assert.assertEquals(150,
-        metrics.getLatencySucceededBatchSaveFederationQueuePoliciesRetrieved(), ASSERT_DOUBLE_DELTA);
+        metrics.getLatencySucceededBatchSaveFederationQueuePoliciesRetrieved(),
+        ASSERT_DOUBLE_DELTA);
     goodSubCluster.getBatchSaveFederationQueuePoliciesRetrieved(300);
     Assert.assertEquals(totalGoodBefore + 2,
         metrics.getNumSucceededBatchSaveFederationQueuePoliciesRetrieved());
     Assert.assertEquals(225,
-        metrics.getLatencySucceededBatchSaveFederationQueuePoliciesRetrieved(), ASSERT_DOUBLE_DELTA);
+        metrics.getLatencySucceededBatchSaveFederationQueuePoliciesRetrieved(),
+        ASSERT_DOUBLE_DELTA);
   }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestFederationRMAdminInterceptor.java

@@ -673,14 +673,14 @@ public void testSaveFederationQueuePolicyRequest() throws IOException, YarnExcep
   public void testBatchSaveFederationQueuePoliciesRequest() throws IOException, YarnException {
 
     // subClusters
-    List<String> subClusters = new ArrayList<>();
-    subClusters.add("SC-1");
-    subClusters.add("SC-2");
+    List<String> subClusterLists = new ArrayList<>();
+    subClusterLists.add("SC-1");
+    subClusterLists.add("SC-2");
 
     // generate queue A, queue B, queue C
-    FederationQueueWeight rootA = generateFederationQueueWeight("root.a", subClusters);
-    FederationQueueWeight rootB = generateFederationQueueWeight("root.b", subClusters);
-    FederationQueueWeight rootC = generateFederationQueueWeight("root.b", subClusters);
+    FederationQueueWeight rootA = generateFederationQueueWeight("root.a", subClusterLists);
+    FederationQueueWeight rootB = generateFederationQueueWeight("root.b", subClusterLists);
+    FederationQueueWeight rootC = generateFederationQueueWeight("root.b", subClusterLists);
 
     List<FederationQueueWeight> federationQueueWeights = new ArrayList<>();
     federationQueueWeights.add(rootA);
@@ -689,14 +689,14 @@ public void testBatchSaveFederationQueuePoliciesRequest() throws IOException, Ya
 
     // Step1. Save Queue Policies in Batches
     BatchSaveFederationQueuePoliciesRequest request =
-       BatchSaveFederationQueuePoliciesRequest.newInstance(federationQueueWeights);
+        BatchSaveFederationQueuePoliciesRequest.newInstance(federationQueueWeights);
 
     BatchSaveFederationQueuePoliciesResponse policiesResponse =
         interceptor.batchSaveFederationQueuePolicies(request);
 
-    Assert.assertNotNull(policiesResponse);
-    Assert.assertNotNull(policiesResponse.getMessage());
-    Assert.assertEquals("batch save policies success.", policiesResponse.getMessage());
+    assertNotNull(policiesResponse);
+    assertNotNull(policiesResponse.getMessage());
+    assertEquals("batch save policies success.", policiesResponse.getMessage());
 
     // Step2. We query Policy information from FederationStateStore.
     FederationStateStoreFacade federationFacade = interceptor.getFederationFacade();
@@ -748,13 +748,13 @@ public void testBatchSaveFederationQueuePoliciesRequest() throws IOException, Ya
    * We will generate the weight information of the queue.
    *
    * @param queue queue name
-   * @param subClusters subClusters
+   * @param pSubClusters subClusters
    * @return subCluster FederationQueueWeight
    */
   private FederationQueueWeight generateFederationQueueWeight(
-      String queue, List<String> subClusters) {
-    String routerWeight = generatePolicyWeight(subClusters);
-    String amrmWeight = generatePolicyWeight(subClusters);
+      String queue, List<String> pSubClusters) {
+    String routerWeight = generatePolicyWeight(pSubClusters);
+    String amrmWeight = generatePolicyWeight(pSubClusters);
     String policyTypeName = WeightedLocalityPolicyManager.class.getCanonicalName();
     String headRoomAlpha = "1.0";
     return FederationQueueWeight.newInstance(routerWeight, amrmWeight, headRoomAlpha,
@@ -764,14 +764,14 @@ private FederationQueueWeight generateFederationQueueWeight(
   /**
    * Generating Policy Weight Data.
    *
-   * @param subClusters set of sub-clusters.
+   * @param pSubClusters set of sub-clusters.
    * @return policy Weight String, like SC-1:0.7,SC-2:0.
    */
-  private String generatePolicyWeight(List<String> subClusters) {
+  private String generatePolicyWeight(List<String> pSubClusters) {
     List<String> weights = generateWeights(subClusters.size());
     List<String> subClusterWeight = new ArrayList<>();
-    for (int i = 0; i < subClusters.size(); i++) {
-      String subCluster = subClusters.get(i);
+    for (int i = 0; i < pSubClusters.size(); i++) {
+      String subCluster = pSubClusters.get(i);
       String weight = weights.get(i);
       subClusterWeight.add(subCluster + ":" + weight);
     }