zhuzhurk commented on a change in pull request #18462: URL: https://github.com/apache/flink/pull/18462#discussion_r794325891
########## File path: flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchSchedulerTest.java ########## @@ -0,0 +1,180 @@ +/* + * 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.adaptivebatch; + +import org.apache.flink.api.common.JobID; +import org.apache.flink.configuration.Configuration; +import org.apache.flink.configuration.JobManagerOptions; +import org.apache.flink.runtime.concurrent.ComponentMainThreadExecutor; +import org.apache.flink.runtime.concurrent.ComponentMainThreadExecutorServiceAdapter; +import org.apache.flink.runtime.execution.ExecutionState; +import org.apache.flink.runtime.executiongraph.DefaultExecutionGraph; +import org.apache.flink.runtime.executiongraph.Execution; +import org.apache.flink.runtime.executiongraph.ExecutionGraph; +import org.apache.flink.runtime.executiongraph.ExecutionJobVertex; +import org.apache.flink.runtime.executiongraph.ExecutionVertex; +import org.apache.flink.runtime.executiongraph.IOMetrics; +import org.apache.flink.runtime.io.network.partition.ResultPartitionType; +import org.apache.flink.runtime.jobgraph.DistributionPattern; +import org.apache.flink.runtime.jobgraph.JobGraph; +import org.apache.flink.runtime.jobgraph.JobVertex; +import org.apache.flink.runtime.scheduler.SchedulerBase; +import org.apache.flink.runtime.taskmanager.TaskExecutionState; +import org.apache.flink.runtime.testtasks.NoOpInvokable; +import org.apache.flink.util.TestLogger; + +import org.junit.Test; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +/** Test for {@link AdaptiveBatchScheduler}. */ +public class AdaptiveBatchSchedulerTest extends TestLogger { + + private static final int SOURCE_PARALLELISM_1 = 6; + private static final int SOURCE_PARALLELISM_2 = 4; + + private static final ComponentMainThreadExecutor mainThreadExecutor = + ComponentMainThreadExecutorServiceAdapter.forMainThread(); + + @Test + public void testAdaptiveBatchScheduler() throws Exception { + final JobVertex source1 = createJobVertex("source1", SOURCE_PARALLELISM_1); + final JobVertex source2 = createJobVertex("source2", SOURCE_PARALLELISM_2); + final JobVertex sink = createJobVertex("sink", -1); + sink.connectNewDataSetAsInput( + source1, DistributionPattern.POINTWISE, ResultPartitionType.BLOCKING); + sink.connectNewDataSetAsInput( + source2, DistributionPattern.POINTWISE, ResultPartitionType.BLOCKING); + + Configuration configuration = new Configuration(); + configuration.set( + JobManagerOptions.SCHEDULER, JobManagerOptions.SchedulerType.AdaptiveBatch); + + final JobGraph jobGraph = new JobGraph(new JobID(), "test job", source1, source2, sink); + + final AdaptiveBatchSchedulerTestUtils.AdaptiveBatchSchedulerBuilder schedulerBuilder = + (AdaptiveBatchSchedulerTestUtils.AdaptiveBatchSchedulerBuilder) + new AdaptiveBatchSchedulerTestUtils.AdaptiveBatchSchedulerBuilder( + jobGraph, mainThreadExecutor) + .setJobMasterConfiguration(configuration); + schedulerBuilder.setJobVertexParallelismDecider((ignored) -> 10); + + final AdaptiveBatchScheduler scheduler = schedulerBuilder.build(); + final DefaultExecutionGraph graph = (DefaultExecutionGraph) scheduler.getExecutionGraph(); + final ExecutionJobVertex sinkExecutionJobVertex = graph.getJobVertex(sink.getID()); + + scheduler.startScheduling(); + assertThat(sinkExecutionJobVertex.getParallelism(), is(-1)); + + // trigger source1 finished. + transitionExecutionsState(scheduler, ExecutionState.FINISHED, source1); + assertThat(sinkExecutionJobVertex.getParallelism(), is(-1)); + + // trigger source2 finished. + transitionExecutionsState(scheduler, ExecutionState.FINISHED, source2); + assertThat(sinkExecutionJobVertex.getParallelism(), is(10)); + + // check that the jobGraph is updated + assertThat(sink.getParallelism(), is(10)); + } + + @Test + public void testDecideParallelismForForwardTarget() throws Exception { + final JobVertex source1 = createJobVertex("source1", SOURCE_PARALLELISM_1); + final JobVertex source2 = createJobVertex("source2", SOURCE_PARALLELISM_2); + final JobVertex sink = createJobVertex("sink", -1); + sink.connectNewDataSetAsInput( + source1, DistributionPattern.POINTWISE, ResultPartitionType.BLOCKING); + sink.connectNewDataSetAsInput( + source2, DistributionPattern.ALL_TO_ALL, ResultPartitionType.BLOCKING); + source1.getProducedDataSets().get(0).getConsumer().setForward(true); Review comment: The scheduler creation of the two tests are almost the same except for these 2 lines, can we extract them into two methods `createJobGraph(boolean withForwardEdge)` and `createScheduler(JobGraph)` to reduce duplication? -- 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]
