diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java index 885d7d6..af32785 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java @@ -343,15 +343,28 @@ public static Priority newPriority(int p) { return priority; } + public static ResourceRequest newAMResourceRequest(Priority priority, + String hostName, Resource capability) { + return newResourceRequest(priority, hostName, capability, 1, + ExecutionTypeRequest.newInstance(ExecutionType.GUARANTEED, true)); + } + public static ResourceRequest newResourceRequest(Priority priority, String hostName, Resource capability, int numContainers) { + return newResourceRequest(priority, hostName, capability, + numContainers, ExecutionTypeRequest.newInstance()); + } + + public static ResourceRequest newResourceRequest(Priority priority, + String hostName, Resource capability, int numContainers, + ExecutionTypeRequest executionTypeRequest) { ResourceRequest request = recordFactory .newRecordInstance(ResourceRequest.class); request.setPriority(priority); request.setResourceName(hostName); request.setCapability(capability); request.setNumContainers(numContainers); - request.setExecutionTypeRequest(ExecutionTypeRequest.newInstance()); + request.setExecutionTypeRequest(executionTypeRequest); return request; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/utils/TestBuilderUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/utils/TestBuilderUtils.java new file mode 100644 index 0000000..4d5ab79 --- /dev/null +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/utils/TestBuilderUtils.java @@ -0,0 +1,54 @@ +/** + * 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.utils; + +import org.apache.hadoop.yarn.api.records.ExecutionType; +import org.apache.hadoop.yarn.api.records.ExecutionTypeRequest; +import org.apache.hadoop.yarn.api.records.Priority; +import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.api.records.ResourceRequest; +import org.junit.Assert; +import org.junit.Test; + +/** + * Unit tests for BuilderUtils. + */ +public class TestBuilderUtils { + @Test + public void testNewAMResourceRequest() { + final Priority priority = Priority.newInstance(0); + final String hostName = "ResourceA"; + final Resource capacity = Resource.newInstance(1024, 1); + + ResourceRequest resourceRequest = + BuilderUtils.newAMResourceRequest(priority, hostName, capacity); + + Assert.assertEquals("unexpected priority", priority, + resourceRequest.getPriority()); + Assert.assertEquals("unexpected host name", hostName, + resourceRequest.getResourceName()); + Assert.assertEquals("unexpected capacity", capacity, + resourceRequest.getCapability()); + Assert.assertEquals("unexpected number of containers", 1, + resourceRequest.getNumContainers()); + Assert.assertEquals("unexpected execution type", + ExecutionTypeRequest.newInstance(ExecutionType.GUARANTEED, true), + resourceRequest.getExecutionTypeRequest()); + } +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java index d042590..3c1d7ad 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java @@ -459,8 +459,8 @@ private RMAppImpl createAndPopulateNewRMApp( if (amReqs == null || amReqs.isEmpty()) { if (submissionContext.getResource() != null) { amReqs = Collections.singletonList(BuilderUtils - .newResourceRequest(RMAppAttemptImpl.AM_CONTAINER_PRIORITY, - ResourceRequest.ANY, submissionContext.getResource(), 1)); + .newAMResourceRequest(RMAppAttemptImpl.AM_CONTAINER_PRIORITY, + ResourceRequest.ANY, submissionContext.getResource())); } else { throw new InvalidResourceRequestException("Invalid resource request, " + "no resources requested"); @@ -491,7 +491,7 @@ private RMAppImpl createAndPopulateNewRMApp( for (ResourceRequest amReq : amReqs) { amReq.setCapability(anyReq.getCapability()); amReq.setExecutionTypeRequest( - ExecutionTypeRequest.newInstance(ExecutionType.GUARANTEED)); + ExecutionTypeRequest.newInstance(ExecutionType.GUARANTEED, true)); amReq.setNumContainers(1); amReq.setPriority(RMAppAttemptImpl.AM_CONTAINER_PRIORITY); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java index 8179321..1e8a64d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java @@ -536,15 +536,45 @@ protected void setupDispatcher(RMContext rmContext, Configuration conf) { public void testRMAppSubmitAMContainerResourceRequests() throws Exception { asContext.setResource(Resources.createResource(1024)); asContext.setAMContainerResourceRequest( - ResourceRequest.newInstance(Priority.newInstance(0), - ResourceRequest.ANY, Resources.createResource(1024), 1, true)); + ResourceRequest.newBuilder().priority(Priority.newInstance(0)) + .resourceName(ResourceRequest.ANY) + .capability(Resources.createResource(1024)) + .numContainers(1) + .relaxLocality(true) + .executionTypeRequest(ExecutionTypeRequest.newInstance( + ExecutionType.GUARANTEED, true)) + .build()); List reqs = new ArrayList<>(); - reqs.add(ResourceRequest.newInstance(Priority.newInstance(0), - ResourceRequest.ANY, Resources.createResource(1025), 1, false)); - reqs.add(ResourceRequest.newInstance(Priority.newInstance(0), - "/rack", Resources.createResource(1025), 1, false)); - reqs.add(ResourceRequest.newInstance(Priority.newInstance(0), - "/rack/node", Resources.createResource(1025), 1, true)); + reqs.add( + ResourceRequest.newBuilder().priority(Priority.newInstance(0)) + .resourceName(ResourceRequest.ANY) + .capability(Resources.createResource(1025)) + .numContainers(1) + .relaxLocality(false) + .executionTypeRequest(ExecutionTypeRequest.newInstance( + ExecutionType.GUARANTEED, true)) + .build() + ); + reqs.add( + ResourceRequest.newBuilder().priority(Priority.newInstance(0)) + .resourceName("/rack") + .capability(Resources.createResource(1025)) + .numContainers(1) + .relaxLocality(false) + .executionTypeRequest(ExecutionTypeRequest.newInstance( + ExecutionType.GUARANTEED, true)) + .build() + ); + reqs.add( + ResourceRequest.newBuilder().priority(Priority.newInstance(0)) + .resourceName("/rack/node") + .capability(Resources.createResource(1025)) + .numContainers(1) + .relaxLocality(true) + .executionTypeRequest(ExecutionTypeRequest.newInstance( + ExecutionType.GUARANTEED, true)) + .build() + ); asContext.setAMContainerResourceRequests(cloneResourceRequests(reqs)); // getAMContainerResourceRequest uses the first entry of // getAMContainerResourceRequests @@ -565,8 +595,14 @@ public void testRMAppSubmitAMContainerResourceRequest() throws Exception { asContext.setResource(Resources.createResource(1024)); asContext.setAMContainerResourceRequests(null); ResourceRequest req = - ResourceRequest.newInstance(Priority.newInstance(0), - ResourceRequest.ANY, Resources.createResource(1025), 1, true); + ResourceRequest.newBuilder().priority(Priority.newInstance(0)) + .resourceName(ResourceRequest.ANY) + .capability(Resources.createResource(1025)) + .numContainers(1) + .relaxLocality(true) + .executionTypeRequest(ExecutionTypeRequest.newInstance( + ExecutionType.GUARANTEED, true)) + .build(); asContext.setAMContainerResourceRequest(cloneResourceRequest(req)); // getAMContainerResourceRequests uses a singleton list of // getAMContainerResourceRequest @@ -587,8 +623,16 @@ public void testRMAppSubmitResource() throws Exception { RMApp app = testRMAppSubmit(); // setResource Assert.assertEquals(Collections.singletonList( - ResourceRequest.newInstance(RMAppAttemptImpl.AM_CONTAINER_PRIORITY, - ResourceRequest.ANY, Resources.createResource(1024), 1, true, "")), + ResourceRequest.newBuilder() + .priority(RMAppAttemptImpl.AM_CONTAINER_PRIORITY) + .resourceName(ResourceRequest.ANY) + .capability(Resources.createResource(1024)) + .numContainers(1) + .relaxLocality(true) + .nodeLabelExpression("") + .executionTypeRequest(ExecutionTypeRequest.newInstance( + ExecutionType.GUARANTEED, true)) + .build()), app.getAMResourceRequests()); } @@ -628,7 +672,7 @@ public void testRMAppSubmitAMContainerResourceRequestsDisagree() for (ResourceRequest req : reqs) { req.setCapability(anyReq.getCapability()); req.setExecutionTypeRequest( - ExecutionTypeRequest.newInstance(ExecutionType.GUARANTEED)); + ExecutionTypeRequest.newInstance(ExecutionType.GUARANTEED, true)); req.setNumContainers(1); req.setPriority(Priority.newInstance(0)); } @@ -938,7 +982,8 @@ private static ResourceRequest cloneResourceRequest(ResourceRequest req) { req.getNodeLabelExpression() != null ? new String(req.getNodeLabelExpression()) : null, ExecutionTypeRequest.newInstance( - req.getExecutionTypeRequest().getExecutionType())); + req.getExecutionTypeRequest().getExecutionType(), + req.getExecutionTypeRequest().getEnforceExecutionType())); } private static List cloneResourceRequests(