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.

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

Fixing out-kafka plugin hung issue #2553

Closed
wants to merge 3 commits into from
+4 −16
Closed

Fixing out-kafka plugin hung issue #2553

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6090f3b
Update CMakeLists.txt
serkantkaraca Sep 15, 2020
95139f8
Keep retrying produce call when rdkafka queue is full.
serkantkaraca Sep 15, 2020
14a2a15
Rollback unintended cmake config change.
serkantkaraca Sep 15, 2020
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
20 changes: 4 additions & 16 deletions plugins/out_kafka/kafka.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ int produce_message(struct flb_time *tm, msgpack_object *map,
int i;
int ret;
int size;
int queue_full_retries = 0;
char *out_buf;
size_t out_size;
struct mk_list *head;
Expand Down Expand Up @@ -266,17 +265,6 @@ int produce_message(struct flb_time *tm, msgpack_object *map,
}

retry:
if (queue_full_retries >= 10) {
if (ctx->format == FLB_KAFKA_FMT_JSON) {
flb_free(out_buf);
}
if (ctx->format == FLB_KAFKA_FMT_GELF) {
flb_sds_destroy(s);
}
msgpack_sbuffer_destroy(&mp_sbuf);
return FLB_RETRY;
}

ret = rd_kafka_produce(topic->tp,
RD_KAFKA_PARTITION_UA,
RD_KAFKA_MSG_F_COPY,
Expand All @@ -290,8 +278,9 @@ int produce_message(struct flb_time *tm, msgpack_object *map,
rd_kafka_err2str(rd_kafka_last_error()));

/*
* rdkafka queue is full, keep trying 'locally' for a few seconds,
* otherwise let the caller to issue a main retry againt the engine.
* rdkafka queue is full, keep retrying when queue is full.
* We need at least one produce task retrying here so that it can
* set ctx->blocked back to FLB_FALSE when queue is flushed.
*/
if (rd_kafka_last_error() == RD_KAFKA_RESP_ERR__QUEUE_FULL) {
flb_plg_warn(ctx->ins, "internal queue is full, "
Expand All @@ -316,8 +305,7 @@ int produce_message(struct flb_time *tm, msgpack_object *map,
flb_time_sleep(1000, config);
rd_kafka_poll(ctx->producer, 0);

/* Issue a re-try */
queue_full_retries++;
/* Issue a retry. */
goto retry;
}
}
Expand Down