szilard-nemeth commented on a change in pull request #3358: URL: https://github.com/apache/hadoop/pull/3358#discussion_r734604592
########## File path: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestQueueCapacityConfigParser.java ########## @@ -0,0 +1,208 @@ +/** + * 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.scheduler.capacity.conf; + +import org.apache.hadoop.util.Lists; +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueueCapacityVector; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueueCapacityVector.QueueCapacityVectorEntry; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueueCapacityVector.QueueCapacityType; +import org.apache.hadoop.yarn.util.resource.ResourceUtils; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; + +public class TestQueueCapacityConfigParser { + + private static final String QUEUE = "root.test"; + private static final String ABSOLUTE_RESOURCE = "[memory-mb=12Gi, vcores=6, yarn.io/gpu=10]"; + private static final String ABSOLUTE_RESOURCE_MEMORY_VCORE = "[memory-mb=12Gi, vcores=6]"; + private static final String MIXED_RESOURCE = "[memory-mb=1024, vcores=50%, yarn.io/gpu=6w]"; + private static final String RESOURCE_TYPES = "yarn.io/gpu"; + + private final QueueCapacityConfigParser capacityConfigParser + = new QueueCapacityConfigParser(); + + @Test + public void testPercentageCapacityConfig() { + CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration(); + conf.setCapacity(QUEUE, 50); + + QueueCapacityVector percentageCapacityVector = capacityConfigParser.parse(conf, QUEUE, ""); + List<QueueCapacityVectorEntry> resources = Lists.newArrayList(percentageCapacityVector.iterator()); + + Assert.assertEquals(QueueCapacityType.PERCENTAGE, resources.get(0).getVectorResourceType()); + Assert.assertEquals(50f, resources.get(0).getResourceValue(), 1e-6); + + Assert.assertEquals(QueueCapacityType.PERCENTAGE, resources.get(1).getVectorResourceType()); + Assert.assertEquals(50f, resources.get(1).getResourceValue(), 1e-6); + + QueueCapacityVector rootCapacityVector = capacityConfigParser.parse(conf, + CapacitySchedulerConfiguration.ROOT, ""); + List<QueueCapacityVectorEntry> rootResources = + Lists.newArrayList(rootCapacityVector.iterator()); + + Assert.assertEquals(QueueCapacityType.PERCENTAGE, + rootResources.get(0).getVectorResourceType()); + Assert.assertEquals(100f, + rootResources.get(0).getResourceValue(), 1e-6); + + Assert.assertEquals(QueueCapacityType.PERCENTAGE, + rootResources.get(1).getVectorResourceType()); + Assert.assertEquals(100f, + rootResources.get(1).getResourceValue(), 1e-6); + } + + @Test + public void testWeightCapacityConfig() { + CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration(); + conf.setNonLabeledQueueWeight(QUEUE, 6); + + QueueCapacityVector weightCapacityVector = capacityConfigParser.parse(conf, QUEUE, ""); + List<QueueCapacityVectorEntry> resources = Lists.newArrayList(weightCapacityVector.iterator()); + + Assert.assertEquals(QueueCapacityType.WEIGHT, resources.get(0).getVectorResourceType()); + Assert.assertEquals(6f, resources.get(0).getResourceValue(), 1e-6); + + Assert.assertEquals(QueueCapacityType.WEIGHT, resources.get(1).getVectorResourceType()); + Assert.assertEquals(6f, resources.get(1).getResourceValue(), 1e-6); + } + + @Test + public void testAbsoluteCapacityVectorConfig() { + CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration(); + conf.set(CapacitySchedulerConfiguration.getQueuePrefix(QUEUE) + CapacitySchedulerConfiguration.CAPACITY, ABSOLUTE_RESOURCE); + conf.set(YarnConfiguration.RESOURCE_TYPES, RESOURCE_TYPES); + ResourceUtils.resetResourceTypes(conf); + + QueueCapacityVector absoluteCapacityVector = capacityConfigParser.parse(conf, QUEUE, ""); + + Assert.assertEquals(QueueCapacityType.ABSOLUTE, absoluteCapacityVector.getResource("memory-mb").getVectorResourceType()); + Assert.assertEquals(12 * 1024, absoluteCapacityVector.getResource("memory-mb").getResourceValue(), 1e-6); + + Assert.assertEquals(QueueCapacityType.ABSOLUTE, absoluteCapacityVector.getResource("vcores").getVectorResourceType()); + Assert.assertEquals(6f, absoluteCapacityVector.getResource("vcores").getResourceValue(), 1e-6); + + Assert.assertEquals(QueueCapacityType.ABSOLUTE, absoluteCapacityVector.getResource("yarn.io/gpu").getVectorResourceType()); + Assert.assertEquals(10f, absoluteCapacityVector.getResource("yarn.io/gpu").getResourceValue(), 1e-6); + + conf.set(CapacitySchedulerConfiguration.getQueuePrefix(QUEUE) + CapacitySchedulerConfiguration.CAPACITY, ABSOLUTE_RESOURCE_MEMORY_VCORE); + QueueCapacityVector withoutGpuVector = capacityConfigParser.parse(conf, QUEUE, ""); + + Assert.assertEquals(3, withoutGpuVector.getResourceCount()); + Assert.assertEquals(0f, withoutGpuVector.getResource("yarn.io/gpu").getResourceValue(), 1e-6); + } + + @Test + public void testMixedCapacityConfig() { + CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration(); + conf.set(CapacitySchedulerConfiguration.getQueuePrefix(QUEUE) + + CapacitySchedulerConfiguration.CAPACITY, MIXED_RESOURCE); + conf.set(YarnConfiguration.RESOURCE_TYPES, RESOURCE_TYPES); + ResourceUtils.resetResourceTypes(conf); + + QueueCapacityVector mixedCapacityVector = + capacityConfigParser.parse(conf, QUEUE, ""); + + Assert.assertEquals(QueueCapacityType.ABSOLUTE, + mixedCapacityVector.getResource("memory-mb").getVectorResourceType()); + Assert.assertEquals(1024, mixedCapacityVector.getResource("memory-mb").getResourceValue(), 1e-6); + + Assert.assertEquals(QueueCapacityType.PERCENTAGE, + mixedCapacityVector.getResource("vcores").getVectorResourceType()); + Assert.assertEquals(50f, + mixedCapacityVector.getResource("vcores").getResourceValue(), 1e-6); + + Assert.assertEquals(QueueCapacityType.WEIGHT, + mixedCapacityVector.getResource("yarn.io/gpu").getVectorResourceType()); + Assert.assertEquals(6f, + mixedCapacityVector.getResource("yarn.io/gpu").getResourceValue(), 1e-6); + + // Test undefined capacity type default value + conf.set(CapacitySchedulerConfiguration.getQueuePrefix(QUEUE) + + CapacitySchedulerConfiguration.CAPACITY, "[memory-mb=12Gi,vcores=6]"); + + QueueCapacityVector mixedCapacityVectorWithGpuUndefined = + capacityConfigParser.parse(conf, QUEUE, ""); + Assert.assertEquals(QueueCapacityType.ABSOLUTE, + mixedCapacityVectorWithGpuUndefined.getResource("memory-mb").getVectorResourceType()); + Assert.assertEquals(0, mixedCapacityVectorWithGpuUndefined.getResource("yarn.io/gpu").getResourceValue(), 1e-6); + + } + + @Test + public void testInvalidCapacityConfigs() { + CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration(); + + conf.set(CapacitySchedulerConfiguration.getQueuePrefix(QUEUE) + + CapacitySchedulerConfiguration.CAPACITY, "50nonexistingsuffix"); + QueueCapacityVector capacityVectorWithInvalidSuffix = + capacityConfigParser.parse(conf, QUEUE, ""); + List<QueueCapacityVectorEntry> entriesWithInvalidSuffix = + Lists.newArrayList(capacityVectorWithInvalidSuffix.iterator()); + Assert.assertEquals(0, entriesWithInvalidSuffix.size()); Review comment: We discussed we need to keep this behavior as the old code also did not fail on these invalid resoure formats. -- 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]
