Skip to content

Always try ApiVersionsRequest v0, even on broker disconnect #2603

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.

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 2 commits into from
Apr 29, 2025
Merged
Changes from all commits
Commits
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
15 changes: 12 additions & 3 deletions kafka/conn.py
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ def __init__(self, host, port, afi, **configs):
if self.config['ssl_context'] is not None:
self._ssl_context = self.config['ssl_context']
self._api_versions_future = None
self._api_versions_check_timeout = self.config['api_version_auto_timeout_ms']
self._sasl_auth_future = None
self.last_attempt = 0
self._gai = []
Expand Down Expand Up @@ -557,7 +558,8 @@ def _try_api_versions_check(self):
else:
request = ApiVersionsRequest[version]()
future = Future()
response = self._send(request, blocking=True, request_timeout_ms=(self.config['api_version_auto_timeout_ms'] * 0.8))
self._api_versions_check_timeout /= 2
response = self._send(request, blocking=True, request_timeout_ms=self._api_versions_check_timeout)
response.add_callback(self._handle_api_versions_response, future)
response.add_errback(self._handle_api_versions_failure, future)
self._api_versions_future = future
Expand All @@ -566,7 +568,8 @@ def _try_api_versions_check(self):
elif self._check_version_idx < len(self.VERSION_CHECKS):
version, request = self.VERSION_CHECKS[self._check_version_idx]
future = Future()
response = self._send(request, blocking=True, request_timeout_ms=(self.config['api_version_auto_timeout_ms'] * 0.8))
self._api_versions_check_timeout /= 2
response = self._send(request, blocking=True, request_timeout_ms=self._api_versions_check_timeout)
response.add_callback(self._handle_check_version_response, future, version)
response.add_errback(self._handle_check_version_failure, future)
self._api_versions_future = future
Expand Down Expand Up @@ -618,7 +621,13 @@ def _handle_api_versions_response(self, future, response):

def _handle_api_versions_failure(self, future, ex):
future.failure(ex)
self._check_version_idx = 0
# Modern brokers should not disconnect on unrecognized api-versions request,
# but in case they do we always want to try v0 as a fallback
# otherwise switch to check_version probe.
if self._api_versions_idx > 0:
self._api_versions_idx = 0
else:
self._check_version_idx = 0
# after failure connection is closed, so state should already be DISCONNECTED

def _handle_check_version_response(self, future, version, _response):
Expand Down
Loading