YARN-11577. Fix CheckStyle.

apache · Oct 27, 2023 · 7c5610c · 7c5610c
1 parent 6fe1093
commit 7c5610c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.../main/java/org/apache/hadoop/yarn/server/router/webapp/DefaultRequestInterceptorREST.java b/.../main/java/org/apache/hadoop/yarn/server/router/webapp/DefaultRequestInterceptorREST.java
@@ -227,7 +227,7 @@ public AppActivitiesInfo getAppActivities(HttpServletRequest hsr,
     // time and appId are specified inside hsr
     return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
         AppActivitiesInfo.class, HTTPMethods.GET,
-        RMWSConsts.RM_WEB_SERVICE_PATH + "/scheduler/app-activities/" + appId,
+        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.SCHEDULER_APP_ACTIVITIES,
         null, null, getConf(), client);
   }
 

diff --git a/.../src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java b/.../src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java
@@ -995,6 +995,8 @@ private SubClusterInfo getNodeSubcluster(String nodeId) throws NotFoundException
     final Collection<SubClusterInfo> subClusters = federationFacade.getActiveSubClusters();
     final Map<SubClusterInfo, NodeInfo> results = getNode(subClusters, nodeId);
 
+    LOG.info("results:{}", results);
+
     SubClusterInfo subcluster = null;
     NodeInfo nodeInfo = null;
     for (Entry<SubClusterInfo, NodeInfo> entry : results.entrySet()) {
@@ -1384,7 +1386,7 @@ public ActivitiesInfo getActivities(HttpServletRequest hsr, String nodeId,
     try {
       // Check the parameters to ensure that the parameters are not empty
       Validate.checkNotNullAndNotEmpty(nodeId, "nodeId");
-      // Validate.checkNotNullAndNotEmpty(groupBy, "groupBy");
+      Validate.checkNotNullAndNotEmpty(groupBy, "groupBy");
 
       // Query SubClusterInfo according to id,
       // if the nodeId cannot get SubClusterInfo, an exception will be thrown directly.
@@ -1427,7 +1429,7 @@ public BulkActivitiesInfo getBulkActivities(HttpServletRequest hsr,
       String groupBy, int activitiesCount) throws InterruptedException {
     try {
       // Step1. Check the parameters to ensure that the parameters are not empty
-      // Validate.checkNotNullAndNotEmpty(groupBy, "groupBy");
+      Validate.checkNotNullAndNotEmpty(groupBy, "groupBy");
       Validate.checkNotNegative(activitiesCount, "activitiesCount");
 
       // Step2. Call the interface of subCluster concurrently and get the returned result.

diff --git a/...r-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServices.java b/...r-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServices.java
@@ -543,6 +543,7 @@ public Response replaceLabelsOnNode(
       @QueryParam(RMWSConsts.LABELS) Set<String> newNodeLabelsName,
       @Context HttpServletRequest hsr,
       @PathParam(RMWSConsts.NODEID) String nodeId) throws Exception {
+    LOG.info("xxxx ::::: newNodeLabelsName = {}", newNodeLabelsName);
     init();
     RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
     return pipeline.getRootInterceptor().replaceLabelsOnNode(newNodeLabelsName,