Skip to content

[FLINK-36742][cdc-base][oracle] Filter unacked split for no capture tables when task restore from state #3739

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
merged 3 commits into from
Apr 24, 2025
Merged

[FLINK-36742][cdc-base][oracle] Filter unacked split for no capture tables when task restore from state #3739

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
38fdcfa
[FLINK-36742][cdc-base][oracle] Filter unacked split for no capture …
gong Nov 18, 2024
7fd6e50
Modify test to jupiter api
gong Apr 21, 2025
bbf7a20
Modify test to jupiter api
gong Apr 21, 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
24 changes: 16 additions & 8 deletions ...main/java/org/apache/flink/cdc/connectors/base/source/reader/IncrementalSourceReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.apache.flink.api.connector.source.SourceEvent;
import org.apache.flink.cdc.common.annotation.Experimental;
import org.apache.flink.cdc.common.annotation.VisibleForTesting;
import org.apache.flink.cdc.connectors.base.config.SourceConfig;
import org.apache.flink.cdc.connectors.base.dialect.DataSourceDialect;
import org.apache.flink.cdc.connectors.base.source.meta.events.FinishedSnapshotSplitsAckEvent;
Expand Down Expand Up @@ -261,13 +262,14 @@ private void addSplits(List<SourceSplitBase> splits, boolean checkTableChangeFor
for (SourceSplitBase split : splits) {
if (split.isSnapshotSplit()) {
SnapshotSplit snapshotSplit = split.asSnapshotSplit();
if (snapshotSplit.isSnapshotReadFinished()) {
finishedUnackedSplits.put(snapshotSplit.splitId(), snapshotSplit);
} else if (dialect.isIncludeDataCollection(
sourceConfig, snapshotSplit.getTableId())) {
unfinishedSplits.add(split);
if (dialect.isIncludeDataCollection(sourceConfig, snapshotSplit.getTableId())) {
if (snapshotSplit.isSnapshotReadFinished()) {
finishedUnackedSplits.put(snapshotSplit.splitId(), snapshotSplit);
} else {
unfinishedSplits.add(split);
}
} else {
LOG.debug(
LOG.info(
"The subtask {} is skipping split {} because it does not match new table filter.",
subtaskId,
split.splitId());
Expand Down Expand Up @@ -320,8 +322,9 @@ private void addSplits(List<SourceSplitBase> splits, boolean checkTableChangeFor
// add all un-finished splits (including binlog split) to SourceReaderBase
if (!unfinishedSplits.isEmpty()) {
super.addSplits(unfinishedSplits);
} else if (suspendedStreamSplit
!= null) { // only request new snapshot split if the stream split is suspended
} else if (suspendedStreamSplit != null
|| getNumberOfCurrentlyAssignedSplits()
<= 1) { // only request new snapshot split if the stream split is suspended
context.sendSplitRequest();
}
}
Expand Down Expand Up @@ -541,4 +544,9 @@ private void logCurrentStreamOffsets(List<SourceSplitBase> splits, long checkpoi
LOG.info("Stream split offset on checkpoint {}: {}", checkpointId, offset);
}
}

@VisibleForTesting
public Map<String, SnapshotSplit> getFinishedUnackedSplits() {
return finishedUnackedSplits;
}
}
6 changes: 6 additions & 0 deletions flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,12 @@ limitations under the License.
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-test-utils</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
Loading
Loading