Skip to content

MINOR: Batch the produce in Connect integration tests #23028

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

Closed
mingyen066 wants to merge 1 commit into from
Closed

MINOR: Batch the produce in Connect integration tests #23028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions ...time/src/test/java/org/apache/kafka/connect/integration/ErrorHandlingIntegrationTest.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.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.config.ConfigDef;
import org.apache.kafka.common.header.Headers;
import org.apache.kafka.connect.connector.ConnectRecord;
Expand All @@ -41,6 +42,7 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;

import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG;
import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLIENT_CONSUMER_OVERRIDES_PREFIX;
Expand Down Expand Up @@ -144,9 +146,9 @@ public void testSkipRetryAndDLQWithHeaders() throws Exception {
"Connector task was not assigned a partition.");

// produce some strings into test topic
for (int i = 0; i < NUM_RECORDS_PRODUCED; i++) {
connect.kafka().produce("test-topic", "key-" + i, "value-" + i);
}
connect.kafka().produce(IntStream.range(0, NUM_RECORDS_PRODUCED)
.mapToObj(i -> new ProducerRecord<>("test-topic", ("key-" + i).getBytes(), ("value-" + i).getBytes()))
.toList());

// consume all records from test topic
log.info("Consuming records from test topic");
Expand Down Expand Up @@ -223,9 +225,9 @@ public void testErrantRecordReporter() throws Exception {
"Connector task was not assigned a partition.");

// produce some strings into test topic
for (int i = 0; i < NUM_RECORDS_PRODUCED; i++) {
connect.kafka().produce("test-topic", "key-" + i, "value-" + i);
}
connect.kafka().produce(IntStream.range(0, NUM_RECORDS_PRODUCED)
.mapToObj(i -> new ProducerRecord<>("test-topic", ("key-" + i).getBytes(), ("value-" + i).getBytes()))
.toList());

// consume all records from test topic
log.info("Consuming records from test topic");
Expand Down
8 changes: 5 additions & 3 deletions ...ime/src/test/java/org/apache/kafka/connect/integration/ExampleConnectIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.kafka.connect.integration;

import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.connect.runtime.rest.entities.ConnectorStateInfo;
import org.apache.kafka.connect.storage.StringConverter;
import org.apache.kafka.connect.util.clusters.EmbeddedConnectCluster;
Expand All @@ -31,6 +32,7 @@
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;

import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG;
import static org.apache.kafka.connect.runtime.ConnectorConfig.KEY_CONVERTER_CLASS_CONFIG;
Expand Down Expand Up @@ -146,9 +148,9 @@ public void testSinkConnector() throws Exception {
"Connector tasks were not assigned a partition each.");

// produce some messages into source topic partitions
for (int i = 0; i < NUM_RECORDS_PRODUCED; i++) {
connect.kafka().produce("test-topic", i % NUM_TOPIC_PARTITIONS, "key", "simple-message-value-" + i);
}
connect.kafka().produce(IntStream.range(0, NUM_RECORDS_PRODUCED)
.mapToObj(i -> new ProducerRecord<>("test-topic", i % NUM_TOPIC_PARTITIONS, "key".getBytes(), ("simple-message-value-" + i).getBytes()))
.toList());

// consume all records from the source topic or fail, to ensure that they were correctly produced.
assertEquals(NUM_RECORDS_PRODUCED,
Expand Down
8 changes: 5 additions & 3 deletions ...me/src/test/java/org/apache/kafka/connect/integration/MonitorableSinkIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.kafka.connect.integration;

import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.MetricName;
import org.apache.kafka.common.metrics.KafkaMetric;
import org.apache.kafka.connect.runtime.rest.entities.ConnectorStateInfo;
Expand All @@ -32,6 +33,7 @@

import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;

import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG;
import static org.apache.kafka.connect.runtime.ConnectorConfig.KEY_CONVERTER_CLASS_CONFIG;
Expand Down Expand Up @@ -111,9 +113,9 @@ public void testMonitorableSinkConnectorAndTask() throws Exception {
assertEquals(MonitorableSinkConnector.VALUE, kafkaMetric.metricValue());

// produce some records
for (int i = 0; i < NUM_RECORDS_PRODUCED; i++) {
connect.kafka().produce("test-topic", "key-" + i, "value-" + i);
}
connect.kafka().produce(IntStream.range(0, NUM_RECORDS_PRODUCED)
.mapToObj(i -> new ProducerRecord<>("test-topic", ("key-" + i).getBytes(), ("value-" + i).getBytes()))
.toList());

// wait for records to reach the task
connectorHandle.taskHandle(TASK_ID).awaitRecords(CONSUME_MAX_DURATION_MS);
Expand Down
20 changes: 11 additions & 9 deletions ...ime/src/test/java/org/apache/kafka/connect/integration/TransformationIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.kafka.connect.integration;

import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.connect.storage.StringConverter;
import org.apache.kafka.connect.transforms.Filter;
import org.apache.kafka.connect.transforms.predicates.HasHeaderKey;
Expand All @@ -33,6 +34,7 @@
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;

import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG;
import static org.apache.kafka.connect.runtime.ConnectorConfig.KEY_CONVERTER_CLASS_CONFIG;
Expand Down Expand Up @@ -146,12 +148,12 @@ public void testFilterOnTopicNameWithSinkConnector() throws Exception {
assertConnectorRunning();

// produce some messages into source topic partitions
for (int i = 0; i < numBarRecords; i++) {
connect.kafka().produce(barTopic, i % NUM_TOPIC_PARTITIONS, "key", "simple-message-value-" + i);
}
for (int i = 0; i < numFooRecords; i++) {
connect.kafka().produce(fooTopic, i % NUM_TOPIC_PARTITIONS, "key", "simple-message-value-" + i);
}
connect.kafka().produce(IntStream.range(0, numBarRecords)
.mapToObj(i -> new ProducerRecord<>(barTopic, i % NUM_TOPIC_PARTITIONS, "key".getBytes(), ("simple-message-value-" + i).getBytes()))
.toList());
connect.kafka().produce(IntStream.range(0, numFooRecords)
.mapToObj(i -> new ProducerRecord<>(fooTopic, i % NUM_TOPIC_PARTITIONS, "key".getBytes(), ("simple-message-value-" + i).getBytes()))
.toList());

// consume all records from the source topic or fail, to ensure that they were correctly produced.
assertEquals(
Expand Down Expand Up @@ -235,9 +237,9 @@ public void testFilterOnTombstonesWithSinkConnector() throws Exception {
assertConnectorRunning();

// produce some messages into source topic partitions
for (int i = 0; i < numRecords; i++) {
connect.kafka().produce(topic, i % NUM_TOPIC_PARTITIONS, "key", i % 2 == 0 ? "simple-message-value-" + i : null);
}
connect.kafka().produce(IntStream.range(0, numRecords)
.mapToObj(i -> new ProducerRecord<>(topic, i % NUM_TOPIC_PARTITIONS, "key".getBytes(), i % 2 == 0 ? ("simple-message-value-" + i).getBytes() : null))
.toList());

// consume all records from the source topic or fail, to ensure that they were correctly produced.
assertEquals(
Expand Down
16 changes: 11 additions & 5 deletions ...me/src/testFixtures/java/org/apache/kafka/connect/util/clusters/EmbeddedKafkaCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,11 +414,17 @@ public void produce(String topic, String key, String value) {
}

public void produce(String topic, Integer partition, String key, String value) {
ProducerRecord<byte[], byte[]> msg = new ProducerRecord<>(topic, partition, key == null ? null : key.getBytes(), value == null ? null : value.getBytes());
try {
producer.send(msg).get(DEFAULT_PRODUCE_SEND_DURATION_MS, TimeUnit.MILLISECONDS);
} catch (Exception e) {
throw new KafkaException("Could not produce message: " + msg, e);
produce(List.of(new ProducerRecord<>(topic, partition, key == null ? null : key.getBytes(), value == null ? null : value.getBytes())));
}

public void produce(List<ProducerRecord<byte[], byte[]>> records) {
var futures = records.stream().map(producer::send).toList();
for (int i = 0; i < futures.size(); i++) {
try {
futures.get(i).get(DEFAULT_PRODUCE_SEND_DURATION_MS, TimeUnit.MILLISECONDS);
} catch (Exception e) {
throw new KafkaException("Could not produce message: " + records.get(i), e);
}
}
}

Expand Down
Loading