YARN-11235. Fix CheckStyle.

slfan1989 · slfan1989 · commit b258c9a98923 · 2022-07-30T04:57:02.000-07:00
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/router/HashBasedRouterPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/router/HashBasedRouterPolicy.java
@@ -50,9 +50,9 @@ public void reinitialize(
 
   @Override
   protected SubClusterId chooseSubCluster(String queue,
-      Map<SubClusterId, SubClusterInfo> preSelectSubClusters) throws YarnException {
-    int chosenPosition = Math.abs(queue.hashCode() % preSelectSubClusters.size());
-    List<SubClusterId> list = new ArrayList<>(preSelectSubClusters.keySet());
+      Map<SubClusterId, SubClusterInfo> preSelectSubclusters) throws YarnException {
+    int chosenPosition = Math.abs(queue.hashCode() % preSelectSubclusters.size());
+    List<SubClusterId> list = new ArrayList<>(preSelectSubclusters.keySet());
     Collections.sort(list);
     return list.get(chosenPosition);
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/router/LoadBasedRouterPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/router/LoadBasedRouterPolicy.java
@@ -62,11 +62,11 @@ public void reinitialize(FederationPolicyInitializationContext policyContext)
 
   @Override
   protected SubClusterId chooseSubCluster(
-      String queue, Map<SubClusterId, SubClusterInfo> preSelectSubClusters) throws YarnException {
+      String queue, Map<SubClusterId, SubClusterInfo> preSelectSubclusters) throws YarnException {
     Map<SubClusterIdInfo, Float> weights = getPolicyInfo().getRouterPolicyWeights();
     SubClusterIdInfo chosen = null;
     long currBestMem = -1;
-    for (Map.Entry<SubClusterId, SubClusterInfo> entry : preSelectSubClusters.entrySet()) {
+    for (Map.Entry<SubClusterId, SubClusterInfo> entry : preSelectSubclusters.entrySet()) {
       SubClusterIdInfo id = new SubClusterIdInfo(entry.getKey());
       if (weights.containsKey(id) && weights.get(id) > 0) {
         long availableMemory = getAvailableMemory(entry.getValue());
@@ -78,7 +78,7 @@ protected SubClusterId chooseSubCluster(
     }
     if (chosen == null) {
       throw new FederationPolicyException(
-          "Zero Active SubCluster with weight 1.");
+          "Zero Active Subcluster with weight 1.");
     }
     return chosen.toId();
   }
diff --git a/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 b/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
@@ -132,14 +132,14 @@ public SubClusterId getHomeSubcluster(
           targetId = resolver.getSubClusterForNode(rr.getResourceName());
           nodeRequest = rr;
         } catch (YarnException e) {
-          LOG.error("Cannot resolve node : {}.", rr.getResourceName(), e);
+          LOG.error("Cannot resolve node : {}.", e.getMessage());
         }
         // Handle "rack" requests
         try {
           resolver.getSubClustersForRack(rr.getResourceName());
           rackRequest = rr;
         } catch (YarnException e) {
-          LOG.error("Cannot resolve rack : {}.", rr.getResourceName(), e);
+          LOG.error("Cannot resolve rack : {}.", e.getMessage());
         }
         // Handle "ANY" requests
         if (ResourceRequest.isAnyLocation(rr.getResourceName())) {
@@ -173,7 +173,7 @@ public SubClusterId getHomeSubcluster(
       }
     } catch (YarnException e) {
       LOG.error("Validating resource requests failed, " +
-          "Falling back to WeightedRandomRouterPolicy placement.", e);
+          "Falling back to WeightedRandomRouterPolicy placement : {}.", e.getMessage());
       // FailForward to WeightedRandomRouterPolicy
       // Overwrite request to use a default ANY
       ResourceRequest amReq = Records.newRecord(ResourceRequest.class);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/router/RejectRouterPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/router/RejectRouterPolicy.java
@@ -17,10 +17,8 @@
 
 package org.apache.hadoop.yarn.server.federation.policies.router;
 
-import java.util.List;
 import java.util.Map;
 
-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.server.federation.policies.FederationPolicyInitializationContext;
 import org.apache.hadoop.yarn.server.federation.policies.FederationPolicyInitializationContextValidator;
@@ -47,7 +45,7 @@ public void reinitialize(
 
   @Override
   protected SubClusterId chooseSubCluster(
-      String queue, Map<SubClusterId, SubClusterInfo> preSelectSubClusters) throws YarnException {
+      String queue, Map<SubClusterId, SubClusterInfo> preSelectSubclusters) throws YarnException {
     throw new FederationPolicyException(
         "The policy configured for this queue (" + queue + ") "
         + "reject all routing requests by construction. Application in "
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/router/UniformRandomRouterPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/router/UniformRandomRouterPolicy.java
@@ -22,11 +22,9 @@
 import java.util.Map;
 import java.util.Random;
 
-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.server.federation.policies.FederationPolicyInitializationContext;
 import org.apache.hadoop.yarn.server.federation.policies.FederationPolicyInitializationContextValidator;
-import org.apache.hadoop.yarn.server.federation.policies.FederationPolicyUtils;
 import org.apache.hadoop.yarn.server.federation.policies.exceptions.FederationPolicyException;
 import org.apache.hadoop.yarn.server.federation.policies.exceptions.FederationPolicyInitializationException;
 import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
@@ -56,17 +54,16 @@ public void reinitialize(FederationPolicyInitializationContext policyContext)
         this.getClass().getCanonicalName());
 
     // note: this overrides AbstractRouterPolicy and ignores the weights
-
     setPolicyContext(policyContext);
   }
 
   @Override
   protected SubClusterId chooseSubCluster(
-      String queue, Map<SubClusterId, SubClusterInfo> preSelectSubClusters) throws YarnException {
-    if (preSelectSubClusters == null || preSelectSubClusters.isEmpty()) {
-      throw new FederationPolicyException("No available sub-cluster to choose from.");
+      String queue, Map<SubClusterId, SubClusterInfo> preSelectSubclusters) throws YarnException {
+    if (preSelectSubclusters == null || preSelectSubclusters.isEmpty()) {
+      throw new FederationPolicyException("No available subcluster to choose from.");
     }
-    List<SubClusterId> list = new ArrayList<>(preSelectSubClusters.keySet());
+    List<SubClusterId> list = new ArrayList<>(preSelectSubclusters.keySet());
     return list.get(rand.nextInt(list.size()));
   }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/router/WeightedRandomRouterPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/router/WeightedRandomRouterPolicy.java
@@ -19,10 +19,8 @@
 package org.apache.hadoop.yarn.server.federation.policies.router;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.server.federation.policies.FederationPolicyUtils;
 import org.apache.hadoop.yarn.server.federation.policies.exceptions.FederationPolicyException;
@@ -37,7 +35,7 @@
 public class WeightedRandomRouterPolicy extends AbstractRouterPolicy {
   @Override
   protected SubClusterId chooseSubCluster(
-      String queue, Map<SubClusterId, SubClusterInfo> preSelectSubClusters) throws YarnException {
+      String queue, Map<SubClusterId, SubClusterInfo> preSelectSubclusters) throws YarnException {
 
     // note: we cannot pre-compute the weights, as the set of activeSubCluster
     // changes dynamically (and this would unfairly spread the load to
@@ -49,7 +47,7 @@ protected SubClusterId chooseSubCluster(
     ArrayList<SubClusterId> scIdList = new ArrayList<>();
     for (Map.Entry<SubClusterIdInfo, Float> entry : weights.entrySet()) {
       SubClusterIdInfo key = entry.getKey();
-      if (key != null && preSelectSubClusters.containsKey(key.toId())) {
+      if (key != null && preSelectSubclusters.containsKey(key.toId())) {
         weightList.add(entry.getValue());
         scIdList.add(key.toId());
       }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/BaseFederationPoliciesTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/BaseFederationPoliciesTest.java
@@ -235,7 +235,8 @@ public ReservationSubmissionRequest getReservationSubmissionRequest() {
     return reservationSubmissionRequest;
   }
 
-  public void setReservationSubmissionRequest(ReservationSubmissionRequest reservationSubmissionRequest) {
+  public void setReservationSubmissionRequest(
+      ReservationSubmissionRequest reservationSubmissionRequest) {
     this.reservationSubmissionRequest = reservationSubmissionRequest;
   }
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/BaseRouterPoliciesTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/BaseRouterPoliciesTest.java
@@ -118,13 +118,13 @@ public void testAllBlacklistSubcluster() throws YarnException {
     }
   }
 
-   @Test
-   public void testNullReservationContext() throws Exception {
-     FederationRouterPolicy policy =  ((FederationRouterPolicy) getPolicy());
+  @Test
+  public void testNullReservationContext() throws Exception {
+    FederationRouterPolicy policy =  ((FederationRouterPolicy) getPolicy());
 
-     LambdaTestUtils.intercept(FederationPolicyException.class,
-         "The ReservationSubmissionRequest cannot be null.",
+    LambdaTestUtils.intercept(FederationPolicyException.class,
+        "The ReservationSubmissionRequest cannot be null.",
          () -> policy.getReservationHomeSubcluster(null));
-   }
+  }
 
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/TestHashBasedRouterPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/TestHashBasedRouterPolicy.java
@@ -27,7 +27,6 @@
 import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
-import org.apache.hadoop.yarn.server.federation.utils.FederationPoliciesTestUtil;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/TestLoadBasedRouterPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/TestLoadBasedRouterPolicy.java
@@ -133,7 +133,7 @@ public void testIfNoSubclustersWithWeightOne() {
       fail();
     } catch (YarnException ex) {
       Assert.assertTrue(
-          ex.getMessage().contains("Zero Active SubCluster with weight 1."));
+          ex.getMessage().contains("Zero Active Subcluster with weight 1."));
     }
   }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/TestPriorityRouterPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/TestPriorityRouterPolicy.java
@@ -54,11 +54,11 @@ public void setUp() throws Exception {
 
       // with 5% omit a subcluster
       if (getRand().nextFloat() < 0.95f || i == 5) {
-          long now = System.currentTimeMillis();
-          SubClusterInfo federationSubClusterInfo =
-              SubClusterInfo.newInstance(sc.toId(), "dns1:80", "dns1:81", "dns1:82", "dns1:83",
-             now - 1000, SubClusterState.SC_RUNNING, now - 2000, generateClusterMetricsInfo(i));
-          getActiveSubclusters().put(sc.toId(), federationSubClusterInfo);
+        long now = System.currentTimeMillis();
+        SubClusterInfo federationSubClusterInfo =
+            SubClusterInfo.newInstance(sc.toId(), "dns1:80", "dns1:81", "dns1:82", "dns1:83",
+            now - 1000, SubClusterState.SC_RUNNING, now - 2000, generateClusterMetricsInfo(i));
+        getActiveSubclusters().put(sc.toId(), federationSubClusterInfo);
       }
       float weight = getRand().nextFloat();
       if (i == 5) {
@@ -106,7 +106,7 @@ public void testZeroSubClustersWithPositiveWeight() throws Exception {
         getPolicyInfo(), getActiveSubclusters());
 
     intercept(FederationPolicyException.class,
-        "No Active SubCluster with weight vector greater than zero.",
+        "No Active Subcluster with weight vector greater than zero.",
         () -> ((FederationRouterPolicy) getPolicy())
             .getHomeSubcluster(getApplicationSubmissionContext(), null));
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/TestRejectRouterPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/TestRejectRouterPolicy.java
@@ -20,7 +20,6 @@
 import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.server.federation.policies.exceptions.FederationPolicyException;
-import org.apache.hadoop.yarn.server.federation.utils.FederationPoliciesTestUtil;
 import org.apache.hadoop.yarn.util.resource.Resources;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/TestUniformRandomRouterPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/TestUniformRandomRouterPolicy.java
@@ -18,15 +18,13 @@
 package org.apache.hadoop.yarn.server.federation.policies.router;
 
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.server.federation.policies.dao.WeightedPolicyInfo;
 import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
 import org.apache.hadoop.yarn.server.federation.store.records.SubClusterIdInfo;
 import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
 import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
-import org.apache.hadoop.yarn.server.federation.utils.FederationPoliciesTestUtil;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -49,7 +47,7 @@ public void setUp() throws Exception {
           SubClusterInfo.newInstance(sc.toId(), "dns1:80", "dns1:81", "dns1:82",
           "dns1:83", now - 1000, SubClusterState.SC_RUNNING, now - 2000,
           generateClusterMetricsInfo(i));
-       getActiveSubclusters().put(sc.toId(), federationSubClusterInfo);
+      getActiveSubclusters().put(sc.toId(), federationSubClusterInfo);
     }
 
     setupContext();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/TestWeightedRandomRouterPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/router/TestWeightedRandomRouterPolicy.java
@@ -32,7 +32,6 @@
 import org.apache.hadoop.yarn.server.federation.store.records.SubClusterIdInfo;
 import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
 import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
-import org.apache.hadoop.yarn.server.federation.utils.FederationPoliciesTestUtil;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,8 @@ public ReservationSubmissionRequest getReservationSubmissionRequest() {`
`235`	`235`	`return reservationSubmissionRequest;`
`236`	`236`	`}`
`237`	`237`
`238`		`- public void setReservationSubmissionRequest(ReservationSubmissionRequest reservationSubmissionRequest) {`
	`238`	`+ public void setReservationSubmissionRequest(`
	`239`	`+ ReservationSubmissionRequest reservationSubmissionRequest) {`
`239`	`240`	`this.reservationSubmissionRequest = reservationSubmissionRequest;`
`240`	`241`	`}`
`241`	`242`
Original file line number	Diff line number	Diff line change
`@@ -118,13 +118,13 @@ public void testAllBlacklistSubcluster() throws YarnException {`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`
`121`		`- @Test`
`122`		`- public void testNullReservationContext() throws Exception {`
`123`		`- FederationRouterPolicy policy = ((FederationRouterPolicy) getPolicy());`
	`121`	`+ @Test`
	`122`	`+ public void testNullReservationContext() throws Exception {`
	`123`	`+ FederationRouterPolicy policy = ((FederationRouterPolicy) getPolicy());`
`124`	`124`
`125`		`- LambdaTestUtils.intercept(FederationPolicyException.class,`
`126`		`- "The ReservationSubmissionRequest cannot be null.",`
	`125`	`+ LambdaTestUtils.intercept(FederationPolicyException.class,`
	`126`	`+ "The ReservationSubmissionRequest cannot be null.",`
`127`	`127`	`() -> policy.getReservationHomeSubcluster(null));`
`128`		`- }`
	`128`	`+ }`
`129`	`129`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public void testIfNoSubclustersWithWeightOne() {`
`133`	`133`	`fail();`
`134`	`134`	`} catch (YarnException ex) {`
`135`	`135`	`Assert.assertTrue(`
`136`		`- ex.getMessage().contains("Zero Active SubCluster with weight 1."));`
	`136`	`+ ex.getMessage().contains("Zero Active Subcluster with weight 1."));`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	`}`