YARN-11235. Fix CheckStyle.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/RouterPolicyFacade.java

@@ -272,13 +272,12 @@ private FederationRouterPolicy getFederationRouterPolicy(
     try {
       configuration = federationFacade.getPolicyConfiguration(copyQueue);
     } catch (YarnException e) {
-      LOG.warn("There is no policy configured for the queue: {}, " +
-          "falling back to defaults.", copyQueue, e);
+      LOG.warn("There is no policy configured for the queue: {}, falling back to defaults.",
+          copyQueue, e);
     }
 
     // If there is no policy configured for this queue, fallback to the baseline
-    // policy that is configured either in the store or via XML config (and
-    // cached)
+    // policy that is configured either in the store or via XML config (and cached)
     if (configuration == null) {
       final String policyKey = YarnConfiguration.DEFAULT_FEDERATION_POLICY_KEY;
       LOG.warn("There is no policies configured for queue: {} " +
@@ -287,8 +286,8 @@ private FederationRouterPolicy getFederationRouterPolicy(
       try {
         configuration = federationFacade.getPolicyConfiguration(copyQueue);
       } catch (YarnException e) {
-        LOG.warn("Cannot retrieve policy configured for the queue: {}, " +
-            "falling back to defaults.", copyQueue, e);
+        LOG.warn("Cannot retrieve policy configured for the queue: {}, falling back to defaults.",
+            copyQueue, e);
       }
     }
 
@@ -300,8 +299,9 @@ private FederationRouterPolicy getFederationRouterPolicy(
 
     // if the configuration has changed since last loaded, reinit the policy
     // based on current configuration
-    if (!cachedConfiguration.containsKey(copyQueue)
-            || !cachedConfiguration.get(copyQueue).equals(configuration)) {
+    SubClusterPolicyConfiguration policyConfiguration =
+        cachedConfiguration.getOrDefault(copyQueue, null);
+    if (policyConfiguration == null || !policyConfiguration.equals(configuration)) {
       singlePolicyReinit(policyMap, cachedConfiguration, copyQueue, configuration);
     }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/router/LocalityRouterPolicy.java

@@ -23,7 +23,6 @@
 import java.util.Map;
 import java.util.Collections;
 
-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
 import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
 import org.apache.hadoop.yarn.api.records.ExecutionType;
 import org.apache.hadoop.yarn.api.records.ExecutionTypeRequest;
@@ -133,14 +132,14 @@ public SubClusterId getHomeSubcluster(
           targetId = resolver.getSubClusterForNode(rr.getResourceName());
           nodeRequest = rr;
         } catch (YarnException e) {
-          LOG.error("Cannot resolve node.");
+          LOG.error("Cannot resolve node : {}.", rr.getResourceName(), e);
         }
         // Handle "rack" requests
         try {
           resolver.getSubClustersForRack(rr.getResourceName());
           rackRequest = rr;
         } catch (YarnException e) {
-          LOG.error("Cannot resolve rack.");
+          LOG.error("Cannot resolve rack : {}.", rr.getResourceName(), e);
         }
         // Handle "ANY" requests
         if (ResourceRequest.isAnyLocation(rr.getResourceName())) {
@@ -173,8 +172,8 @@ public SubClusterId getHomeSubcluster(
             + " is in a blacklist SubCluster or not active. ");
       }
     } catch (YarnException e) {
-      LOG.error("Validating resource requests failed, Falling back to "
-          + "WeightedRandomRouterPolicy placement.", e);
+      LOG.error("Validating resource requests failed, " +
+          "Falling back to WeightedRandomRouterPolicy placement.", e);
       // FailForward to WeightedRandomRouterPolicy
       // Overwrite request to use a default ANY
       ResourceRequest amReq = Records.newRecord(ResourceRequest.class);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/router/PriorityRouterPolicy.java

@@ -27,20 +27,20 @@
 
 /**
  * This implements a policy that interprets "weights" as a ordered list of
- * preferences among sub-clusters. Highest weight among active subClusters is
+ * preferences among sub-clusters. Highest weight among active subclusters is
  * chosen.
  */
 public class PriorityRouterPolicy extends AbstractRouterPolicy {
 
   @Override
   protected SubClusterId chooseSubCluster(
-      String queue, Map<SubClusterId, SubClusterInfo> preSelectSubClusters) throws YarnException {
+      String queue, Map<SubClusterId, SubClusterInfo> preSelectSubclusters) throws YarnException {
     // This finds the sub-cluster with the highest weight among the
     // currently active ones.
     Map<SubClusterIdInfo, Float> weights = getPolicyInfo().getRouterPolicyWeights();
     SubClusterId chosen = null;
     Float currentBest = Float.MIN_VALUE;
-    for (SubClusterId id : preSelectSubClusters.keySet()) {
+    for (SubClusterId id : preSelectSubclusters.keySet()) {
       SubClusterIdInfo idInfo = new SubClusterIdInfo(id);
       if (weights.containsKey(idInfo) && weights.get(idInfo) > currentBest) {
         currentBest = weights.get(idInfo);
@@ -49,7 +49,7 @@ protected SubClusterId chooseSubCluster(
     }
     if (chosen == null) {
       throw new FederationPolicyException(
-          "No Active SubCluster with weight vector greater than zero.");
+          "No Active Subcluster with weight vector greater than zero.");
     }
     return chosen;
   }