Skip to content
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

Jump to bottom

[FLINK-29324] [Connectors/Kinesis] Fix NPE for Kinesis connector when closing #20853

Merged
merged 2 commits into from Sep 20, 2022
Merged

[FLINK-29324] [Connectors/Kinesis] Fix NPE for Kinesis connector when closing #20853

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
dba969a
[FLINK-29324] Fix NPE for Kinesis connector when closing
harker2015 Sep 19, 2022
dc4d256
[FLINK-29324] Add unit test case
harker2015 Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...sis/src/main/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisConsumer.java
View file
Open in desktop
Expand Up @@ -418,7 +418,12 @@ public void cancel() {
public void close() throws Exception {
cancel();
// safe-guard when the fetcher has been interrupted, make sure to not leak resources
fetcher.awaitTermination();
// application might be stopped before connector subtask has been started
// so we must check if the fetcher is actually created
KinesisDataFetcher fetcher = this.fetcher;
if (fetcher != null) {
fetcher.awaitTermination();
}
this.fetcher = null;
super.close();
}
Expand Down
8 changes: 8 additions & 0 deletions ...src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisConsumerTest.java
View file
Open in desktop
Expand Up @@ -1184,6 +1184,14 @@ public void emitWatermark(Watermark mark) {
testHarness.close();
}

@Test
public void testCloseConnectorBeforeSubtaskStart() throws Exception {
Properties config = TestUtils.getStandardProperties();
FlinkKinesisConsumer<String> consumer =
new FlinkKinesisConsumer<>("fakeStream", new SimpleStringSchema(), config);
consumer.close();
}

private void awaitRecordCount(ConcurrentLinkedQueue<? extends Object> queue, int count)
throws Exception {
Deadline deadline = Deadline.fromNow(Duration.ofSeconds(10));
Expand Down