YARN-11275. Fix CheckStyle.

apache · Aug 24, 2022 · 46f8154 · 46f8154
1 parent e7fdf27
commit 46f8154
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java b/...server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java
@@ -453,13 +453,21 @@ public void drainUAMHeartbeats() {
     }
   }
 
+  /**
+   * Complete FinishApplicationMaster interface calls in batches.
+   *
+   * @param request FinishApplicationMasterRequest
+   * @param appId application Id
+   * @return Returns the Map map,
+   *         the key is subClusterId, the value is FinishApplicationMasterResponse
+   */
   public Map<String, FinishApplicationMasterResponse> batchFinishApplicationMaster(
       FinishApplicationMasterRequest request, String appId) {
 
     Map<String, FinishApplicationMasterResponse> responseMap = new HashMap<>();
     Set<String> subClusterIds = this.unmanagedAppMasterMap.keySet();
 
-    if (subClusterIds.size() > 0) {
+    if (subClusterIds != null && !subClusterIds.isEmpty()) {
       ExecutorCompletionService<Map<String, FinishApplicationMasterResponse>> finishAppService =
           new ExecutorCompletionService<>(this.threadpool);
       LOG.info("Sending finish application request to {} sub-cluster RMs", subClusterIds.size());

diff --git a/...t/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestFederationInterceptor.java b/...t/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestFederationInterceptor.java
@@ -1006,7 +1006,7 @@ public void testBatchFinishApplicationMaster() throws IOException, InterruptedEx
       List<Container> containers =
           getContainersAndAssert(numberOfContainers, numberOfContainers * 2);
       Assert.assertEquals(2, interceptor.getUnmanagedAMPoolSize());
-      Assert.assertEquals(numberOfContainers, containers.size());
+      Assert.assertEquals(numberOfContainers * 2, containers.size());
 
       // Finish the application
       FinishApplicationMasterRequest finishReq =
@@ -1018,7 +1018,7 @@ public void testBatchFinishApplicationMaster() throws IOException, InterruptedEx
       FinishApplicationMasterResponse finshResponse =
           interceptor.finishApplicationMaster(finishReq);
       Assert.assertNotNull(finshResponse);
-      Assert.assertEquals(true, finshResponse.getIsUnregistered());
+      Assert.assertTrue(finshResponse.getIsUnregistered());
 
       return null;
     });