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 kafka]Fix Kafka consumer stop fetching after TM node restarted #7233

Merged
merged 4 commits into from
Jul 22, 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,6 +30,7 @@
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.common.TopicPartition;

import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;

import java.io.IOException;
Expand Down Expand Up @@ -82,6 +83,20 @@ public class KafkaSourceSplitEnumerator
this.discoveryIntervalMillis = kafkaSourceConfig.getDiscoveryIntervalMillis();
}

@VisibleForTesting
protected KafkaSourceSplitEnumerator(
AdminClient adminClient,
Map<TopicPartition, KafkaSourceSplit> pendingSplit,
Map<TopicPartition, KafkaSourceSplit> assignedSplit) {
this.tablePathMetadataMap = new HashMap<>();
this.context = null;
this.discoveryIntervalMillis = -1;
this.adminClient = adminClient;
this.kafkaSourceConfig = null;
this.pendingSplit = pendingSplit;
this.assignedSplit = assignedSplit;
}

@Override
public void open() {
if (discoveryIntervalMillis > 0) {
Expand Down Expand Up @@ -180,7 +195,10 @@ public void close() throws IOException {
@Override
public void addSplitsBack(List<KafkaSourceSplit> splits, int subtaskId) {
if (!splits.isEmpty()) {
pendingSplit.putAll(convertToNextSplit(splits));
Map<TopicPartition, ? extends KafkaSourceSplit> nextSplit = convertToNextSplit(splits);
// remove them from the assignedSplit, so we can reassign them
nextSplit.keySet().forEach(assignedSplit::remove);
pendingSplit.putAll(nextSplit);
}
}

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

import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.admin.KafkaAdminClient;
import org.apache.kafka.clients.admin.ListOffsetsResult;
import org.apache.kafka.common.KafkaFuture;
import org.apache.kafka.common.TopicPartition;

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

import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

class KafkaSourceSplitEnumeratorTest {

@Test
void addSplitsBack() {
Copy link
Member

Choose a reason for hiding this comment

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

This test case can be optimized. For example, we can directly construct a new KafkaSourceSplitEnumerator class, and then initialize our pendingSplit and assginSplit by override the open method. Then we can call public void addSplitsBack(List<KafkaSourceSplit> splits, int subtaskId) for testing. Please refer

// prepare
TopicPartition partition = new TopicPartition("test", 0);

AdminClient adminClient = Mockito.mock(KafkaAdminClient.class);
Mockito.when(adminClient.listOffsets(Mockito.any(java.util.Map.class)))
.thenReturn(
new ListOffsetsResult(
new HashMap<
TopicPartition,
KafkaFuture<ListOffsetsResult.ListOffsetsResultInfo>>() {
{
put(
partition,
KafkaFuture.completedFuture(
new ListOffsetsResult.ListOffsetsResultInfo(
0, 0, Optional.of(0))));
}
}));

// test
Map<TopicPartition, KafkaSourceSplit> assignedSplit =
new HashMap<TopicPartition, KafkaSourceSplit>() {
{
put(partition, new KafkaSourceSplit(null, partition));
}
};
Map<TopicPartition, KafkaSourceSplit> pendingSplit = new HashMap<>();
List<KafkaSourceSplit> splits = Arrays.asList(new KafkaSourceSplit(null, partition));
KafkaSourceSplitEnumerator enumerator =
new KafkaSourceSplitEnumerator(adminClient, pendingSplit, assignedSplit);
enumerator.addSplitsBack(splits, 1);
Assertions.assertTrue(pendingSplit.size() == splits.size());
Assertions.assertNull(assignedSplit.get(partition));
}
}
Loading