rhauch commented on a change in pull request #8720: URL: https://github.com/apache/kafka/pull/8720#discussion_r431474116
########## File path: connect/runtime/src/main/java/org/apache/kafka/connect/runtime/InternalSinkRecord.java ########## @@ -0,0 +1,79 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.kafka.connect.runtime; + +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.common.record.TimestampType; +import org.apache.kafka.connect.data.Schema; +import org.apache.kafka.connect.header.Header; +import org.apache.kafka.connect.sink.SinkRecord; + +public class InternalSinkRecord extends SinkRecord { + + private final ConsumerRecord<byte[], byte[]> originalRecord; + + public InternalSinkRecord(ConsumerRecord<byte[], byte[]> originalRecord, SinkRecord record) { + super(record.topic(), record.kafkaPartition(), record.keySchema(), record.key(), + record.valueSchema(), record.value(), record.kafkaOffset(), record.timestamp(), + record.timestampType(), record.headers()); + this.originalRecord = originalRecord; + } + + public InternalSinkRecord(ConsumerRecord<byte[], byte[]> originalRecord, String topic, + int partition, Schema keySchema, Object key, Schema valueSchema, + Object value, long kafkaOffset, Long timestamp, + TimestampType timestampType, Iterable<Header> headers) { + super(topic, partition, keySchema, key, valueSchema, value, kafkaOffset, timestamp, timestampType, headers); + this.originalRecord = originalRecord; + } + + @Override + public SinkRecord newRecord(String topic, Integer kafkaPartition, Schema keySchema, Object key, + Schema valueSchema, Object value, Long timestamp, + Iterable<Header> headers) { + return new InternalSinkRecord(originalRecord, topic, kafkaPartition, keySchema, key, + valueSchema, value, kafkaOffset(), timestamp, timestampType(), headers()); + } + + @Override + public boolean equals(Object o) { + return super.equals(o); + } + + @Override + public int hashCode() { + return super.hashCode(); + } + + @Override + public String toString() { + return "InternalSinkRecord{" + + "consumerRecord=" + originalRecord.toString() + + "} " + super.toString(); Review comment: Hmm, let's just have this delegate to the super method. It's internal, so we need not include the original record details. ```suggestion return super.toString(); ``` ########## File path: connect/runtime/src/main/java/org/apache/kafka/connect/runtime/errors/WorkerErrantRecordReporter.java ########## @@ -0,0 +1,173 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.connect.runtime.errors; + +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.clients.producer.RecordMetadata; +import org.apache.kafka.common.header.internals.RecordHeaders; +import org.apache.kafka.connect.errors.ConnectException; +import org.apache.kafka.connect.header.Header; +import org.apache.kafka.connect.runtime.InternalSinkRecord; +import org.apache.kafka.connect.sink.ErrantRecordReporter; +import org.apache.kafka.connect.sink.SinkRecord; + +import org.apache.kafka.connect.sink.SinkTask; +import org.apache.kafka.connect.storage.Converter; +import org.apache.kafka.connect.storage.HeaderConverter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +public class WorkerErrantRecordReporter implements ErrantRecordReporter { + + private static final Logger log = LoggerFactory.getLogger(WorkerErrantRecordReporter.class); + + private RetryWithToleranceOperator retryWithToleranceOperator; + private Converter keyConverter; + private Converter valueConverter; + private HeaderConverter headerConverter; Review comment: These can be final. ########## File path: connect/runtime/src/main/java/org/apache/kafka/connect/runtime/InternalSinkRecord.java ########## @@ -0,0 +1,79 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.kafka.connect.runtime; + +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.common.record.TimestampType; +import org.apache.kafka.connect.data.Schema; +import org.apache.kafka.connect.header.Header; +import org.apache.kafka.connect.sink.SinkRecord; + +public class InternalSinkRecord extends SinkRecord { + + private final ConsumerRecord<byte[], byte[]> originalRecord; + + public InternalSinkRecord(ConsumerRecord<byte[], byte[]> originalRecord, SinkRecord record) { + super(record.topic(), record.kafkaPartition(), record.keySchema(), record.key(), + record.valueSchema(), record.value(), record.kafkaOffset(), record.timestamp(), + record.timestampType(), record.headers()); + this.originalRecord = originalRecord; + } + + public InternalSinkRecord(ConsumerRecord<byte[], byte[]> originalRecord, String topic, Review comment: Let's make this protected. ```suggestion protected InternalSinkRecord(ConsumerRecord<byte[], byte[]> originalRecord, String topic, ``` ########## File path: connect/runtime/src/main/java/org/apache/kafka/connect/runtime/errors/WorkerErrantRecordReporter.java ########## @@ -0,0 +1,173 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.connect.runtime.errors; + +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.clients.producer.RecordMetadata; +import org.apache.kafka.common.header.internals.RecordHeaders; +import org.apache.kafka.connect.errors.ConnectException; +import org.apache.kafka.connect.header.Header; +import org.apache.kafka.connect.runtime.InternalSinkRecord; +import org.apache.kafka.connect.sink.ErrantRecordReporter; +import org.apache.kafka.connect.sink.SinkRecord; + +import org.apache.kafka.connect.sink.SinkTask; +import org.apache.kafka.connect.storage.Converter; +import org.apache.kafka.connect.storage.HeaderConverter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +public class WorkerErrantRecordReporter implements ErrantRecordReporter { + + private static final Logger log = LoggerFactory.getLogger(WorkerErrantRecordReporter.class); + + private RetryWithToleranceOperator retryWithToleranceOperator; + private Converter keyConverter; + private Converter valueConverter; + private HeaderConverter headerConverter; + + // Visible for testing + final LinkedList<Future<Void>> futures; + + public WorkerErrantRecordReporter( + RetryWithToleranceOperator retryWithToleranceOperator, + Converter keyConverter, + Converter valueConverter, + HeaderConverter headerConverter + ) { + this.retryWithToleranceOperator = retryWithToleranceOperator; + this.keyConverter = keyConverter; + this.valueConverter = valueConverter; + this.headerConverter = headerConverter; + this.futures = new LinkedList<>(); + } + + @Override + public Future<Void> report(SinkRecord record, Throwable error) { + ConsumerRecord<byte[], byte[]> consumerRecord; + + // Most of the records will be an internal sink record, but the task could potentially + // report modified or new records, so handle both cases + if (record instanceof InternalSinkRecord) { + consumerRecord = ((InternalSinkRecord) record).originalRecord(); + } else { + // Generate a new consumer record from the modified sink record. We prefer + // to send the original consumer record (pre-transformed) to the DLQ, + // but in this case we don't have one and send the potentially transformed + // record instead + String topic = record.topic(); + byte[] key = keyConverter.fromConnectData(topic, record.keySchema(), record.key()); + byte[] value = valueConverter.fromConnectData(topic, + record.valueSchema(), record.value()); + + RecordHeaders headers = new RecordHeaders(); + if (record.headers() != null) { + for (Header header : record.headers()) { + String headerKey = header.key(); + byte[] rawHeader = headerConverter.fromConnectHeader(topic, headerKey, + header.schema(), header.value()); + headers.add(headerKey, rawHeader); + } + } + + int keyLength = key != null ? key.length : -1; + int valLength = value != null ? value.length : -1; + + consumerRecord = new ConsumerRecord<>(record.topic(), record.kafkaPartition(), + record.kafkaOffset(), record.timestamp(), record.timestampType(), -1L, keyLength, + valLength, key, value, headers); + } + + Future<Void> future = retryWithToleranceOperator.executeFailed(Stage.TASK_PUT, + SinkTask.class, consumerRecord, error); + + if (!future.isDone()) { + futures.add(future); + } + return future; + } + + /** + * Gets all futures returned by the sink records sent to Kafka by the errant + * record reporter. This function is intended to be used to block on all the errant record + * futures. + */ + public void awaitAllFutures() { + Future<?> future = null; + while ((future = futures.poll()) != null) { + try { + future.get(); + } catch (InterruptedException | ExecutionException e) { + log.error("Encountered an error while awaiting an errant record future's " + + "completition."); Review comment: Nit: new line is unnecessary, and there's a misspelling: ```suggestion log.error("Encountered an error while awaiting an errant record future's completion."); ``` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
