Skip to content

Fix MetadataRequest for no topics #2573

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

Merged
merged 4 commits into from
Mar 28, 2025
Merged

Fix MetadataRequest for no topics #2573

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
f0a313e
Fix MetadataRequest for no topics
dpkp Mar 27, 2025
071e66b
Fixup test_client_async tests
dpkp Mar 27, 2025
e1850ca
Add fake NO_TOPICS for MetadataRequest v0
dpkp Mar 27, 2025
f0026fe
Test bootstrap with api_version 2.1
dpkp Mar 27, 2025
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
4 changes: 3 additions & 1 deletion kafka/client_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,8 +978,10 @@ def _maybe_refresh_metadata(self, wakeup=False):
topics = list(self.config['bootstrap_topics_filter'])

api_version = self.api_version(MetadataRequest, max_version=7)
if self.cluster.need_all_topic_metadata or not topics:
if self.cluster.need_all_topic_metadata:
topics = MetadataRequest[api_version].ALL_TOPICS
elif not topics:
topics = MetadataRequest[api_version].NO_TOPICS
if api_version >= 4:
request = MetadataRequest[api_version](topics, self.config['allow_auto_create_topics'])
else:
Expand Down
1 change: 1 addition & 0 deletions kafka/protocol/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ class MetadataRequest_v0(Request):
('topics', Array(String('utf-8')))
)
ALL_TOPICS = [] # Empty Array (len 0) for topics returns all topics
NO_TOPICS = [] # v0 does not support a 'no topics' request, so we'll just ask for ALL


class MetadataRequest_v1(Request):
Expand Down
5 changes: 3 additions & 2 deletions test/test_client_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def cli(mocker, conn):

def test_bootstrap(mocker, conn):
conn.state = ConnectionStates.CONNECTED
cli = KafkaClient(api_version=(0, 9))
cli = KafkaClient(api_version=(2, 1))
mocker.patch.object(cli, '_selector')
future = cli.cluster.request_update()
cli.poll(future=future)
Expand All @@ -43,7 +43,7 @@ def test_bootstrap(mocker, conn):
kwargs.pop('state_change_callback')
kwargs.pop('node_id')
assert kwargs == cli.config
conn.send.assert_called_once_with(MetadataRequest[0]([]), blocking=False, request_timeout_ms=None)
conn.send.assert_called_once_with(MetadataRequest[7]([], True), blocking=False, request_timeout_ms=None)
assert cli._bootstrap_fails == 0
assert cli.cluster.brokers() == set([BrokerMetadata(0, 'foo', 12, None),
BrokerMetadata(1, 'bar', 34, None)])
Expand Down Expand Up @@ -330,6 +330,7 @@ def test_maybe_refresh_metadata_update(mocker, client):
mocker.patch.object(client, 'least_loaded_node', return_value='foobar')
mocker.patch.object(client, '_can_send_request', return_value=True)
send = mocker.patch.object(client, 'send')
client.cluster.need_all_topic_metadata = True

client.poll(timeout_ms=12345678)
client._poll.assert_called_with(9999.999) # request_timeout_ms
Expand Down
Loading