Skip to content

fix: resolve data loss on async write failure rollback (Issue#46) #47

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.

Sign up for GitHub

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

Open
mujianping wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: resolve data loss on async write failure rollback (Issue#46) #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions .../agent-sink/src/main/java/com/didichuxing/datachannel/agent/sink/kafkaSink/KafkaSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,14 +370,14 @@ private boolean sendReally(List<KafkaEvent> kafkaEvents, byte[] content, boolean
Long start = TimeUtils.getNanoTime();
String key = EventUtils.getPartitionKey(this,
kafkaEvents.size() > 0 ? kafkaEvents.get(0) : new KafkaEvent(), topicPartitionKeyType);
String sourceItemKey = null;
String sourceKey = null;
long rate = -1L;

int bytes = 0;
for (KafkaEvent kafkaEvent : kafkaEvents) {
bytes += kafkaEvent.length();
if (StringUtils.isBlank(sourceItemKey)) {
sourceItemKey = kafkaEvent.getSourceItemKey();
if (StringUtils.isBlank(sourceKey)) {
sourceKey = kafkaEvent.getSourceKey();
}

if (rate == -1 || (rate != -1 && rate > kafkaEvent.getPreRate())) {
Expand All @@ -386,7 +386,7 @@ private boolean sendReally(List<KafkaEvent> kafkaEvents, byte[] content, boolean
}
}

if (sourceItemKey == null) {
if (sourceKey == null) {
return true;
}

Expand Down Expand Up @@ -421,7 +421,7 @@ private boolean sendReally(List<KafkaEvent> kafkaEvents, byte[] content, boolean
return producer.send(getTargetTopic(kafkaTargetConfig.getTopic()), key, content,
new KafkaCallBack(this, kafkaEvents.size(), bytes, start,
getTargetTopic(kafkaTargetConfig.getTopic()),
modelConfig.getCommonConfig().getModelId(), sourceItemKey, rate));
modelConfig.getCommonConfig().getModelId(), sourceKey, rate));
}
return true;
} catch (Exception e) {
Expand All @@ -447,7 +447,7 @@ private boolean sendByKey(KafkaEvent mqEvent, boolean isAsync) {
}
String key = EventUtils.getPartitionKey(this, mqEvent, topicPartitionKeyType);
int bytes = mqEvent.length();
String sourceItemKey = mqEvent.getSourceItemKey();
String sourceKey = mqEvent.getSourceKey();
long rate = mqEvent.getPreRate();
try {
if (!isAsync) {
Expand Down Expand Up @@ -481,7 +481,7 @@ private boolean sendByKey(KafkaEvent mqEvent, boolean isAsync) {
if (modelConfig.getTag().equals(Tags.TASK_LOG2KAFKA)) {
return producer.send(kafkaTargetConfig.getTopic(), key, contentToSend,
new KafkaCallBack(this, 1, bytes, start, kafkaTargetConfig.getTopic(),
modelConfig.getCommonConfig().getModelId(), sourceItemKey,
modelConfig.getCommonConfig().getModelId(), sourceKey,
rate));
} else {
//TODO：不支持其他处理方式
Expand Down