forked from apache/flink
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-17180][runtime] Implement SchedulingPipelinedRegion interface
Implement interfaces - Toplogy#getAllPipelinedRegions() - Topology#getPipelinedRegionOfVertex(ExecutionVertexID) in DefaultExecutionTopology to enable retrieval of pipelined regions.
- Loading branch information
Showing
4 changed files
with
282 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
...ain/java/org/apache/flink/runtime/scheduler/adapter/DefaultSchedulingPipelinedRegion.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * 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:https://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.adapter; | ||
|
|
||
| import org.apache.flink.runtime.scheduler.strategy.ExecutionVertexID; | ||
| import org.apache.flink.runtime.scheduler.strategy.SchedulingPipelinedRegion; | ||
| import org.apache.flink.util.Preconditions; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * Default implementation of {@link SchedulingPipelinedRegion}. | ||
| */ | ||
| public class DefaultSchedulingPipelinedRegion implements SchedulingPipelinedRegion { | ||
|
|
||
| private final Map<ExecutionVertexID, DefaultExecutionVertex> executionVertices; | ||
|
|
||
| private Set<DefaultResultPartition> consumedResults; | ||
|
|
||
| public DefaultSchedulingPipelinedRegion(Set<DefaultExecutionVertex> defaultExecutionVertices) { | ||
| Preconditions.checkNotNull(defaultExecutionVertices); | ||
|
|
||
| this.executionVertices = new HashMap<>(); | ||
| for (DefaultExecutionVertex executionVertex : defaultExecutionVertices) { | ||
| this.executionVertices.put(executionVertex.getId(), executionVertex); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Iterable<DefaultExecutionVertex> getVertices() { | ||
| return Collections.unmodifiableCollection(executionVertices.values()); | ||
| } | ||
|
|
||
| @Override | ||
| public DefaultExecutionVertex getVertex(final ExecutionVertexID vertexId) { | ||
| final DefaultExecutionVertex executionVertex = executionVertices.get(vertexId); | ||
| if (executionVertex == null) { | ||
| throw new IllegalArgumentException(String.format( | ||
| "Execution vertex %s not found in pipelined region", | ||
| vertexId)); | ||
| } | ||
| return executionVertex; | ||
| } | ||
|
|
||
| @Override | ||
| public Iterable<DefaultResultPartition> getConsumedResults() { | ||
| if (consumedResults == null) { | ||
| initializeConsumedResults(); | ||
| } | ||
| return consumedResults; | ||
| } | ||
|
|
||
| private void initializeConsumedResults() { | ||
| final Set<DefaultResultPartition> consumedResults = new HashSet<>(); | ||
| for (DefaultExecutionVertex executionVertex : executionVertices.values()) { | ||
| for (DefaultResultPartition resultPartition : executionVertex.getConsumedResults()) { | ||
| if (!executionVertices.containsKey(resultPartition.getProducer().getId())) { | ||
| consumedResults.add(resultPartition); | ||
| } | ||
| } | ||
| } | ||
| this.consumedResults = Collections.unmodifiableSet(consumedResults); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 127 additions & 0 deletions
127
...java/org/apache/flink/runtime/scheduler/adapter/DefaultSchedulingPipelinedRegionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /* | ||
| * 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:https://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.adapter; | ||
|
|
||
| import org.apache.flink.api.common.InputDependencyConstraint; | ||
| import org.apache.flink.runtime.execution.ExecutionState; | ||
| import org.apache.flink.runtime.executiongraph.ExecutionGraph; | ||
| import org.apache.flink.runtime.executiongraph.ExecutionGraphTestUtils; | ||
| import org.apache.flink.runtime.io.network.partition.ResultPartitionType; | ||
| import org.apache.flink.runtime.jobgraph.DistributionPattern; | ||
| import org.apache.flink.runtime.jobgraph.IntermediateResultPartitionID; | ||
| import org.apache.flink.runtime.jobgraph.JobVertex; | ||
| import org.apache.flink.runtime.jobgraph.JobVertexID; | ||
| import org.apache.flink.runtime.scheduler.strategy.ExecutionVertexID; | ||
| import org.apache.flink.util.IterableUtils; | ||
| import org.apache.flink.util.TestLogger; | ||
|
|
||
| import org.apache.flink.shaded.guava18.com.google.common.collect.Iterables; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.Iterator; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static org.hamcrest.Matchers.contains; | ||
| import static org.hamcrest.Matchers.containsString; | ||
| import static org.hamcrest.Matchers.is; | ||
| import static org.hamcrest.Matchers.sameInstance; | ||
| import static org.junit.Assert.assertThat; | ||
| import static org.junit.Assert.fail; | ||
|
|
||
| /** | ||
| * Unit tests for {@link DefaultSchedulingPipelinedRegion}. | ||
| */ | ||
| public class DefaultSchedulingPipelinedRegionTest extends TestLogger { | ||
|
|
||
| @Test | ||
| public void gettingUnknownVertexThrowsException() { | ||
| final DefaultSchedulingPipelinedRegion pipelinedRegion = new DefaultSchedulingPipelinedRegion(Collections.emptySet()); | ||
| final ExecutionVertexID unknownVertexId = new ExecutionVertexID(new JobVertexID(), 0); | ||
| try { | ||
| pipelinedRegion.getVertex(unknownVertexId); | ||
| fail("Expected exception not thrown"); | ||
| } catch (IllegalArgumentException e) { | ||
| assertThat(e.getMessage(), containsString(unknownVertexId + " not found")); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void returnsVertices() { | ||
| final DefaultExecutionVertex vertex = new DefaultExecutionVertex( | ||
| new ExecutionVertexID(new JobVertexID(), 0), | ||
| Collections.emptyList(), | ||
| () -> ExecutionState.CREATED, | ||
| InputDependencyConstraint.ANY); | ||
|
|
||
| final Set<DefaultExecutionVertex> vertices = Collections.singleton(vertex); | ||
| final DefaultSchedulingPipelinedRegion pipelinedRegion = new DefaultSchedulingPipelinedRegion(vertices); | ||
| final Iterator<DefaultExecutionVertex> vertexIterator = pipelinedRegion.getVertices().iterator(); | ||
|
|
||
| assertThat(vertexIterator.hasNext(), is(true)); | ||
| assertThat(vertexIterator.next(), is(sameInstance(vertex))); | ||
| assertThat(vertexIterator.hasNext(), is(false)); | ||
| } | ||
|
|
||
| /** | ||
| * Tests if the consumed inputs of the pipelined regions are computed | ||
| * correctly using the Job graph below. | ||
| * <pre> | ||
| * c | ||
| * / X | ||
| * a -+- b e | ||
| * \ / | ||
| * d | ||
| * </pre> | ||
| * Pipelined regions: {a}, {b, c, d, e} | ||
| */ | ||
| @Test | ||
| public void returnsIncidentBlockingPartitions() throws Exception { | ||
| final JobVertex a = ExecutionGraphTestUtils.createNoOpVertex(1); | ||
| final JobVertex b = ExecutionGraphTestUtils.createNoOpVertex(1); | ||
| final JobVertex c = ExecutionGraphTestUtils.createNoOpVertex(1); | ||
| final JobVertex d = ExecutionGraphTestUtils.createNoOpVertex(1); | ||
| final JobVertex e = ExecutionGraphTestUtils.createNoOpVertex(1); | ||
|
|
||
| b.connectNewDataSetAsInput(a, DistributionPattern.POINTWISE, ResultPartitionType.BLOCKING); | ||
| c.connectNewDataSetAsInput(b, DistributionPattern.POINTWISE, ResultPartitionType.PIPELINED); | ||
| d.connectNewDataSetAsInput(b, DistributionPattern.POINTWISE, ResultPartitionType.PIPELINED); | ||
| e.connectNewDataSetAsInput(c, DistributionPattern.POINTWISE, ResultPartitionType.BLOCKING); | ||
| e.connectNewDataSetAsInput(d, DistributionPattern.POINTWISE, ResultPartitionType.PIPELINED); | ||
|
|
||
| final ExecutionGraph simpleTestGraph = ExecutionGraphTestUtils.createSimpleTestGraph(a, b, c, d, e); | ||
| final DefaultExecutionTopology topology = new DefaultExecutionTopology(simpleTestGraph); | ||
|
|
||
| final DefaultSchedulingPipelinedRegion firstPipelinedRegion = topology.getPipelinedRegionOfVertex(new ExecutionVertexID(a.getID(), 0)); | ||
| final DefaultSchedulingPipelinedRegion secondPipelinedRegion = topology.getPipelinedRegionOfVertex(new ExecutionVertexID(e.getID(), 0)); | ||
|
|
||
| final DefaultExecutionVertex vertexB0 = topology.getVertex(new ExecutionVertexID(b.getID(), 0)); | ||
| final IntermediateResultPartitionID b0ConsumedResultPartition = Iterables.getOnlyElement(vertexB0.getConsumedResults()).getId(); | ||
|
|
||
| final Set<IntermediateResultPartitionID> secondPipelinedRegionConsumedResults = IterableUtils.toStream(secondPipelinedRegion.getConsumedResults()) | ||
| .map(DefaultResultPartition::getId) | ||
| .collect(Collectors.toSet()); | ||
|
|
||
| assertThat(firstPipelinedRegion.getConsumedResults().iterator().hasNext(), is(false)); | ||
| assertThat(secondPipelinedRegionConsumedResults, contains(b0ConsumedResultPartition)); | ||
| } | ||
| } |