Repository navigation
[FLINK-40780][runtime] Make FORWARD-to-REBALANCE downgrade on parallelism mismatch configurable #29272
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -30,6 +30,8 @@ | |
| import org.apache.flink.configuration.Configuration; | ||
| import org.apache.flink.configuration.IllegalConfigurationException; | ||
| import org.apache.flink.configuration.NettyShuffleEnvironmentOptions; | ||
| import org.apache.flink.configuration.PipelineOptions; | ||
| import org.apache.flink.configuration.PipelineOptions.ForwardEdgeParallelismMismatchMode; | ||
| import org.apache.flink.configuration.ReadableConfig; | ||
| import org.apache.flink.core.execution.SavepointFormatType; | ||
| import org.apache.flink.core.fs.FSDataInputStream; | ||
|
|
@@ -1893,6 +1895,82 @@ public int getNumberOfSubpartitions() { | |
| } | ||
| } | ||
|
|
||
| @Test | ||
| void testForwardPartitionerFailsOnParallelismChangeWhenModeIsFail() throws Exception { | ||
| StreamTaskMailboxTestHarnessBuilder<Integer> builder = | ||
| new StreamTaskMailboxTestHarnessBuilder<>( | ||
| OneInputStreamTask::new, BasicTypeInfo.INT_TYPE_INFO) | ||
| .addInput(BasicTypeInfo.INT_TYPE_INFO) | ||
| .addJobConfig( | ||
| PipelineOptions.FORWARD_EDGE_PARALLELISM_MISMATCH_MODE, | ||
| ForwardEdgeParallelismMismatchMode.FAIL) | ||
| .setOutputPartitioner(new ForwardPartitioner<>()) | ||
| .setupOutputForSingletonOperatorChain( | ||
| new TestBoundedOneInputStreamOperator()); | ||
|
|
||
| try (StreamTaskMailboxTestHarness<Integer> harness = builder.build()) { | ||
| // Simulate changed downstream task parallelism (1->2) | ||
| List<ResultPartitionWriter> newOutputs = new ArrayList<>(); | ||
| newOutputs.add( | ||
| new MockResultPartitionWriter() { | ||
| @Override | ||
| public int getNumberOfSubpartitions() { | ||
| return 2; | ||
| } | ||
| }); | ||
| harness.streamMockEnvironment.setOutputs(newOutputs); | ||
| harness.streamMockEnvironment.setWriterConsumerParallelism(2); | ||
|
|
||
| // With FAIL mode the job is rejected instead of silently downgrading the edge. | ||
| assertThatThrownBy( | ||
| () -> | ||
| harness.streamTask.createRecordWriterDelegate( | ||
| harness.streamTask.configuration, | ||
| harness.streamMockEnvironment)) | ||
| .isInstanceOf(FlinkRuntimeException.class) | ||
| .hasMessageContaining("Forward partitioning cannot be preserved"); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void testForwardPartitionerIsKeptOnParallelismChangeWhenModeIsKeepForward() throws Exception { | ||
| StreamTaskMailboxTestHarnessBuilder<Integer> builder = | ||
| new StreamTaskMailboxTestHarnessBuilder<>( | ||
| OneInputStreamTask::new, BasicTypeInfo.INT_TYPE_INFO) | ||
| .addInput(BasicTypeInfo.INT_TYPE_INFO) | ||
| .addJobConfig( | ||
| PipelineOptions.FORWARD_EDGE_PARALLELISM_MISMATCH_MODE, | ||
| ForwardEdgeParallelismMismatchMode.KEEP_FORWARD) | ||
| .setOutputPartitioner(new ForwardPartitioner<>()) | ||
| .setupOutputForSingletonOperatorChain( | ||
| new TestBoundedOneInputStreamOperator()); | ||
|
|
||
| try (StreamTaskMailboxTestHarness<Integer> harness = builder.build()) { | ||
| // Simulate changed downstream task parallelism (1->2) | ||
| List<ResultPartitionWriter> newOutputs = new ArrayList<>(); | ||
| newOutputs.add( | ||
| new MockResultPartitionWriter() { | ||
| @Override | ||
| public int getNumberOfSubpartitions() { | ||
| return 2; | ||
| } | ||
| }); | ||
| harness.streamMockEnvironment.setOutputs(newOutputs); | ||
| harness.streamMockEnvironment.setWriterConsumerParallelism(2); | ||
|
|
||
| RecordWriterDelegate<SerializationDelegate<StreamRecord<Object>>> recordWriterDelegate = | ||
| harness.streamTask.createRecordWriterDelegate( | ||
| harness.streamTask.configuration, harness.streamMockEnvironment); | ||
| // With KEEP_FORWARD mode the forward partitioner is preserved despite the mismatch. | ||
| assertThat( | ||
| ((ChannelSelectorRecordWriter) | ||
| ((SingleRecordWriter) recordWriterDelegate) | ||
| .getRecordWriter(0)) | ||
| .getChannelSelector()) | ||
| .isInstanceOf(ForwardPartitioner.class); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void testGetAndCheckMaxTraverseSize() { | ||
| Configuration config = new Configuration(); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIUC
REBALANCEbreaks changelog mode - should it be the default?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point. REBALANCE stays the default to keep the existing behavior, so jobs relying on it today (e.g. append-only jobs rescaled by the AdaptiveScheduler) aren't affected. Changelog jobs can opt into FAIL or KEEP_FORWARD.