diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java index b61072d..a547ee7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java @@ -54,7 +54,7 @@ public JAXBContextResolver() throws Exception { CapacitySchedulerQueueInfoList.class, ResourceInfo.class, UsersInfo.class, UserInfo.class, ApplicationStatisticsInfo.class, StatisticsItemInfo.class, CapacitySchedulerHealthInfo.class, - FairSchedulerQueueInfoList.class}; + FairSchedulerQueueInfoList.class, NodeLabelStatsInfo.class}; // these dao classes need root unwrapping final Class[] rootUnwrappedTypes = { NewApplication.class, ApplicationSubmissionContextInfo.class, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java index 50c450b..9e73394 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java @@ -151,6 +151,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewApplication; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelStatsInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntry; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList; @@ -187,6 +188,7 @@ import org.apache.hadoop.yarn.webapp.util.WebAppUtils; import com.google.common.annotations.VisibleForTesting; +import com.google.common.io.Resources; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -995,7 +997,41 @@ public Response removeFromCluserNodeLabels( return Response.status(Status.OK).build(); } - + + @GET + @Path("/label-stats/{label}") + @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) + public NodeLabelStatsInfo getLabelStats(@PathParam("label") String label, + @Context HttpServletRequest hsr) throws IOException, YarnException { + init(); + + NodeLabelStatsInfo nlsi = null; + Map> labelsToNodeId = null; + Set labels = new HashSet(); + + if (label == null) { + throw new YarnException("Requested node label shouldn't be null"); + } + + labels.add(label); + labelsToNodeId = rm.getRMContext().getNodeLabelManager() + .getLabelsInfoToNodes(labels); + + Set nodes = null; + ArrayList nodeIdStrList = new ArrayList(); + if ((nodes = labelsToNodeId.get(NodeLabel.newInstance(label))) != null) { + for (NodeId nodeId : nodes) { + nodeIdStrList.add(nodeId.toString()); + } + } + + Resource labelResource = rm.getRMContext().getNodeLabelManager() + .getResourceByLabel(label, Resource.newInstance(0, 0)); + nlsi = new NodeLabelStatsInfo(label, nodeIdStrList, labelResource); + + return nlsi; + } + @GET @Path("/nodes/{nodeId}/get-labels") @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeLabelStatsInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeLabelStatsInfo.java new file mode 100644 index 0000000..9646441 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeLabelStatsInfo.java @@ -0,0 +1,67 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.webapp.dao; + +import java.util.ArrayList; +import java.util.Collections; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; + +import org.apache.hadoop.yarn.api.records.Resource; + +@XmlRootElement(name = "labelstats") +@XmlAccessorType(XmlAccessType.FIELD) +public class NodeLabelStatsInfo { + + protected String labelName; + protected ArrayList nodeList = new ArrayList(); + protected long totalResourceMem; + protected long totalResourceCores; + + public NodeLabelStatsInfo() { + // JAXB needs this + } + + public NodeLabelStatsInfo(String labelName, ArrayList nodesList, + Resource partitionResource) { + this.labelName = labelName; + this.nodeList.addAll(nodesList); + Collections.sort(this.nodeList); + this.totalResourceMem = partitionResource.getMemory(); + this.totalResourceCores = partitionResource.getVirtualCores(); + } + + public ArrayList getNodeList() { + return nodeList; + } + + public long getTotalResourceMem() { + return totalResourceMem; + } + + public long getTotalResourceCores() { + return totalResourceCores; + } + + public String getLabelName() { + return labelName; + } +} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java index 7a72cb1..dcf7cd9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java @@ -34,6 +34,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo; @@ -671,6 +672,80 @@ public void testLabelInvalidRemove() validateJsonExceptionContent(response, expectedmessage); } + @Test + public void testSingleNodeLabelStatsDefault() throws JSONException, Exception { + testSingleNodeLabelStats("a", MediaType.APPLICATION_JSON); + } + + public void testSingleNodeLabelStats(String label, String media) + throws JSONException, Exception { + WebResource r = resource(); + ClientResponse response; + // Add a label + NodeLabelsInfo nlsifo = new NodeLabelsInfo(); + nlsifo.getNodeLabelsInfo().add(new NodeLabelInfo("a")); + response = r.path("ws").path("v1").path("cluster").path("add-node-labels") + .queryParam("user.name", userName).accept(MediaType.APPLICATION_JSON) + .entity(toJson(nlsifo, NodeLabelsInfo.class), + MediaType.APPLICATION_JSON) + .post(ClientResponse.class); + + // Verify + response = r.path("ws").path("v1").path("cluster").path("get-node-labels") + .queryParam("user.name", userName).accept(MediaType.APPLICATION_JSON) + .get(ClientResponse.class); + assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); + nlsifo = response.getEntity(NodeLabelsInfo.class); + assertEquals(1, nlsifo.getNodeLabels().size()); + for (NodeLabelInfo nl : nlsifo.getNodeLabelsInfo()) { + assertEquals("a", nl.getName()); + assertTrue(nl.getExclusivity()); + } + + // Add another + nlsifo = new NodeLabelsInfo(); + nlsifo.getNodeLabelsInfo().add(new NodeLabelInfo("b", false)); + response = r.path("ws").path("v1").path("cluster").path("add-node-labels") + .queryParam("user.name", userName).accept(MediaType.APPLICATION_JSON) + .entity(toJson(nlsifo, NodeLabelsInfo.class), + MediaType.APPLICATION_JSON) + .post(ClientResponse.class); + + // Verify + response = r.path("ws").path("v1").path("cluster").path("get-node-labels") + .queryParam("user.name", userName).accept(MediaType.APPLICATION_JSON) + .get(ClientResponse.class); + assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); + nlsifo = response.getEntity(NodeLabelsInfo.class); + assertEquals(2, nlsifo.getNodeLabels().size()); + // Verify exclusivity for 'y' as false + for (NodeLabelInfo nl : nlsifo.getNodeLabelsInfo()) { + if (nl.getName().equals("b")) { + assertFalse(nl.getExclusivity()); + } + } + + // Add labels to a node + MultivaluedMapImpl params = new MultivaluedMapImpl(); + params.add("labels", "a"); + response = r.path("ws").path("v1").path("cluster").path("nodes") + .path("nid:0").path("replace-labels").queryParam("user.name", userName) + .queryParams(params).accept(MediaType.APPLICATION_JSON) + .post(ClientResponse.class); + LOG.info("posted node nodelabel"); + + response = r.path("ws").path("v1").path("cluster").path("label-stats") + .path(label).queryParam("user.name", userName).accept(media) + .get(ClientResponse.class); + + assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); + JSONObject json = response.getEntity(JSONObject.class); + assertEquals("incorrect number of elements", 1, json.length()); + JSONObject info = json.getJSONObject("labelstats"); + assertEquals("incorrect number of elements", 4, info.length()); + // verifyNodeInfo(info, nm); + } + @SuppressWarnings("rawtypes") private String toJson(Object nsli, Class klass) throws Exception { StringWriter sw = new StringWriter(); -- 2.7.4 (Apple Git-66)