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

Merged
merged 4 commits into from
Oct 18, 2024
Merged

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
4 commits
Select commit Hold shift + click to select a range
cd2fa5d
ListOffsetsRequest should only be sent to the leader replica
kphelps Feb 12, 2024
46ecca4
Add CHANGELOG entry
emasab Apr 10, 2024
c446e68
Address comments
emasab Oct 17, 2024
7d09ee5
Style fix
emasab Oct 17, 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
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ librdkafka v2.6.1 is a maintenance release:
under some particular conditions (#4800).
* Fix for retrieving offset commit metadata when it contains
zeros and configured with `strndup` (#4876)
* Fix for a loop of ListOffset requests, happening in a Fetch From Follower
scenario, if such request is made to the follower (#4616, #4754, @kphelps).


## Fixes
Expand All @@ -32,6 +34,12 @@ librdkafka v2.6.1 is a maintenance release:
instead of rest of metadata. Solved by avoiding to use
`strndup` for copying metadata.
Happening since: 0.9.0 (#4876).
* 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, #4754, @kphelps).



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 @@ -1359,7 +1359,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 @@ -1549,7 +1549,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
9 changes: 8 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,14 @@ 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
* sending ListOffsets to the replica and receiving
* NOT_LEADER_OR_FOLLOWER errors.
* See PR #4616 */
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