shuai-xu commented on a change in pull request #8486: [FLINK-12372] [runtime] implement ExecutionSlotAllocator URL: https://github.com/apache/flink/pull/8486#discussion_r291018674
########## File path: flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/DefaultExecutionSlotAllocatorTest.java ########## @@ -0,0 +1,355 @@ +/* + * 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.flink.runtime.scheduler; + +import org.apache.flink.api.common.time.Time; +import org.apache.flink.runtime.clusterframework.types.AllocationID; +import org.apache.flink.runtime.clusterframework.types.ResourceProfile; +import org.apache.flink.runtime.executiongraph.TestingSlotProvider; +import org.apache.flink.runtime.instance.SlotSharingGroupId; +import org.apache.flink.runtime.io.network.partition.ResultPartitionType; +import org.apache.flink.runtime.jobgraph.DistributionPattern; +import org.apache.flink.runtime.jobgraph.JobVertex; +import org.apache.flink.runtime.jobgraph.JobVertexID; +import org.apache.flink.runtime.jobmaster.LogicalSlot; +import org.apache.flink.runtime.jobmaster.SlotRequestId; +import org.apache.flink.runtime.jobmaster.TestingLogicalSlot; +import org.apache.flink.runtime.scheduler.strategy.ExecutionVertexID; +import org.apache.flink.runtime.taskmanager.LocalTaskManagerLocation; +import org.apache.flink.runtime.taskmanager.TaskManagerLocation; +import org.apache.flink.runtime.testtasks.NoOpInvokable; +import org.apache.flink.util.TestLogger; + +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Queue; +import java.util.Set; +import java.util.concurrent.CompletableFuture; + +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.hasSize; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; + +/** + * Tests for {@link DefaultExecutionSlotAllocator}. + */ +public class DefaultExecutionSlotAllocatorTest extends TestLogger { + + private DefaultExecutionSlotAllocator executionSlotAllocator; + + private TestingSlotProvider slotProvider; + + private TestingInputsLocationsRetriever testingInputsLocationsRetriever; + + private List<ExecutionVertexSchedulingRequirements> schedulingRequirements; + + private Queue<CompletableFuture<LogicalSlot>> slotFutures; + + private List<SlotRequestId> receivedSlotRequestIds; + + private List<SlotRequestId> cancelledSlotRequestIds; + + private List<ExecutionVertexID> executionVertexIds; + + private int executionVerticesNum; + + @Before + public void setUp() throws Exception { + testingInputsLocationsRetriever = createSimpleInputsLocationsRetriever(); + + executionVerticesNum = testingInputsLocationsRetriever.getTotalNumberOfVertices(); + receivedSlotRequestIds = new ArrayList<>(executionVerticesNum); + cancelledSlotRequestIds = new ArrayList<>(executionVerticesNum); + slotFutures = new ArrayDeque<>(executionVerticesNum); + + slotProvider = new TestingSlotProvider(slotRequestId -> { + receivedSlotRequestIds.add(slotRequestId); + return slotFutures.poll(); + }); + slotProvider.setSlotCanceller(slotRequestId -> cancelledSlotRequestIds.add(slotRequestId)); + + executionSlotAllocator = new DefaultExecutionSlotAllocator( + slotProvider, + testingInputsLocationsRetriever, + Time.seconds(10), + true); + + schedulingRequirements = new ArrayList<>(executionVerticesNum); + executionVertexIds = new ArrayList<>(executionVerticesNum); + + for (ExecutionVertexID executionVertexId : testingInputsLocationsRetriever.getAllExecutionVertices()) { + schedulingRequirements.add(new ExecutionVertexSchedulingRequirements( + executionVertexId, + null, + ResourceProfile.UNKNOWN, + new SlotSharingGroupId(), + null, + null + )); + executionVertexIds.add(executionVertexId); + slotFutures.add(new CompletableFuture<>()); + } + } + + /** + * Tests that it will allocate slots from slot provider and remove the slot assignments when request are fulfilled. + */ + @Test + public void testAllocateSlotsFor() { Review comment: I Compared using JobVertex with ExecutionVertexID, and chose JobVertex considering it's more flexible for a complex topology. However, your suggestion is reasonable. I appreciate the principle "One Assert per Test", but it may be a little difficult to execute because we want to check more to make sure the class works well. So I adopt the "Single Concept per Test". I don't like VisibleForTesting too. But or else we have to implement a TestingSlotProvider to check the all previous allocation ids. ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
