Skip to content
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
23 changes: 14 additions & 9 deletions be/src/runtime/routine_load/data_consumer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,20 @@ Status KafkaDataConsumer::group_consume(BlockingQueue<RdKafka::Message*>* queue,
break;
}
[[fallthrough]];
case RdKafka::ERR__PARTITION_EOF: {
LOG(INFO) << "consumer meet partition eof: " << _id
<< " partition offset: " << msg->offset();
_consuming_partition_ids.erase(msg->partition());
if (!queue->blocking_put(msg.get())) {
done = true;
} else if (_consuming_partition_ids.size() <= 0) {
msg.release();
done = true;
} else {
msg.release();
}
break;
}
case RdKafka::ERR_OFFSET_OUT_OF_RANGE: {
done = true;
std::stringstream ss;
Expand All @@ -269,15 +283,6 @@ Status KafkaDataConsumer::group_consume(BlockingQueue<RdKafka::Message*>* queue,
st = Status::InternalError<false>(ss.str());
break;
}
case RdKafka::ERR__PARTITION_EOF: {
LOG(INFO) << "consumer meet partition eof: " << _id
<< " partition offset: " << msg->offset();
_consuming_partition_ids.erase(msg->partition());
if (_consuming_partition_ids.size() <= 0) {
done = true;
}
break;
}
default:
LOG(WARNING) << "kafka consume failed: " << _id << ", msg: " << msg->errstr();
done = true;
Expand Down
36 changes: 21 additions & 15 deletions be/src/runtime/routine_load/data_consumer_group.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,22 +162,28 @@ Status KafkaDataConsumerGroup::start_all(std::shared_ptr<StreamLoadContext> ctx,
<< ", partition: " << msg->partition() << ", offset: " << msg->offset()
<< ", len: " << msg->len();

Status st = (kafka_pipe.get()->*append_data)(static_cast<const char*>(msg->payload()),
static_cast<size_t>(msg->len()));
if (st.ok()) {
left_rows--;
left_bytes -= msg->len();
cmt_offset[msg->partition()] = msg->offset();
VLOG_NOTICE << "consume partition[" << msg->partition() << " - " << msg->offset()
<< "]";
if (msg->err() == RdKafka::ERR__PARTITION_EOF) {
if (msg->offset() > 0) {
cmt_offset[msg->partition()] = msg->offset() - 1;
}
} else {
// failed to append this msg, we must stop
LOG(WARNING) << "failed to append msg to pipe. grp: " << _grp_id;
eos = true;
{
std::unique_lock<std::mutex> lock(_mutex);
if (result_st.ok()) {
result_st = st;
Status st = (kafka_pipe.get()->*append_data)(
static_cast<const char*>(msg->payload()), static_cast<size_t>(msg->len()));
if (st.ok()) {
left_rows--;
left_bytes -= msg->len();
cmt_offset[msg->partition()] = msg->offset();
VLOG_NOTICE << "consume partition[" << msg->partition() << " - "
<< msg->offset() << "]";
} else {
// failed to append this msg, we must stop
LOG(WARNING) << "failed to append msg to pipe. grp: " << _grp_id;
eos = true;
{
std::unique_lock<std::mutex> lock(_mutex);
if (result_st.ok()) {
result_st = st;
}
}
}
}
Expand Down