YARN-11226. Fix CheckStyle.

apache · Sep 22, 2022 · 27d310c · 27d310c
1 parent 7617b48
commit 27d310c
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 55 deletions.
diff --git a/...rn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterServerUtil.java b/...rn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterServerUtil.java
@@ -292,7 +292,7 @@ public static void updateReservationHomeSubCluster(FederationStateStoreFacade fe
    * @param reservationId reservationId
    * @return true - exist, false - not exist
    */
-  public static Boolean existsReservationHomeSubCluster(FederationStateStoreFacade federationFacade,
+  public static boolean existsReservationHomeSubCluster(FederationStateStoreFacade federationFacade,
       ReservationId reservationId) {
     try {
       SubClusterId subClusterId = federationFacade.getReservationHomeSubCluster(reservationId);
@@ -338,8 +338,8 @@ public static ReservationDefinition convertReservationDefinition(
     ReservationRequestInterpreter[] values = ReservationRequestInterpreter.values();
     ReservationRequestInterpreter reservationRequestInterpreter =
         values[reservationRequestsInfo.getReservationRequestsInterpreter()];
-    ReservationRequests reservationRequests =
-        ReservationRequests.newInstance(reservationRequestList, reservationRequestInterpreter);
+    ReservationRequests reservationRequests = ReservationRequests.newInstance(
+        reservationRequestList, reservationRequestInterpreter);
 
     ReservationDefinition definition =
         ReservationDefinition.newInstance(

diff --git a/...t/java/org/apache/hadoop/yarn/server/router/webapp/MockDefaultRequestInterceptorREST.java b/...t/java/org/apache/hadoop/yarn/server/router/webapp/MockDefaultRequestInterceptorREST.java
@@ -939,57 +939,56 @@ public Response updateReservation(ReservationUpdateRequestInfo resContext,
     return Response.status(Status.OK).entity(resRespInfo).build();
   }
 
-  private void updateReservation(ReservationUpdateRequestInfo resContext) {
-    try {
+  private void updateReservation(ReservationUpdateRequestInfo resContext) throws IOException {
 
-      if (resContext == null) {
-        throw new BadRequestException("Input ReservationSubmissionContext should not be null");
-      }
+    if (resContext == null) {
+      throw new BadRequestException("Input ReservationSubmissionContext should not be null");
+    }
 
-      ReservationDefinitionInfo resInfo = resContext.getReservationDefinition();
-      if (resInfo == null) {
-        throw new BadRequestException("Input ReservationDefinition should not be null");
-      }
+    ReservationDefinitionInfo resInfo = resContext.getReservationDefinition();
+    if (resInfo == null) {
+      throw new BadRequestException("Input ReservationDefinition should not be null");
+    }
 
-      ReservationRequestsInfo resReqsInfo = resInfo.getReservationRequests();
-      if (resReqsInfo == null || resReqsInfo.getReservationRequest() == null
-          || resReqsInfo.getReservationRequest().size() == 0) {
-        throw new BadRequestException("The ReservationDefinition should " +
-            "contain at least one ReservationRequest");
-      }
+    ReservationRequestsInfo resReqsInfo = resInfo.getReservationRequests();
+    if (resReqsInfo == null || resReqsInfo.getReservationRequest() == null
+        || resReqsInfo.getReservationRequest().isEmpty()) {
+       throw new BadRequestException("The ReservationDefinition should " +
+           "contain at least one ReservationRequest");
+    }
 
-      if (resContext.getReservationId() == null) {
-        throw new BadRequestException("Update operations must specify an existing ReservaitonId");
-      }
+    if (resContext.getReservationId() == null) {
+       throw new BadRequestException("Update operations must specify an existing ReservaitonId");
+    }
 
-      ReservationRequestInterpreter[] values = ReservationRequestInterpreter.values();
-      ReservationRequestInterpreter requestInterpreter =
-          values[resReqsInfo.getReservationRequestsInterpreter()];
-      List<ReservationRequest> list = new ArrayList<>();
-
-      for (ReservationRequestInfo resReqInfo : resReqsInfo.getReservationRequest()) {
-        ResourceInfo rInfo = resReqInfo.getCapability();
-        Resource capability = Resource.newInstance(rInfo.getMemorySize(), rInfo.getvCores());
-        int numContainers = resReqInfo.getNumContainers();
-        int minConcurrency = resReqInfo.getMinConcurrency();
-        long duration = resReqInfo.getDuration();
-        ReservationRequest rr =
-            ReservationRequest.newInstance(capability, numContainers, minConcurrency, duration);
-        list.add(rr);
-      }
+    ReservationRequestInterpreter[] values = ReservationRequestInterpreter.values();
+    ReservationRequestInterpreter requestInterpreter =
+        values[resReqsInfo.getReservationRequestsInterpreter()];
+    List<ReservationRequest> list = new ArrayList<>();
+
+    for (ReservationRequestInfo resReqInfo : resReqsInfo.getReservationRequest()) {
+       ResourceInfo rInfo = resReqInfo.getCapability();
+       Resource capability = Resource.newInstance(rInfo.getMemorySize(), rInfo.getvCores());
+       int numContainers = resReqInfo.getNumContainers();
+       int minConcurrency = resReqInfo.getMinConcurrency();
+       long duration = resReqInfo.getDuration();
+       ReservationRequest rr = ReservationRequest.newInstance(
+           capability, numContainers, minConcurrency, duration);
+       list.add(rr);
+    }
 
-      ReservationRequests reqs = ReservationRequests.newInstance(list, requestInterpreter);
-      ReservationDefinition rDef = ReservationDefinition.newInstance(
-          resInfo.getArrival(), resInfo.getDeadline(), reqs,
-          resInfo.getReservationName(), resInfo.getRecurrenceExpression(),
-          Priority.newInstance(resInfo.getPriority()));
-      ReservationUpdateRequest request = ReservationUpdateRequest.newInstance(
-          rDef, ReservationId.parseReservationId(resContext.getReservationId()));
+    ReservationRequests reqs = ReservationRequests.newInstance(list, requestInterpreter);
+    ReservationDefinition rDef = ReservationDefinition.newInstance(
+        resInfo.getArrival(), resInfo.getDeadline(), reqs,
+        resInfo.getReservationName(), resInfo.getRecurrenceExpression(),
+        Priority.newInstance(resInfo.getPriority()));
+    ReservationUpdateRequest request = ReservationUpdateRequest.newInstance(
+        rDef, ReservationId.parseReservationId(resContext.getReservationId()));
 
-      ClientRMService clientService = mockRM.getClientRMService();
+    ClientRMService clientService = mockRM.getClientRMService();
+    try {
       clientService.updateReservation(request);
-
-    } catch (Exception ex) {
+    } catch (YarnException ex) {
       throw new RuntimeException(ex);
     }
   }

diff --git a/.../test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorREST.java b/.../test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorREST.java
@@ -1332,14 +1332,14 @@ public static ReservationSubmissionRequest createSimpleReservationRequest(
       ReservationId reservationId, int numContainers, long arrival,
       long deadline, long duration, int memory, int vcore) {
     // create a request with a single atomic ask
-    ReservationRequest r = ReservationRequest
-        .newInstance(Resource.newInstance(memory, vcore), numContainers, 1, duration);
+    ReservationRequest r = ReservationRequest.newInstance(
+        Resource.newInstance(memory, vcore), numContainers, 1, duration);
     ReservationRequests reqs = ReservationRequests.newInstance(
         Collections.singletonList(r), ReservationRequestInterpreter.R_ALL);
-    ReservationDefinition rDef = ReservationDefinition.newInstance(arrival,
-        deadline, reqs, "testClientRMService#reservation", "0", Priority.UNDEFINED);
-    ReservationSubmissionRequest request = ReservationSubmissionRequest
-        .newInstance(rDef, QUEUE_DEDICATED_FULL, reservationId);
+    ReservationDefinition rDef = ReservationDefinition.newInstance(
+        arrival, deadline, reqs, "testClientRMService#reservation", "0", Priority.UNDEFINED);
+    ReservationSubmissionRequest request = ReservationSubmissionRequest.newInstance(
+        rDef, QUEUE_DEDICATED_FULL, reservationId);
     return request;
   }
 }
diff --git a/...t/java/org/apache/hadoop/yarn/server/router/webapp/TestableFederationInterceptorREST.java b/...t/java/org/apache/hadoop/yarn/server/router/webapp/TestableFederationInterceptorREST.java
@@ -71,10 +71,12 @@ protected void registerBadSubCluster(SubClusterId badSC) {
   }
 
   protected void setupResourceManager() throws IOException {
+
+    if (mockRM != null) {
+      return;
+    }
+
     try {
-      if (mockRM != null) {
-        return;
-      }
 
       DefaultMetricsSystem.setMiniClusterMode(true);
       CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration();
@@ -111,6 +113,7 @@ protected void setupResourceManager() throws IOException {
   public void shutdown() {
     if (mockRM != null) {
       mockRM.stop();
+      mockRM = null;
     }
     super.shutdown();
   }