Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lijianghuflute
canal
提交
f742bd73
canal
项目概览
lijianghuflute
/
canal
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
canal
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f742bd73
编写于
1月 04, 2020
作者:
R
rewerma
提交者:
GitHub
1月 04, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Revert "修复kafka消费回滚的bug (#2521)" (#2526)"
This reverts commit
b6333f01
.
上级
b6333f01
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
15 deletion
+20
-15
client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/AbstractCanalAdapterWorker.java
...l/adapter/launcher/loader/AbstractCanalAdapterWorker.java
+5
-0
client/src/main/java/com/alibaba/otter/canal/client/kafka/KafkaCanalConnector.java
...alibaba/otter/canal/client/kafka/KafkaCanalConnector.java
+15
-15
未找到文件。
client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/AbstractCanalAdapterWorker.java
浏览文件 @
f742bd73
...
...
@@ -174,6 +174,11 @@ public abstract class AbstractCanalAdapterWorker {
if
(
i
==
retry
-
1
)
{
connector
.
ack
();
logger
.
error
(
e
.
getMessage
()
+
" Error sync but ACK!"
);
try
{
Thread
.
sleep
(
500
);
}
catch
(
InterruptedException
e1
)
{
// ignore
}
return
true
;
}
else
{
connector
.
rollback
();
...
...
client/src/main/java/com/alibaba/otter/canal/client/kafka/KafkaCanalConnector.java
浏览文件 @
f742bd73
...
...
@@ -61,11 +61,11 @@ public class KafkaCanalConnector implements CanalMQConnector {
batchSize
=
100
;
}
properties
.
put
(
"max.poll.records"
,
batchSize
.
toString
());
properties
.
put
(
"key.deserializer"
,
StringDeserializer
.
class
.
getName
()
);
properties
.
put
(
"key.deserializer"
,
StringDeserializer
.
class
);
if
(!
flatMessage
)
{
properties
.
put
(
"value.deserializer"
,
MessageDeserializer
.
class
.
getName
()
);
properties
.
put
(
"value.deserializer"
,
MessageDeserializer
.
class
);
}
else
{
properties
.
put
(
"value.deserializer"
,
StringDeserializer
.
class
.
getName
()
);
properties
.
put
(
"value.deserializer"
,
StringDeserializer
.
class
);
}
}
...
...
@@ -183,14 +183,13 @@ public class KafkaCanalConnector implements CanalMQConnector {
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
())
{
currentOffsets
.
clear
();
List
<
Message
>
messages
=
new
ArrayList
<>();
for
(
ConsumerRecord
<
String
,
Message
>
record
:
records
)
{
if
(
currentOffsets
.
get
(
record
.
partition
())
==
null
)
{
currentOffsets
.
put
(
record
.
partition
(),
record
.
offset
());
}
messages
.
add
(
record
.
value
());
}
return
messages
;
...
...
@@ -221,14 +220,13 @@ public class KafkaCanalConnector implements CanalMQConnector {
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
())
{
currentOffsets
.
clear
();
List
<
FlatMessage
>
flatMessages
=
new
ArrayList
<>();
for
(
ConsumerRecord
<
String
,
String
>
record
:
records
)
{
if
(
currentOffsets
.
get
(
record
.
partition
())
==
null
)
{
currentOffsets
.
put
(
record
.
partition
(),
record
.
offset
());
}
String
flatMessageJson
=
record
.
value
();
FlatMessage
flatMessage
=
JSON
.
parseObject
(
flatMessageJson
,
FlatMessage
.
class
);
flatMessages
.
add
(
flatMessage
);
...
...
@@ -248,12 +246,14 @@ public class KafkaCanalConnector implements CanalMQConnector {
// 回滚所有分区
if
(
kafkaConsumer
!=
null
)
{
for
(
Map
.
Entry
<
Integer
,
Long
>
entry
:
currentOffsets
.
entrySet
())
{
kafkaConsumer
.
seek
(
new
TopicPartition
(
topic
,
entry
.
getKey
()),
entry
.
getValue
()
-
1
);
kafkaConsumer
.
seek
(
new
TopicPartition
(
topic
,
entry
.
getKey
()),
currentOffsets
.
get
(
entry
.
getKey
()));
kafkaConsumer
.
commitSync
();
}
}
if
(
kafkaConsumer2
!=
null
)
{
for
(
Map
.
Entry
<
Integer
,
Long
>
entry
:
currentOffsets
.
entrySet
())
{
kafkaConsumer2
.
seek
(
new
TopicPartition
(
topic
,
entry
.
getKey
()),
entry
.
getValue
()
-
1
);
kafkaConsumer2
.
seek
(
new
TopicPartition
(
topic
,
entry
.
getKey
()),
currentOffsets
.
get
(
entry
.
getKey
()));
kafkaConsumer
.
commitSync
();
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录