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.

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

[Fix][Connector-V2] Fix kafka format_error_handle_way not work #7838

Merged
merged 2 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ public final class Handover<T> implements Closeable {
new LinkedBlockingQueue<>(DEFAULT_QUEUE_SIZE);
private Throwable error;

public boolean isEmpty() {
public boolean isEmpty() throws Exception {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix Spark will finished even read data failed when read first row.

if (error != null) {
rethrowException(error, error.getMessage());
}
return blockingQueue.isEmpty();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* 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.seatunnel.common;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

public class HandoverTest {

@Test
public void testThrowExceptionWhenQueueIsEmtpy() {
Handover<Object> handover = new Handover<>();
handover.reportError(new RuntimeException("test"));
Assertions.assertThrows(RuntimeException.class, handover::isEmpty);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.util.Map;

public class KafkaRecordEmitter
Expand Down Expand Up @@ -71,13 +70,14 @@ public void emitRecord(
// consumerRecord.offset + 1 is the offset commit to Kafka and also the start offset
// for the next run
splitState.setCurrentOffset(consumerRecord.offset() + 1);
} catch (IOException e) {
} catch (Exception e) {
if (this.messageFormatErrorHandleWay == MessageFormatErrorHandleWay.SKIP) {
logger.warn(
"Deserialize message failed, skip this message, message: {}",
new String(consumerRecord.value()));
} else {
throw e;
}
throw e;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ public void testSourceKafkaJsonFormatErrorHandleWaySkipToConsole(TestContainer c
DEFAULT_FORMAT,
DEFAULT_FIELD_DELIMITER,
null);
generateTestData(row -> serializer.serializeRow(row), 0, 100);
generateTestData(serializer::serializeRow, 0, 100);
Container.ExecResult execResult =
container.executeJob(
"/kafka/kafkasource_format_error_handle_way_skip_to_console.conf");
Expand All @@ -308,11 +308,11 @@ public void testSourceKafkaJsonFormatErrorHandleWayFailToConsole(TestContainer c
DEFAULT_FORMAT,
DEFAULT_FIELD_DELIMITER,
null);
generateTestData(row -> serializer.serializeRow(row), 0, 100);
generateTestData(serializer::serializeRow, 0, 100);
Container.ExecResult execResult =
container.executeJob(
"/kafka/kafkasource_format_error_handle_way_fail_to_console.conf");
Assertions.assertEquals(0, execResult.getExitCode(), execResult.getStderr());
Assertions.assertEquals(1, execResult.getExitCode(), execResult.getStderr());
}

@TestTemplate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ source {
result_table_name = "kafka_table"
start_mode = "earliest"
format_error_handle_way = fail
format = text
schema = {
fields {
id = bigint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ source {
result_table_name = "kafka_table"
start_mode = "earliest"
format_error_handle_way = skip
format = text
schema = {
fields {
id = bigint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ public SeaTunnelInputPartitionReader(ParallelBatchPartitionReader partitionReade

@Override
public boolean next() throws IOException {
return partitionReader.next();
try {
return partitionReader.next();
} catch (Exception e) {
throw new RuntimeException(e);
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ protected String getEnumeratorThreadName() {
return String.format("parallel-split-enumerator-executor-%s", subtaskId);
}

public boolean next() throws IOException {
public boolean next() throws Exception {
prepare();
while (running && handover.isEmpty()) {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ protected String getEnumeratorThreadName() {
return String.format("parallel-split-enumerator-executor-%s", subtaskId);
}

public boolean next() throws IOException {
public boolean next() throws Exception {
prepare();
while (running && handover.isEmpty()) {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ public SeaTunnelBatchPartitionReader(ParallelBatchPartitionReader partitionReade

@Override
public boolean next() throws IOException {
return partitionReader.next();
try {
return partitionReader.next();
} catch (Exception e) {
throw new RuntimeException(e);
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ public SeaTunnelMicroBatchPartitionReader(ParallelBatchPartitionReader partition

@Override
public boolean next() throws IOException {
return partitionReader.next();
try {
return partitionReader.next();
} catch (Exception e) {
throw new RuntimeException(e);
}
}

@Override
Expand Down
Loading