You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2022/11/25 09:48:09 UTC
[flink] branch master updated (cc66d4855e6 -> 5e0e0fde630)
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
from cc66d4855e6 [FLINK-29899][runtime][test] Removes obsolete printStackTrace()
new 9d87d33b9a6 [hotfix][kafka] Replace deprecated API usages
new 5e0e0fde630 [FLINK-30056][kafka] Use new Consumer#poll(Duration)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../kafka/source/enumerator/subscriber/KafkaSubscriberUtils.java | 2 +-
.../streaming/connectors/kafka/internals/KafkaConsumerThread.java | 3 ++-
.../connector/kafka/sink/testutils/KafkaSinkExternalContext.java | 4 ++--
.../connector/kafka/testutils/KafkaSourceExternalContext.java | 5 ++++-
.../connectors/kafka/FlinkKafkaInternalProducerITCase.java | 2 +-
.../flink/streaming/connectors/kafka/KafkaTestEnvironmentImpl.java | 7 +++++--
.../flink/streaming/connectors/kafka/table/KafkaTableTestBase.java | 2 +-
7 files changed, 16 insertions(+), 9 deletions(-)
[flink] 01/02: [hotfix][kafka] Replace deprecated API usages
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 9d87d33b9a66777e8ab36dc8a9f05e92fe55bc60
Author: Sergey Nuyanzin <sn...@gmail.com>
AuthorDate: Tue Oct 25 15:25:56 2022 +0200
[hotfix][kafka] Replace deprecated API usages
---
.../kafka/source/enumerator/subscriber/KafkaSubscriberUtils.java | 2 +-
.../connector/kafka/sink/testutils/KafkaSinkExternalContext.java | 4 ++--
.../connector/kafka/testutils/KafkaSourceExternalContext.java | 5 ++++-
.../flink/streaming/connectors/kafka/KafkaTestEnvironmentImpl.java | 7 +++++--
.../flink/streaming/connectors/kafka/table/KafkaTableTestBase.java | 2 +-
5 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/flink-connectors/flink-connector-kafka/src/main/java/org/apache/flink/connector/kafka/source/enumerator/subscriber/KafkaSubscriberUtils.java b/flink-connectors/flink-connector-kafka/src/main/java/org/apache/flink/connector/kafka/source/enumerator/subscriber/KafkaSubscriberUtils.java
index 931de8c82e3..404ffaef863 100644
--- a/flink-connectors/flink-connector-kafka/src/main/java/org/apache/flink/connector/kafka/source/enumerator/subscriber/KafkaSubscriberUtils.java
+++ b/flink-connectors/flink-connector-kafka/src/main/java/org/apache/flink/connector/kafka/source/enumerator/subscriber/KafkaSubscriberUtils.java
@@ -41,7 +41,7 @@ class KafkaSubscriberUtils {
static Map<String, TopicDescription> getTopicMetadata(
AdminClient adminClient, Set<String> topicNames) {
try {
- return adminClient.describeTopics(topicNames).all().get();
+ return adminClient.describeTopics(topicNames).allTopicNames().get();
} catch (Exception e) {
throw new RuntimeException(
String.format("Failed to get metadata for topics %s.", topicNames), e);
diff --git a/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/connector/kafka/sink/testutils/KafkaSinkExternalContext.java b/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/connector/kafka/sink/testutils/KafkaSinkExternalContext.java
index ee9ac2193ce..ae260489ef0 100644
--- a/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/connector/kafka/sink/testutils/KafkaSinkExternalContext.java
+++ b/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/connector/kafka/sink/testutils/KafkaSinkExternalContext.java
@@ -193,7 +193,7 @@ public class KafkaSinkExternalContext implements DataStreamSinkV2ExternalContext
protected Map<String, TopicDescription> getTopicMetadata(List<String> topics) {
try {
- return kafkaAdminClient.describeTopics(topics).all().get();
+ return kafkaAdminClient.describeTopics(topics).allTopicNames().get();
} catch (Exception e) {
throw new RuntimeException(
String.format("Failed to get metadata for topics %s.", topics), e);
@@ -202,7 +202,7 @@ public class KafkaSinkExternalContext implements DataStreamSinkV2ExternalContext
private boolean topicExists(String topic) {
try {
- kafkaAdminClient.describeTopics(Arrays.asList(topic)).all().get();
+ kafkaAdminClient.describeTopics(Arrays.asList(topic)).allTopicNames().get();
return true;
} catch (Exception e) {
return false;
diff --git a/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/connector/kafka/testutils/KafkaSourceExternalContext.java b/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/connector/kafka/testutils/KafkaSourceExternalContext.java
index 67b214bc1c6..658a1c90f93 100644
--- a/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/connector/kafka/testutils/KafkaSourceExternalContext.java
+++ b/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/connector/kafka/testutils/KafkaSourceExternalContext.java
@@ -190,7 +190,10 @@ public class KafkaSourceExternalContext implements DataStreamSourceExternalConte
final Set<String> topics = adminClient.listTopics().names().get();
if (topics.contains(topicName)) {
final Map<String, TopicDescription> topicDescriptions =
- adminClient.describeTopics(Collections.singletonList(topicName)).all().get();
+ adminClient
+ .describeTopics(Collections.singletonList(topicName))
+ .allTopicNames()
+ .get();
final int numPartitions = topicDescriptions.get(topicName).partitions().size();
LOG.info("Creating partition {} for topic '{}'", numPartitions + 1, topicName);
adminClient
diff --git a/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestEnvironmentImpl.java b/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestEnvironmentImpl.java
index 0ef16f76458..c5bc3b00349 100644
--- a/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestEnvironmentImpl.java
+++ b/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestEnvironmentImpl.java
@@ -180,7 +180,7 @@ public class KafkaTestEnvironmentImpl extends KafkaTestEnvironment {
topicDescriptions =
adminClient
.describeTopics(Collections.singleton(topic))
- .all()
+ .allTopicNames()
.get(REQUEST_TIMEOUT_SECONDS, TimeUnit.SECONDS);
} catch (Exception e) {
LOG.warn("Exception caught when describing Kafka topics", e);
@@ -331,7 +331,10 @@ public class KafkaTestEnvironmentImpl extends KafkaTestEnvironment {
public int getLeaderToShutDown(String topic) throws Exception {
try (final AdminClient client = AdminClient.create(getStandardProperties())) {
TopicDescription result =
- client.describeTopics(Collections.singleton(topic)).all().get().get(topic);
+ client.describeTopics(Collections.singleton(topic))
+ .allTopicNames()
+ .get()
+ .get(topic);
return result.partitions().get(0).leader().id();
}
}
diff --git a/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/table/KafkaTableTestBase.java b/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/table/KafkaTableTestBase.java
index 10b11ab2b58..f80a54fc96c 100644
--- a/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/table/KafkaTableTestBase.java
+++ b/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/table/KafkaTableTestBase.java
@@ -199,7 +199,7 @@ public abstract class KafkaTableTestBase extends AbstractTestBase {
.map(TopicListing::name)
.collect(Collectors.toList());
- return adminClient.describeTopics(topics).all().get();
+ return adminClient.describeTopics(topics).allTopicNames().get();
} catch (Exception e) {
throw new RuntimeException("Failed to list Kafka topics", e);
}
[flink] 02/02: [FLINK-30056][kafka] Use new Consumer#poll(Duration)
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 5e0e0fde6305577192fe8020fcb1fa8ca3bd115e
Author: Sergey Nuyanzin <sn...@gmail.com>
AuthorDate: Wed Nov 23 13:14:50 2022 +0100
[FLINK-30056][kafka] Use new Consumer#poll(Duration)
This changes the blocking behavior, as the previous method essentially ignored the timeout.
---
.../streaming/connectors/kafka/internals/KafkaConsumerThread.java | 3 ++-
.../streaming/connectors/kafka/FlinkKafkaInternalProducerITCase.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/flink-connectors/flink-connector-kafka/src/main/java/org/apache/flink/streaming/connectors/kafka/internals/KafkaConsumerThread.java b/flink-connectors/flink-connector-kafka/src/main/java/org/apache/flink/streaming/connectors/kafka/internals/KafkaConsumerThread.java
index 4c4cc907944..f7f40b80bae 100644
--- a/flink-connectors/flink-connector-kafka/src/main/java/org/apache/flink/streaming/connectors/kafka/internals/KafkaConsumerThread.java
+++ b/flink-connectors/flink-connector-kafka/src/main/java/org/apache/flink/streaming/connectors/kafka/internals/KafkaConsumerThread.java
@@ -36,6 +36,7 @@ import org.slf4j.Logger;
import javax.annotation.Nonnull;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -258,7 +259,7 @@ public class KafkaConsumerThread<T> extends Thread {
// over
if (records == null) {
try {
- records = consumer.poll(pollTimeout);
+ records = consumer.poll(Duration.ofMillis(pollTimeout));
} catch (WakeupException we) {
continue;
}
diff --git a/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaInternalProducerITCase.java b/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaInternalProducerITCase.java
index b9ed7d92f14..2f393374aab 100644
--- a/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaInternalProducerITCase.java
+++ b/flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaInternalProducerITCase.java
@@ -238,7 +238,7 @@ public class FlinkKafkaInternalProducerITCase extends KafkaTestBase {
kafkaConsumer.subscribe(Collections.singletonList(topicName));
ConsumerRecords<String, String> records = ConsumerRecords.empty();
while (records.isEmpty()) {
- records = kafkaConsumer.poll(10000);
+ records = kafkaConsumer.poll(Duration.ofMillis(10000));
}
ConsumerRecord<String, String> record = Iterables.getOnlyElement(records);