Skip to content

[FLINK-35859][cdc-connector] Fix: The assigner is not ready to offer finished split information, this should not be called #3519

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
leonardBang merged 3 commits into from
Aug 9, 2024
Merged

[FLINK-35859][cdc-connector] Fix: The assigner is not ready to offer finished split information, this should not be called #3519

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
c170003
[FLINK-34688][cdc-connector] Fix: The assigner is not ready to offer …
loserwang1024 Aug 8, 2024
3c83647
Fix test
loserwang1024 Aug 8, 2024
c648683
Fix based on cr
loserwang1024 Aug 9, 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
3 changes: 2 additions & 1 deletion ...main/java/org/apache/flink/cdc/connectors/base/source/assigner/SnapshotSplitAssigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ else if (!isRemainingTablesCheckpointed && !isSnapshotAssigningFinished(assigner

private void captureNewlyAddedTables() {
if (sourceConfig.isScanNewlyAddedTableEnabled()
&& !sourceConfig.getStartupOptions().isSnapshotOnly()) {
&& !sourceConfig.getStartupOptions().isSnapshotOnly()
&& AssignerStatus.isAssigningFinished(assignerStatus)) {
try {
// check whether we got newly added tables
final List<TableId> currentCapturedTables =
Expand Down
3 changes: 2 additions & 1 deletion ...va/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,8 @@ else if (!isRemainingTablesCheckpointed
private void captureNewlyAddedTables() {
// Don't scan newly added table in snapshot mode.
if (sourceConfig.isScanNewlyAddedTableEnabled()
&& !sourceConfig.getStartupOptions().isSnapshotOnly()) {
&& !sourceConfig.getStartupOptions().isSnapshotOnly()
&& AssignerStatus.isAssigningFinished(assignerStatus)) {
// check whether we got newly added tables
try (JdbcConnection jdbc = DebeziumUtils.openJdbcConnection(sourceConfig)) {
final List<TableId> currentCapturedTables =
Expand Down
25 changes: 21 additions & 4 deletions ...rg/apache/flink/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssignerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,15 +484,32 @@ public void testEnumerateTablesLazily() {
}

@Test
public void testScanNewlyAddedTableStartFromCheckpoint() {
public void testScanNewlyAddedTableStartFromInitialAssigningFinishedCheckpoint() {
List<String> expected =
Arrays.asList(
"customers_sparse_dist [109] null",
"customers_even_dist null [10]",
"customers_even_dist [10] [18]",
"customers_even_dist [18] null",
"customer_card_single_line null null");
assertEquals(expected, getTestAssignSnapshotSplitsFromCheckpoint());
assertEquals(
expected,
getTestAssignSnapshotSplitsFromCheckpoint(
AssignerStatus.INITIAL_ASSIGNING_FINISHED));
}

@Test
public void testScanNewlyAddedTableStartFromNewlyAddedAssigningSnapshotFinishedCheckpoint() {
List<String> expected =
Arrays.asList(
"customers_sparse_dist [109] null",
"customers_even_dist null [10]",
"customers_even_dist [10] [18]",
"customers_even_dist [18] null");
assertEquals(
expected,
getTestAssignSnapshotSplitsFromCheckpoint(
AssignerStatus.NEWLY_ADDED_ASSIGNING_SNAPSHOT_FINISHED));
}

private List<String> getTestAssignSnapshotSplits(
Expand Down Expand Up @@ -536,7 +553,7 @@ private List<String> getTestAssignSnapshotSplits(
return getSplitsFromAssigner(assigner);
}

private List<String> getTestAssignSnapshotSplitsFromCheckpoint() {
private List<String> getTestAssignSnapshotSplitsFromCheckpoint(AssignerStatus assignerStatus) {
Copy link
Contributor

@leonardBang leonardBang Aug 8, 2024

Choose a reason for hiding this comment

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

minor: The method name should use camel case

Copy link
Contributor Author

@loserwang1024 loserwang1024 Aug 9, 2024

Choose a reason for hiding this comment

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

done

TableId newTable =
TableId.parse(customerDatabase.getDatabaseName() + ".customer_card_single_line");
TableId processedTable =
Expand Down Expand Up @@ -619,7 +636,7 @@ private List<String> getTestAssignSnapshotSplitsFromCheckpoint() {
assignedSplits,
new HashMap<>(),
splitFinishedOffsets,
AssignerStatus.INITIAL_ASSIGNING,
assignerStatus,
remainingTables,
false,
true,
Expand Down