Skip to content

[hotfix] Add null check for currentReader in pauseOrResumeSplits #27200

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
wants to merge 3 commits into
base: master
Choose a base branch
from
+3 −1
Open

[hotfix] Add null check for currentReader in pauseOrResumeSplits #27200

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a64f25
[FLINK-37308] Support pauseOrResumeSplits in HybridSource
xccui Apr 19, 2025
965f40b
[hotfix] Add null check for currentReader in pauseOrResumeSplits
xccui Nov 5, 2025
80cdd5a
Merge branch 'master' into xingcan/flink-37308
xccui Nov 5, 2025
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
4 changes: 3 additions & 1 deletion ...-base/src/main/java/org/apache/flink/connector/base/source/hybrid/HybridSourceReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,8 @@ private void setCurrentReader(int index) {
@Override
public void pauseOrResumeSplits(
Collection<String> splitsToPause, Collection<String> splitsToResume) {
currentReader.pauseOrResumeSplits(splitsToPause, splitsToResume);
if (currentReader != null) {
Copy link
Contributor

@davidradl davidradl Nov 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if it is null, should we error?
Would it fail later if we do not error here ?
Can we get an empty collection here - that we could also check for?

Copy link
Member Author

@xccui xccui Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's normal for the currentReader to be null. I'm just not sure if this method will be invoked when it happens. So just in case.

Copy link
Contributor

@davidradl davidradl Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a look at the non test code, I see

flink/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SourceOperator.java

Line 767 in 0ffacdc

pauseOrResumeSplits(splitsToPause, splitsToResume);

flink/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SourceOperator.java

Line 727 in 0ffacdc

pauseOrResumeSplits(Collections.singletonList(splitId), Collections.emptyList());

as the 2 callers that end up in this code - both of whom call this with a non null. I suggest we do not need the null check as this parameter is never null. Did I miss anything?

Copy link
Member Author

@xccui xccui Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Actually we had used the version without the null check for several months internally and didn't hit any issues. It implies the null check could be redundant. However, potentially more code will use this method in the future. So adding the check would be a defensive measure (I actually forgot to push this commit to my previous PR). I'm fine with both.

currentReader.pauseOrResumeSplits(splitsToPause, splitsToResume);
}
}
}
Loading