Skip to content

Commit d8f8e22

Browse files
slfan1989slfan1989
committed
YARN-11577. Fix CheckStyle.
1 parent 2dc75de commit d8f8e22

3 files changed

Lines changed: 85 additions & 5 deletions

File tree

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestFederationSubCluster.java‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
4242
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
4343
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
44+
import org.apache.hadoop.yarn.server.router.webapp.HTTPMethods;
4445
import org.apache.hadoop.yarn.server.router.webapp.JavaProcess;
4546
import org.slf4j.Logger;
4647
import org.slf4j.LoggerFactory;
@@ -55,6 +56,7 @@
5556
import java.util.regex.Pattern;
5657

5758
import static javax.servlet.http.HttpServletResponse.SC_OK;
59+
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
5860
import static javax.ws.rs.core.MediaType.APPLICATION_XML;
5961
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES;
6062
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RM_WEB_SERVICE_PATH;
@@ -215,6 +217,48 @@ public static <T> T performGetCalls(final String routerAddress, final String pat
215217
});
216218
}
217219

220+
public static ClientResponse performCall(final String routerAddress, final String webAddress,
221+
final String queryKey, final String queryValue, final Object context,
222+
final HTTPMethods method) throws IOException, InterruptedException {
223+
224+
return UserGroupInformation.createRemoteUser(userName)
225+
.doAs((PrivilegedExceptionAction<ClientResponse>) () -> {
226+
Client clientToRouter = Client.create();
227+
WebResource toRouter = clientToRouter.resource(routerAddress).path(webAddress);
228+
229+
WebResource toRouterWR = toRouter;
230+
if (queryKey != null && queryValue != null) {
231+
toRouterWR = toRouterWR.queryParam(queryKey, queryValue);
232+
}
233+
234+
WebResource.Builder builder;
235+
if (context != null) {
236+
builder = toRouterWR.entity(context, APPLICATION_JSON);
237+
builder = builder.accept(APPLICATION_JSON);
238+
} else {
239+
builder = toRouter.accept(APPLICATION_JSON);
240+
}
241+
242+
ClientResponse response = null;
243+
244+
switch (method) {
245+
case DELETE:
246+
response = builder.delete(ClientResponse.class);
247+
break;
248+
case POST:
249+
response = builder.post(ClientResponse.class);
250+
break;
251+
case PUT:
252+
response = builder.put(ClientResponse.class);
253+
break;
254+
default:
255+
break;
256+
}
257+
258+
return response;
259+
});
260+
}
261+
218262
public static String getNodeId(String rmAddress) {
219263
Client clientToRM = Client.create();
220264
clientToRM.setConnectTimeout(3000);

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/capacity/TestYarnFederationWithCapacityScheduler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ public void testClusterUserInfo() throws Exception {
126126

127127
@Test
128128
public void testMetricsInfo() throws Exception {
129-
// It takes time to start the sub-cluster. We need to wait for the sub-cluster to be completely started,
129+
// It takes time to start the sub-cluster.
130+
// We need to wait for the sub-cluster to be completely started,
130131
// so we need to set the waiting time.
131132
// The resources of the two sub-clusters we registered are 24C and 12G,
132133
// so the resources that the Router should collect are 48C and 24G.

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/fair/TestYarnFederationWithFairScheduler.java‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,15 @@
2323
import org.apache.hadoop.yarn.api.records.Resource;
2424
import org.apache.hadoop.yarn.api.records.ResourceOption;
2525
import org.apache.hadoop.yarn.exceptions.YarnException;
26-
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.*;
26+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
27+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo;
28+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
29+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
30+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.FairSchedulerInfo;
31+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.FairSchedulerQueueInfo;
32+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
33+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
34+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo;
2735
import org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster;
2836
import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterInfo;
2937
import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterUserInfo;
@@ -39,11 +47,18 @@
3947
import java.util.Set;
4048
import java.util.concurrent.TimeoutException;
4149

42-
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.*;
50+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RM_WEB_SERVICE_PATH;
51+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.INFO;
52+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.CLUSTER_USER_INFO;
53+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.METRICS;
54+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.SCHEDULER;
55+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES;
56+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.STATES;
57+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES_NODEID;
58+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODE_RESOURCE;
4359
import static org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster.format;
4460
import static org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster.getNodeId;
4561
import static org.apache.hadoop.yarn.server.router.webapp.HTTPMethods.POST;
46-
import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode;
4762
import static org.junit.Assert.assertNotNull;
4863
import static org.junit.Assert.assertEquals;
4964
import static org.junit.Assert.assertTrue;
@@ -118,7 +133,8 @@ public void testClusterUserInfo() throws Exception {
118133

119134
@Test
120135
public void testMetricsInfo() throws Exception {
121-
// It takes time to start the sub-cluster. We need to wait for the sub-cluster to be completely started,
136+
// It takes time to start the sub-cluster.
137+
// We need to wait for the sub-cluster to be completely started,
122138
// so we need to set the waiting time.
123139
// The resources of the two sub-clusters we registered are 24C and 12G,
124140
// so the resources that the Router should collect are 48C and 24G.
@@ -220,5 +236,24 @@ public void testUpdateNodeResource() throws Exception {
220236
NodeInfo.class, null, null);
221237
assertEquals(4096, nodeInfo.getTotalResource().getMemorySize());
222238
assertEquals(8, nodeInfo.getTotalResource().getvCores());
239+
240+
Resource resource = Resource.newInstance(4096, 5);
241+
ResourceOptionInfo resourceOption = new ResourceOptionInfo(
242+
ResourceOption.newInstance(resource, 1000));
243+
ClientResponse routerResponse = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
244+
RM_WEB_SERVICE_PATH + format(NODE_RESOURCE, rm1NodeId),
245+
null, null, resourceOption, POST);
246+
JSONObject json = routerResponse.getEntity(JSONObject.class);
247+
JSONObject totalResource = json.getJSONObject("resourceInfo");
248+
assertEquals(resource.getMemorySize(), totalResource.getLong("memory"));
249+
assertEquals(resource.getVirtualCores(), totalResource.getLong("vCores"));
250+
251+
252+
// assert updated memory and cores
253+
NodeInfo nodeInfo1 = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
254+
RM_WEB_SERVICE_PATH + format(NODES_NODEID, rm1NodeId),
255+
NodeInfo.class, null, null);
256+
assertEquals(4096, nodeInfo1.getTotalResource().getMemorySize());
257+
assertEquals(5, nodeInfo1.getTotalResource().getvCores());
223258
}
224259
}

0 commit comments

Comments
 (0)