Skip to content

[FLINK-36771][cdc-base][mysql] Fix UT trigger error: Invalid assigner status {} [NEWLY_ADDED_ASSIGNING_FINISHED] #3755

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

Merged
ruanhang1993 merged 3 commits into from
Dec 13, 2024
Merged

[FLINK-36771][cdc-base][mysql] Fix UT trigger error: Invalid assigner status {} [NEWLY_ADDED_ASSIGNING_FINISHED] #3755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a104cc
[FLINK-36771][cdc-base] Fix UT trigger error: Invalid assigner status…
gong Nov 22, 2024
c89359c
[FLINK-36771][cdc-base][mysql] Fix UT trigger error: Invalid assigner…
gong Nov 25, 2024
31a8d76
Add wait time for remove table UT to stream phase to address test tim…
gong Dec 3, 2024
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
6 changes: 5 additions & 1 deletion ...a/org/apache/flink/cdc/connectors/base/source/enumerator/IncrementalSourceEnumerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public class IncrementalSourceEnumerator
private Boundedness boundedness;

@Nullable protected Integer streamSplitTaskId = null;
private boolean isStreamSplitUpdateRequestAlreadySent = false;

public IncrementalSourceEnumerator(
SplitEnumeratorContext<SourceSplitBase> context,
Expand Down Expand Up @@ -272,17 +273,20 @@ protected void syncWithReaders(int[] subtaskIds, Throwable t) {
}

private void requestStreamSplitUpdateIfNeed() {
if (isNewlyAddedAssigningSnapshotFinished(splitAssigner.getAssignerStatus())) {
if (!isStreamSplitUpdateRequestAlreadySent
&& isNewlyAddedAssigningSnapshotFinished(splitAssigner.getAssignerStatus())) {
// If enumerator knows which reader is assigned stream split, just send to this reader,
// nor sends to all registered readers.
if (streamSplitTaskId != null) {
isStreamSplitUpdateRequestAlreadySent = true;
LOG.info(
"The enumerator requests subtask {} to update the stream split after newly added table.",
streamSplitTaskId);
context.sendEventToSourceReader(
streamSplitTaskId, new StreamSplitUpdateRequestEvent());
} else {
for (int reader : getRegisteredReader()) {
isStreamSplitUpdateRequestAlreadySent = true;
LOG.info(
"The enumerator requests subtask {} to update the stream split after newly added table.",
reader);
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/apache/flink/cdc/connectors/mysql/source/enumerator/MySqlSourceEnumerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ private void syncWithReaders(int[] subtaskIds, Throwable t) {
private void requestBinlogSplitUpdateIfNeed() {
if (!isBinlogSplitUpdateRequestAlreadySent
&& isNewlyAddedAssigningSnapshotFinished(splitAssigner.getAssignerStatus())) {
isBinlogSplitUpdateRequestAlreadySent = true;
for (int subtaskId : getRegisteredReader()) {
isBinlogSplitUpdateRequestAlreadySent = true;
LOG.info(
"The enumerator requests subtask {} to update the binlog split after newly added table.",
subtaskId);
Expand Down
2 changes: 2 additions & 0 deletions ...dc/src/test/java/org/apache/flink/cdc/connectors/oracle/source/NewlyAddedTableITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,8 @@ private void testRemoveTablesOneByOne(
waitForSinkSize("sink", fetchedDataList.size());
assertEqualsInAnyOrder(
fetchedDataList, TestValuesTableFactory.getRawResultsAsStrings("sink"));
// wait task to stream phase
sleepMs(10000);
finishedSavePointPath = triggerSavepointWithRetry(jobClient, savepointDirectory);
jobClient.cancel().get();
}
Expand Down