chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "修复kafka消费回滚的bug (#2521)"

Browse Source 
This reverts commit 31acfc0101.
This commit is contained in:
rewerma
2020-01-02 17:03:13 +08:00
committed by GitHub
parent 31acfc0101
commit 21e9b325b1
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/AbstractCanalAdapterWorker.java
View File

@@ -174,11 +174,6 @@ public abstract class AbstractCanalAdapterWorker {
if (i == retry - 1) { if (i == retry - 1) {
connector.ack(); connector.ack();
logger.error(e.getMessage() + " Error sync but ACK!"); logger.error(e.getMessage() + " Error sync but ACK!");
try {
Thread.sleep(500);
} catch (InterruptedException e1) {
// ignore
}
return true; return true;
} else { } else {
connector.rollback(); connector.rollback();

30
client/src/main/java/com/alibaba/otter/canal/client/kafka/KafkaCanalConnector.java
View File

@@ -61,11 +61,11 @@ public class KafkaCanalConnector implements CanalMQConnector {
batchSize = 100; batchSize = 100;
} }
properties.put("max.poll.records", batchSize.toString()); properties.put("max.poll.records", batchSize.toString());
properties.put("key.deserializer", StringDeserializer.class); properties.put("key.deserializer", StringDeserializer.class.getName());
if (!flatMessage) { if (!flatMessage) {
properties.put("value.deserializer", MessageDeserializer.class); properties.put("value.deserializer", MessageDeserializer.class.getName());
} else { } else {
properties.put("value.deserializer", StringDeserializer.class); properties.put("value.deserializer", StringDeserializer.class.getName());
} }
} }
@@ -183,13 +183,14 @@ public class KafkaCanalConnector implements CanalMQConnector {
ConsumerRecords<String, Message> records = kafkaConsumer.poll(unit.toMillis(timeout)); ConsumerRecords<String, Message> records = kafkaConsumer.poll(unit.toMillis(timeout));
currentOffsets.clear();
for (TopicPartition topicPartition : records.partitions()) {
currentOffsets.put(topicPartition.partition(), kafkaConsumer.position(topicPartition));
}
if (!records.isEmpty()) { if (!records.isEmpty()) {
currentOffsets.clear();
List<Message> messages = new ArrayList<>(); List<Message> messages = new ArrayList<>();
for (ConsumerRecord<String, Message> record : records) { for (ConsumerRecord<String, Message> record : records) {
if (currentOffsets.get(record.partition()) == null) {
currentOffsets.put(record.partition(), record.offset());
}
messages.add(record.value()); messages.add(record.value());
} }
return messages; return messages;
@@ -220,13 +221,14 @@ public class KafkaCanalConnector implements CanalMQConnector {
ConsumerRecords<String, String> records = kafkaConsumer2.poll(unit.toMillis(timeout)); ConsumerRecords<String, String> records = kafkaConsumer2.poll(unit.toMillis(timeout));
currentOffsets.clear();
for (TopicPartition topicPartition : records.partitions()) {
currentOffsets.put(topicPartition.partition(), kafkaConsumer2.position(topicPartition));
}
if (!records.isEmpty()) { if (!records.isEmpty()) {
currentOffsets.clear();
List<FlatMessage> flatMessages = new ArrayList<>(); List<FlatMessage> flatMessages = new ArrayList<>();
for (ConsumerRecord<String, String> record : records) { for (ConsumerRecord<String, String> record : records) {
if (currentOffsets.get(record.partition()) == null) {
currentOffsets.put(record.partition(), record.offset());
}
String flatMessageJson = record.value(); String flatMessageJson = record.value();
FlatMessage flatMessage = JSON.parseObject(flatMessageJson, FlatMessage.class); FlatMessage flatMessage = JSON.parseObject(flatMessageJson, FlatMessage.class);
flatMessages.add(flatMessage); flatMessages.add(flatMessage);
@@ -246,14 +248,12 @@ public class KafkaCanalConnector implements CanalMQConnector {
// 回滚所有分区 // 回滚所有分区
if (kafkaConsumer != null) { if (kafkaConsumer != null) {
for (Map.Entry<Integer, Long> entry : currentOffsets.entrySet()) { for (Map.Entry<Integer, Long> entry : currentOffsets.entrySet()) {
kafkaConsumer.seek(new TopicPartition(topic, entry.getKey()), currentOffsets.get(entry.getKey())); kafkaConsumer.seek(new TopicPartition(topic, entry.getKey()), entry.getValue() - 1);
kafkaConsumer.commitSync();
} }
} }
if (kafkaConsumer2 != null) { if (kafkaConsumer2 != null) {
for (Map.Entry<Integer, Long> entry : currentOffsets.entrySet()) { for (Map.Entry<Integer, Long> entry : currentOffsets.entrySet()) {
kafkaConsumer2.seek(new TopicPartition(topic, entry.getKey()), currentOffsets.get(entry.getKey())); kafkaConsumer2.seek(new TopicPartition(topic, entry.getKey()), entry.getValue() - 1);
kafkaConsumer.commitSync();
} }
} }
} }