Skip to content

[FLINK-39977][runtime] Recovery of merged channel state handles #29043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zakelly wants to merge 2 commits into
base: master
Choose a base branch
from
+365 −4
Open

[FLINK-39977][runtime] Recovery of merged channel state handles #29043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fddae3
[FLINK-39977][runtime] Recovery of merged channel state handles
Zakelly Aug 29, 2026
38ebba0
[FLINK-39977][runtime] Add ITCase for file-merged channel state recovery
Zakelly Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...pache/flink/runtime/checkpoint/filemerging/SubtaskFileMergingManagerRestoreOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import java.util.function.Function;
import java.util.stream.Stream;

import static org.apache.flink.runtime.state.ChannelStateHelper.collectUniqueDisposableInChannelState;

/**
* Restore operation that restores file-merging information belonging to one subtask for {@link
* FileMergingSnapshotManager}.
Expand Down Expand Up @@ -89,10 +91,15 @@ public void restore() {
subtaskState.getRawOperatorState().stream())
.flatMap(this::getChildrenStreamHandles);

// TODO support channel state restore for unaligned checkpoint.
Stream<StreamStateHandle> channelStateHandles =
collectUniqueDisposableInChannelState(
Stream.of(
subtaskState.getInputChannelState(),
subtaskState.getUpstreamOutputBufferState(),
subtaskState.getResultSubpartitionState()));

Stream<SegmentFileStateHandle> segmentStateHandles =
Stream.of(keyedStateHandles, operatorStateHandles)
Stream.of(keyedStateHandles, operatorStateHandles, channelStateHandles)
.flatMap(Function.identity())
.filter(
handle ->
Expand Down
67 changes: 65 additions & 2 deletions ...a/org/apache/flink/runtime/checkpoint/filemerging/FileMergingSnapshotManagerTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
import org.apache.flink.core.fs.Path;
import org.apache.flink.core.fs.local.LocalFileSystem;
import org.apache.flink.runtime.checkpoint.OperatorSubtaskState;
import org.apache.flink.runtime.checkpoint.StateObjectCollection;
import org.apache.flink.runtime.checkpoint.TaskStateSnapshot;
import org.apache.flink.runtime.checkpoint.channel.InputChannelInfo;
import org.apache.flink.runtime.checkpoint.channel.ResultSubpartitionInfo;
import org.apache.flink.runtime.checkpoint.filemerging.FileMergingSnapshotManager.SpaceStat;
import org.apache.flink.runtime.checkpoint.filemerging.FileMergingSnapshotManager.SubtaskKey;
import org.apache.flink.runtime.clusterframework.types.ResourceID;
Expand All @@ -37,10 +40,14 @@
import org.apache.flink.runtime.state.CheckpointedStateScope;
import org.apache.flink.runtime.state.IncrementalKeyedStateHandle;
import org.apache.flink.runtime.state.IncrementalRemoteKeyedStateHandle;
import org.apache.flink.runtime.state.InputChannelStateHandle;
import org.apache.flink.runtime.state.KeyGroupRange;
import org.apache.flink.runtime.state.KeyGroupRangeOffsets;
import org.apache.flink.runtime.state.KeyGroupsStateHandle;
import org.apache.flink.runtime.state.MergedInputChannelStateHandle;
import org.apache.flink.runtime.state.OperatorStateHandle;
import org.apache.flink.runtime.state.OutputStateHandle;
import org.apache.flink.runtime.state.ResultSubpartitionStateHandle;
import org.apache.flink.runtime.state.filemerging.FileMergingOperatorStreamStateHandle;
import org.apache.flink.runtime.state.filemerging.SegmentFileStateHandle;
import org.apache.flink.runtime.state.filesystem.FileMergingCheckpointStateOutputStream;
Expand All @@ -51,6 +58,7 @@

import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
Expand Down Expand Up @@ -539,8 +547,8 @@ public void testRestore() throws Exception {
assertThat(stateFiles.size()).isEqualTo(1);
Set<LogicalFile> restoreFileSet = stateFiles.get(checkpointId);
assertThat(restoreFileSet).isNotNull();
// 2 operators * (2 keyed state + 2 operator state)
assertThat(restoreFileSet.size()).isEqualTo(8);
// 2 operators * (2 keyed state + 2 operator state + 3 channel state delegates)
assertThat(restoreFileSet.size()).isEqualTo(14);
assertThat(fmsm.spaceStat).isEqualTo(oldSpaceStat);
for (LogicalFile file : restoreFileSet) {
assertThat(fmsm.getLogicalFile(file.getFileId())).isEqualTo(file);
Expand Down Expand Up @@ -741,11 +749,66 @@ private OperatorSubtaskState buildOperatorSubtaskState(
CheckpointedStateScope.EXCLUSIVE,
closeableRegistry));

SegmentFileStateHandle inputChannelStateHandle =
buildOneSegmentFileHandle(
checkpointId, fmsm, CheckpointedStateScope.EXCLUSIVE, closeableRegistry);
InputChannelStateHandle inputChannel1 =
new InputChannelStateHandle(
0,
new InputChannelInfo(0, 0),
inputChannelStateHandle,
Collections.singletonList(0L),
16L);
InputChannelStateHandle inputChannel2 =
new InputChannelStateHandle(
0,
new InputChannelInfo(0, 1),
inputChannelStateHandle,
Collections.singletonList(16L),
16L);

SegmentFileStateHandle upstreamOutputBufferStateHandle =
buildOneSegmentFileHandle(
checkpointId, fmsm, CheckpointedStateScope.EXCLUSIVE, closeableRegistry);
InputChannelStateHandle upstreamOutputBuffer =
new InputChannelStateHandle(
0,
new InputChannelInfo(1, 0),
upstreamOutputBufferStateHandle,
Collections.singletonList(0L),
upstreamOutputBufferStateHandle.getStateSize());

SegmentFileStateHandle resultSubpartitionStateHandle =
buildOneSegmentFileHandle(
checkpointId, fmsm, CheckpointedStateScope.EXCLUSIVE, closeableRegistry);
ResultSubpartitionStateHandle resultSubpartition1 =
new ResultSubpartitionStateHandle(
0,
new ResultSubpartitionInfo(0, 0),
resultSubpartitionStateHandle,
Collections.singletonList(0L),
16L);
ResultSubpartitionStateHandle resultSubpartition2 =
new ResultSubpartitionStateHandle(
0,
new ResultSubpartitionInfo(0, 1),
resultSubpartitionStateHandle,
Collections.singletonList(16L),
16L);

return OperatorSubtaskState.builder()
.setManagedKeyedState(keyedStateHandle1)
.setRawKeyedState(keyedStateHandle2)
.setManagedOperatorState(operatorStateHandle1)
.setRawOperatorState(operatorStateHandle2)
.setInputChannelState(
StateObjectCollection.singleton(
MergedInputChannelStateHandle.fromChannelHandles(
Arrays.asList(inputChannel1, inputChannel2))))
.setUpstreamOutputBufferState(StateObjectCollection.singleton(upstreamOutputBuffer))
.setResultSubpartitionState(
new StateObjectCollection<OutputStateHandle>(
Arrays.asList(resultSubpartition1, resultSubpartition2)))
.build();
}

Expand Down
Loading