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

PR fixes #4229

Merged
merged 3 commits into from
Mar 22, 2023
Merged

PR fixes #4229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a651a7
Fix purge TAILQ
emasab Mar 21, 2023
ba0c608
Remove some memory leaks
emasab Mar 21, 2023
7041c36
Fix type warnings
emasab Mar 21, 2023
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
19 changes: 9 additions & 10 deletions src/rdkafka_queue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ rd_kafka_purge_outdated_messages(rd_kafka_toppar_t *rktp,
int32_t version,
rd_kafka_message_t **rkmessages,
size_t cnt,
struct rd_kafka_op_tailq ctrl_msg_q) {
struct rd_kafka_op_tailq *ctrl_msg_q) {
size_t valid_count = 0;
size_t i;
rd_kafka_op_t *rko, *next;
Expand All @@ -563,13 +563,15 @@ rd_kafka_purge_outdated_messages(rd_kafka_toppar_t *rktp,
}

/* Discard outdated control msgs ops */
next = TAILQ_FIRST(&ctrl_msg_q);
while (next && next->rko_rktp == rktp &&
rd_kafka_op_version_outdated(next, version)) {
next = TAILQ_FIRST(ctrl_msg_q);
while (next) {
pranavrth marked this conversation as resolved.
Show resolved Hide resolved
rko = next;
next = TAILQ_NEXT(rko, rko_link);
TAILQ_REMOVE(&ctrl_msg_q, rko, rko_link);
rd_kafka_op_destroy(rko);
if (rko->rko_rktp == rktp &&
rd_kafka_op_version_outdated(rko, version)) {
TAILQ_REMOVE(ctrl_msg_q, rko, rko_link);
rd_kafka_op_destroy(rko);
}
}

return valid_count;
Expand Down Expand Up @@ -641,7 +643,7 @@ int rd_kafka_q_serve_rkmessages(rd_kafka_q_t *rkq,
if (unlikely(rko->rko_type == RD_KAFKA_OP_BARRIER)) {
cnt = (unsigned int)rd_kafka_purge_outdated_messages(
rko->rko_rktp, rko->rko_version, rkmessages, cnt,
ctrl_msg_q);
&ctrl_msg_q);
rd_kafka_op_destroy(rko);
continue;
}
Expand Down Expand Up @@ -670,9 +672,6 @@ int rd_kafka_q_serve_rkmessages(rd_kafka_q_t *rkq,
* application. Add it to a tmp queue from where we can store
* the offset and destroy the op */
if (unlikely(rd_kafka_op_is_ctrl_msg(rko))) {
/* FIXME: Fix TAILQ_REMOVE call to handle this case */
if (TAILQ_FIRST(&ctrl_msg_q) == NULL)
TAILQ_INIT(&ctrl_msg_q);
TAILQ_INSERT_TAIL(&ctrl_msg_q, rko, rko_link);
continue;
}
Expand Down
19 changes: 11 additions & 8 deletions tests/0137-barrier_batch_consume.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ static int consumer_batch_queue(void *arg) {
rd_kafka_message_destroy(rkmessage[i]);
}

rd_free(rkmessage);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function is taken from TEST 0122 as it is. We should add this in that test as well.


return 0;
}

Expand Down Expand Up @@ -130,8 +132,7 @@ static void do_test_consume_batch_with_seek(void) {
produce_msg_cnt / partition_cnt);

/* Create consumers */
consumer =
test_create_consumer(topic, NULL, rd_kafka_conf_dup(conf), NULL);
consumer = test_create_consumer(topic, NULL, conf, NULL);

test_consumer_subscribe(consumer, topic);
test_consumer_wait_assignment(consumer, rd_false);
Expand Down Expand Up @@ -159,7 +160,7 @@ static void do_test_consume_batch_with_seek(void) {
err = rd_kafka_seek_partitions(consumer, seek_toppars, 2000);

TEST_ASSERT(!err,
"Failed to seek partition %d for topic %s to offset %lld",
"Failed to seek partition %d for topic %s to offset %ld",
seek_partition, topic, seek_offset);

thrd_join(thread_id, NULL);
Expand Down Expand Up @@ -221,8 +222,7 @@ static void do_test_consume_batch_with_pause_and_resume_different_batch(void) {
produce_msg_cnt / partition_cnt);

/* Create consumers */
consumer =
test_create_consumer(topic, NULL, rd_kafka_conf_dup(conf), NULL);
consumer = test_create_consumer(topic, NULL, conf, NULL);

test_consumer_subscribe(consumer, topic);
test_consumer_wait_assignment(consumer, rd_false);
Expand Down Expand Up @@ -327,8 +327,7 @@ static void do_test_consume_batch_with_pause_and_resume_same_batch(void) {
produce_msg_cnt / partition_cnt);

/* Create consumers */
consumer =
test_create_consumer(topic, NULL, rd_kafka_conf_dup(conf), NULL);
consumer = test_create_consumer(topic, NULL, conf, NULL);

test_consumer_subscribe(consumer, topic);
test_consumer_wait_assignment(consumer, rd_false);
Expand Down Expand Up @@ -458,6 +457,10 @@ static void do_test_consume_batch_store_offset(void) {
TEST_MSGVER_BY_OFFSET,
0, expected_msg_cnt);

test_msgver_clear(&mv);

rd_kafka_conf_destroy(conf);

SUB_TEST_PASS();
}

Expand Down Expand Up @@ -577,7 +580,7 @@ static void do_test_consume_batch_control_msgs(void) {
rd_kafka_committed(consumer, pause_partition_list, timeout_ms);

TEST_ASSERT(pause_partition_list->elems[0].offset == expected_offset,
"Expected offset should be %lld, but it is %lld",
"Expected offset should be %ld, but it is %ld",
expected_offset, pause_partition_list->elems[0].offset);

rd_kafka_topic_partition_list_destroy(pause_partition_list);
Expand Down