Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-11050 (#3805)

This commit is contained in:
Szilard Nemeth 2021-12-18 04:52:03 +01:00 committed by GitHub
parent 4483607a4e
commit 07141426e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWSConsts.java
View File

@ -126,7 +126,7 @@ public final class RMWSConsts {
/** Path for {@code RMWebServiceProtocol#addToClusterNodeLabels}. */ /** Path for {@code RMWebServiceProtocol#addToClusterNodeLabels}. */
public static final String ADD_NODE_LABELS = "/add-node-labels"; public static final String ADD_NODE_LABELS = "/add-node-labels";
/** Path for {@code RMWebServiceProtocol#removeFromCluserNodeLabels}. */ /** Path for {@code RMWebServiceProtocol#removeFromClusterNodeLabels}. */
public static final String REMOVE_NODE_LABELS = "/remove-node-labels"; public static final String REMOVE_NODE_LABELS = "/remove-node-labels";
/** Path for {@code RMWebServiceProtocol#getLabelsOnNode}. */ /** Path for {@code RMWebServiceProtocol#getLabelsOnNode}. */

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServiceProtocol.java
View File

@ -398,7 +398,7 @@ Response addToClusterNodeLabels(NodeLabelsInfo newNodeLabels,
* @return Response containing the status code * @return Response containing the status code
* @throws Exception in case of bad request * @throws Exception in case of bad request
*/ */
Response removeFromCluserNodeLabels(Set<String> oldNodeLabels, Response removeFromClusterNodeLabels(Set<String> oldNodeLabels,
HttpServletRequest hsr) throws Exception; HttpServletRequest hsr) throws Exception;
/** /**

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java
View File

@ -1435,7 +1435,7 @@ public Response addToClusterNodeLabels(final NodeLabelsInfo newNodeLabels,
@Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8, @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 }) MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
@Override @Override
public Response removeFromCluserNodeLabels( public Response removeFromClusterNodeLabels(
@QueryParam(RMWSConsts.LABELS) Set<String> oldNodeLabels, @QueryParam(RMWSConsts.LABELS) Set<String> oldNodeLabels,
@Context HttpServletRequest hsr) throws Exception { @Context HttpServletRequest hsr) throws Exception {
UserGroupInformation callerUGI = getCallerUserGroupInformation(hsr, true); UserGroupInformation callerUGI = getCallerUserGroupInformation(hsr, true);

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/DefaultRequestInterceptorREST.java
View File

@ -330,7 +330,7 @@ public Response addToClusterNodeLabels(NodeLabelsInfo newNodeLabels,
} }
@Override @Override
public Response removeFromCluserNodeLabels(Set<String> oldNodeLabels, public Response removeFromClusterNodeLabels(Set<String> oldNodeLabels,
HttpServletRequest hsr) throws Exception { HttpServletRequest hsr) throws Exception {
// oldNodeLabels is specified inside hsr // oldNodeLabels is specified inside hsr
return RouterWebServiceUtil.genericForward(webAppAddress, hsr, return RouterWebServiceUtil.genericForward(webAppAddress, hsr,

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java
View File

@ -1205,7 +1205,7 @@ public Response addToClusterNodeLabels(NodeLabelsInfo newNodeLabels,
} }
@Override @Override
public Response removeFromCluserNodeLabels(Set<String> oldNodeLabels, public Response removeFromClusterNodeLabels(Set<String> oldNodeLabels,
HttpServletRequest hsr) throws Exception { HttpServletRequest hsr) throws Exception {
throw new NotImplementedException("Code is not implemented"); throw new NotImplementedException("Code is not implemented");
} }

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServices.java
View File

@ -637,13 +637,13 @@ public Response addToClusterNodeLabels(NodeLabelsInfo newNodeLabels,
@Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8, @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 }) MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
@Override @Override
public Response removeFromCluserNodeLabels( public Response removeFromClusterNodeLabels(
@QueryParam(RMWSConsts.LABELS) Set<String> oldNodeLabels, @QueryParam(RMWSConsts.LABELS) Set<String> oldNodeLabels,
@Context HttpServletRequest hsr) throws Exception { @Context HttpServletRequest hsr) throws Exception {
init(); init();
RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr); RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
return pipeline.getRootInterceptor() return pipeline.getRootInterceptor()
.removeFromCluserNodeLabels(oldNodeLabels, hsr); .removeFromClusterNodeLabels(oldNodeLabels, hsr);
} }
@GET @GET

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/BaseRouterWebServicesTest.java
View File

@ -245,8 +245,8 @@ protected Response addToClusterNodeLabels(String user) throws Exception {
null, createHttpServletRequest(user)); null, createHttpServletRequest(user));
} }
protected Response removeFromCluserNodeLabels(String user) throws Exception { protected Response removeFromClusterNodeLabels(String user) throws Exception {
return routerWebService.removeFromCluserNodeLabels( return routerWebService.removeFromClusterNodeLabels(
null, createHttpServletRequest(user)); null, createHttpServletRequest(user));
} }

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockRESTRequestInterceptor.java
View File

@ -215,7 +215,7 @@ public Response addToClusterNodeLabels(NodeLabelsInfo newNodeLabels,
} }
@Override @Override
public Response removeFromCluserNodeLabels(Set<String> oldNodeLabels, public Response removeFromClusterNodeLabels(Set<String> oldNodeLabels,
HttpServletRequest hsr) throws Exception { HttpServletRequest hsr) throws Exception {
return Response.status(Status.OK).build(); return Response.status(Status.OK).build();
} }

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/PassThroughRESTRequestInterceptor.java
View File

@ -248,9 +248,9 @@ public Response addToClusterNodeLabels(NodeLabelsInfo newNodeLabels,
} }
@Override @Override
public Response removeFromCluserNodeLabels(Set<String> oldNodeLabels, public Response removeFromClusterNodeLabels(Set<String> oldNodeLabels,
HttpServletRequest hsr) throws Exception { HttpServletRequest hsr) throws Exception {
return getNextInterceptor().removeFromCluserNodeLabels(oldNodeLabels, hsr); return getNextInterceptor().removeFromClusterNodeLabels(oldNodeLabels, hsr);
} }
@Override @Override

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServices.java
View File

@ -132,7 +132,7 @@ public void testRouterWebServicesE2E() throws Exception {
Response response4 = addToClusterNodeLabels(user); Response response4 = addToClusterNodeLabels(user);
Assert.assertNotNull(response4); Assert.assertNotNull(response4);
Response response5 = removeFromCluserNodeLabels(user); Response response5 = removeFromClusterNodeLabels(user);
Assert.assertNotNull(response5); Assert.assertNotNull(response5);
NodeLabelsInfo nodeLabelsInfo2 = getLabelsOnNode(user); NodeLabelsInfo nodeLabelsInfo2 = getLabelsOnNode(user);

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServicesREST.java
View File

@ -1203,10 +1203,10 @@ public void testAddToClusterNodeLabelsXML() throws Exception {
/** /**
* This test validates the correctness of * This test validates the correctness of
* {@link RMWebServiceProtocol#removeFromCluserNodeLabels()} inside Router. * {@link RMWebServiceProtocol#removeFromClusterNodeLabels} inside Router.
*/ */
@Test(timeout = 2000) @Test(timeout = 2000)
public void testRemoveFromCluserNodeLabelsXML() public void testRemoveFromClusterNodeLabelsXML()
throws Exception { throws Exception {
// Test with a wrong HTTP method // Test with a wrong HTTP method