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

Jump to bottom

ListOffsetsRequest should only be sent to the leader replica (CI) #4754

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+20 −4
Open

ListOffsetsRequest should only be sent to the leader replica (CI) #4754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
341c62d
ListOffsetsRequest should only be sent to the leader replica
kphelps Feb 12, 2024
90d269e
Add CHANGELOG entry
emasab Apr 10, 2024
238e533
Merge branch 'master' into kphelps/list-offsets-leader
emasab Apr 10, 2024
2bb84dd
Merge branch 'master' into kphelps/list-offsets-leader
emasab Jun 10, 2024
2cd1b52
Merge branch 'master' into kphelps/list-offsets-leader
emasab Jun 12, 2024
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: 13 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

librdkafka v2.5.0 is a feature release.

* Fix segfault when using long client id because of erased segment when using flexver. (#4689)
* Update bundled lz4 (#4726)
* Fix segfault when using long client id because of erased segment when using flexver. (#4689)
* Fix for a loop of ListOffset requests, happening in a Fetch From Follower
scenario, if such request is made to the follower (#4616, @kphelps).


## Enhancements
Expand All @@ -14,6 +17,15 @@ librdkafka v2.5.0 is a feature release.

## Fixes

### Consumer fixes

* Issues: #4616
When an out of range on a follower caused an offset reset, the corresponding
ListOffsets request is made to the follower, causing a repeated
"Not leader for partition" error. Fixed by sending the request always
to the leader.
Happening since 1.5.0 (tested version) or previous ones (#4616, @kphelps).

### General fixes

* Issues: [confluentinc/confluent-kafka-dotnet#2084](https://github.com/confluentinc/confluent-kafka-dotnet/issues/2084)
Expand Down
4 changes: 2 additions & 2 deletions src/rdkafka_partition.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,7 +1351,7 @@ static void rd_kafka_toppar_handle_Offset(rd_kafka_t *rk,

rd_kafka_toppar_lock(rktp);
/* Drop reply from previous partition leader */
if (err != RD_KAFKA_RESP_ERR__DESTROY && rktp->rktp_broker != rkb)
if (err != RD_KAFKA_RESP_ERR__DESTROY && rktp->rktp_leader != rkb)
err = RD_KAFKA_RESP_ERR__OUTDATED;
rd_kafka_toppar_unlock(rktp);

Expand Down Expand Up @@ -1541,7 +1541,7 @@ void rd_kafka_toppar_offset_request(rd_kafka_toppar_t *rktp,
rd_kafka_assert(NULL,
thrd_is_current(rktp->rktp_rkt->rkt_rk->rk_thread));

rkb = rktp->rktp_broker;
rkb = rktp->rktp_leader;

if (!backoff_ms && (!rkb || rkb->rkb_source == RD_KAFKA_INTERNAL))
backoff_ms = 500;
Expand Down
6 changes: 5 additions & 1 deletion tests/0104-fetch_from_follower_mock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

#include "test.h"


/**
* @name Fetch from follower tests using the mock broker.
*/
Expand Down Expand Up @@ -111,6 +110,11 @@ static void do_test_offset_reset(const char *auto_offset_reset) {
else
test_consumer_poll(auto_offset_reset, c, 0, 1, 0, msgcnt, NULL);

/* send another batch of messages to ensure the consumer isn't stuck */
test_produce_msgs_easy_v(topic, 0, 0, 0, msgcnt, 1000,
"bootstrap.servers", bootstraps, NULL);
test_consumer_poll("ASSIGN", c, 0, 1, 0, msgcnt, NULL);

test_consumer_close(c);

rd_kafka_destroy(c);
Expand Down