goiri commented on a change in pull request #3779: URL: https://github.com/apache/hadoop/pull/3779#discussion_r779427072
########## File path: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/TestContainerSchedulerOppContainersByResources.java ########## @@ -0,0 +1,260 @@ +/** + * 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.nodemanager.containermanager.scheduler; + +import org.apache.hadoop.fs.UnsupportedFileSystemException; +import org.apache.hadoop.test.GenericTestUtils; +import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList; +import org.apache.hadoop.yarn.api.protocolrecords.GetContainerStatusesRequest; +import org.apache.hadoop.yarn.api.protocolrecords.StartContainerRequest; +import org.apache.hadoop.yarn.api.protocolrecords.StartContainersRequest; +import org.apache.hadoop.yarn.api.records.ContainerId; +import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; +import org.apache.hadoop.yarn.api.records.ContainerStatus; +import org.apache.hadoop.yarn.api.records.ContainerSubState; +import org.apache.hadoop.yarn.api.records.ExecutionType; +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.nodemanager.containermanager.BaseContainerManagerTest; +import org.apache.hadoop.yarn.server.nodemanager.containermanager.BaseContainerSchedulerTest; +import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ContainerState; +import org.apache.hadoop.yarn.server.utils.BuilderUtils; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.concurrent.TimeoutException; + +/** + * Tests the behavior of {@link ContainerScheduler} when the max queue length + * is set to {@literal < 0} such that the NM only queues + * containers if there's enough resources on the node to start + * all queued containers. + */ +public class TestContainerSchedulerOppContainersByResources + extends BaseContainerSchedulerTest { + public TestContainerSchedulerOppContainersByResources() + throws UnsupportedFileSystemException { + } + + @Override + public void setup() throws IOException { + conf.set(YarnConfiguration.NM_OPPORTUNISTIC_CONTAINERS_QUEUE_POLICY, + OpportunisticContainersQueuePolicy.BY_RESOURCES.name()); + super.setup(); + } + + private static boolean isSuccessfulRun(final ContainerStatus containerStatus) { + final org.apache.hadoop.yarn.api.records.ContainerState state = + containerStatus.getState(); + final ContainerSubState subState = containerStatus.getContainerSubState(); + switch (subState) { + case RUNNING: + case COMPLETING: + case DONE: + if (subState == ContainerSubState.DONE) { + return state == + org.apache.hadoop.yarn.api.records.ContainerState.COMPLETE; + } + + return true; + default: + return false; + } + } + + private void verifyRunAndKilledContainers( + final List<ContainerId> statList, + final int numExpectedContainers, final Set<ContainerId> runContainers, + final Set<ContainerId> killedContainers) + throws TimeoutException, InterruptedException { + GenericTestUtils.waitFor( + () -> { + GetContainerStatusesRequest statRequest = + GetContainerStatusesRequest.newInstance(statList); + final List<ContainerStatus> containerStatuses; + try { + containerStatuses = containerManager + .getContainerStatuses(statRequest).getContainerStatuses(); + } catch (final Exception e) { + return false; + } + + if (numExpectedContainers != containerStatuses.size()) { + return false; + } + + for (final ContainerStatus status : containerStatuses) { + if (runContainers.contains(status.getContainerId())) { + if (!isSuccessfulRun(status)) { + return false; + } + } else if (killedContainers.contains(status.getContainerId())) { + if (!status.getDiagnostics() + .contains("Opportunistic container queue is full")) { + return false; + } + } else { + return false; + } + } + + return true; + }, 1000, 10000); + } + + /** + * Tests that newly arrived containers after the resources are filled up + * get killed and never get killed. + */ + @Test + public void testOpportunisticRunsWhenResourcesAvailable() throws Exception { + containerManager.start(); + List<StartContainerRequest> list = new ArrayList<>(); + final int numContainers = 8; + final int numContainersQueued = 4; + final Set<ContainerId> runContainers = new HashSet<>(); + final Set<ContainerId> killedContainers = new HashSet<>(); + + for (int i = 0; i < numContainers; i++) { + // OContainers that should be run + list.add(StartContainerRequest.newInstance( + recordFactory.newRecordInstance(ContainerLaunchContext.class), + createContainerToken(createContainerId(i), DUMMY_RM_IDENTIFIER, + context.getNodeId(), + user, BuilderUtils.newResource(512, 1), + context.getContainerTokenSecretManager(), null, + ExecutionType.OPPORTUNISTIC))); + } + + StartContainersRequest allRequests = + StartContainersRequest.newInstance(list); + containerManager.startContainers(allRequests); + + // Wait for containers to start + for (int i = 0; i < numContainersQueued; i++) { + final ContainerId containerId = createContainerId(i); + BaseContainerManagerTest + .waitForNMContainerState(containerManager, containerId, + ContainerState.RUNNING, 40); + runContainers.add(containerId); + } + + // Wait for containers to be killed + for (int i = numContainersQueued; i < numContainers; i++) { + final ContainerId containerId = createContainerId(i); + BaseContainerManagerTest + .waitForNMContainerState(containerManager, createContainerId(i), + ContainerState.DONE, 40); + killedContainers.add(containerId); + } + + Thread.sleep(5000); + + // Get container statuses. + List<ContainerId> statList = new ArrayList<>(); + for (int i = 0; i < numContainers; i++) { + statList.add(createContainerId(i)); + } + + verifyRunAndKilledContainers( + statList, numContainers, runContainers, killedContainers); + + ContainerScheduler containerScheduler = + containerManager.getContainerScheduler(); + Assert.assertEquals(0, + containerScheduler.getNumQueuedContainers()); + Assert.assertEquals(0, + containerScheduler.getNumQueuedGuaranteedContainers()); + Assert.assertEquals(0, + containerScheduler.getNumQueuedOpportunisticContainers()); + Assert.assertEquals(0, + metrics.getQueuedOpportunisticContainers()); + Assert.assertEquals(0, metrics.getQueuedGuaranteedContainers()); + } + + /** + * Sets the max queue length to negative such that the NM only queues + * containers if there's enough resources on the node to start + * all queued containers. + * Tests that newly arrived containers after the resources are filled up + * get killed and never get killed. + */ + @Test + public void testKillOpportunisticWhenNoResourcesAvailable() throws Exception { + containerManager.start(); + List<StartContainerRequest> list = new ArrayList<>(); + + // GContainer that takes up the whole node + list.add(StartContainerRequest.newInstance( + recordFactory.newRecordInstance(ContainerLaunchContext.class), + createContainerToken(createContainerId(0), DUMMY_RM_IDENTIFIER, + context.getNodeId(), + user, BuilderUtils.newResource(2048, 1), + context.getContainerTokenSecretManager(), null, + ExecutionType.GUARANTEED))); + + // OContainer that should be killed + list.add(StartContainerRequest.newInstance( + recordFactory.newRecordInstance(ContainerLaunchContext.class), + createContainerToken(createContainerId(1), DUMMY_RM_IDENTIFIER, + context.getNodeId(), + user, BuilderUtils.newResource(2048, 1), + context.getContainerTokenSecretManager(), null, + ExecutionType.OPPORTUNISTIC))); + + StartContainersRequest allRequests = + StartContainersRequest.newInstance(list); + containerManager.startContainers(allRequests); + + BaseContainerManagerTest.waitForNMContainerState(containerManager, + createContainerId(0), ContainerState.RUNNING, 40); + + // Wait for the OContainer to get killed + BaseContainerManagerTest.waitForNMContainerState(containerManager, + createContainerId(1), ContainerState.DONE,40); Review comment: createContainerId(1), ContainerState.DONE,40);:50: ',' is not followed by whitespace. [WhitespaceAfter] ########## File path: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/ContainerScheduler.java ########## @@ -106,9 +109,37 @@ private final AsyncDispatcher dispatcher; private final NodeManagerMetrics metrics; + private final OpportunisticContainersQueuePolicy oppContainersQueuePolicy; private Boolean usePauseEventForPreemption = false; + private static int getMaxOppQueueLengthFromConf(final Context context) { + if (context == null || context.getConf() == null) { + return YarnConfiguration + .DEFAULT_NM_OPPORTUNISTIC_CONTAINERS_MAX_QUEUE_LENGTH; + } + + return context.getConf().getInt( + YarnConfiguration.NM_OPPORTUNISTIC_CONTAINERS_MAX_QUEUE_LENGTH, + YarnConfiguration.DEFAULT_NM_OPPORTUNISTIC_CONTAINERS_MAX_QUEUE_LENGTH + ); + } + + private static OpportunisticContainersQueuePolicy + getOppContainersQueuePolicyFromConf(final Context context) { Review comment: getOppContainersQueuePolicyFromConf(final Context context) {: 'getOppContainersQueuePolicyFromConf' has incorrect indentation level 2, expected level should be 6. [Indentation] -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
