kafka-python 2.2.13__tar.gz → 2.2.14__tar.gz

{kafka_python-2.2.13 → kafka_python-2.2.14}/CHANGES.md

@@ -1,3 +1,9 @@
+# 2.2.14 (June 27, 2025)
+
+Fixes
+* python2 fixups (#2655)
+* Fix coordinator lock contention during close() (#2652)
+
 # 2.2.13 (June 20, 2025)
 
 Fixes

{kafka_python-2.2.13 → kafka_python-2.2.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kafka-python
-Version: 2.2.13
+Version: 2.2.14
 Summary: Pure Python client for Apache Kafka
 Author-email: Dana Powers <dana.powers@gmail.com>
 Project-URL: Homepage, https://github.com/dpkp/kafka-python

{kafka_python-2.2.13 → kafka_python-2.2.14}/kafka/consumer/fetcher.py

@@ -613,7 +613,8 @@ class Fetcher(six.Iterator):
         fetchable = self._subscriptions.fetchable_partitions()
         # do not fetch a partition if we have a pending fetch response to process
         # use copy.copy to avoid runtimeerror on mutation from different thread
-        discard = {fetch.topic_partition for fetch in self._completed_fetches.copy()}
+        # TODO: switch to deque.copy() with py3
+        discard = {fetch.topic_partition for fetch in copy.copy(self._completed_fetches)}
         current = self._next_partition_records
         if current:
             discard.add(current.topic_partition)

{kafka_python-2.2.13 → kafka_python-2.2.14}/kafka/coordinator/base.py

@@ -857,14 +857,12 @@ class BaseCoordinator(object):
                 self._heartbeat_thread.disable()
 
     def _close_heartbeat_thread(self, timeout_ms=None):
-        with self._lock:
-            if self._heartbeat_thread is not None:
-                heartbeat_log.info('Stopping heartbeat thread')
-                try:
-                    self._heartbeat_thread.close(timeout_ms=timeout_ms)
-                except ReferenceError:
-                    pass
-                self._heartbeat_thread = None
+        if self._heartbeat_thread is not None:
+            try:
+                self._heartbeat_thread.close(timeout_ms=timeout_ms)
+            except ReferenceError:
+                pass
+            self._heartbeat_thread = None
 
     def __del__(self):
         try:
@@ -1047,17 +1045,20 @@ class HeartbeatThread(threading.Thread):
             self.enabled = False
 
     def close(self, timeout_ms=None):
-        if self.closed:
-            return
-        self.closed = True
+        with self.coordinator._lock:
+            if self.closed:
+                return
 
-        # Generally this should not happen - close() is triggered
-        # by the coordinator. But in some cases GC may close the coordinator
-        # from within the heartbeat thread.
-        if threading.current_thread() == self:
-            return
+            heartbeat_log.info('Stopping heartbeat thread')
+            self.closed = True
 
-        with self.coordinator._lock:
+            # Generally this should not happen - close() is triggered
+            # by the coordinator. But in some cases GC may close the coordinator
+            # from within the heartbeat thread.
+            if threading.current_thread() == self:
+                return
+
+            # Notify coordinator lock to wake thread from sleep/lock.wait
             self.coordinator._lock.notify()
 
         if self.is_alive():

{kafka_python-2.2.13 → kafka_python-2.2.14}/kafka/sasl/gssapi.py

@@ -68,10 +68,10 @@ class SaslMechanismGSSAPI(SaslMechanism):
             # simply set QoP to 'auth' only (first octet). We reuse the max message size proposed
             # by the server
             client_flags = self.SASL_QOP_AUTH
-            server_flags = msg[0]
+            server_flags = struct.Struct('>b').unpack(msg[0:1])[0]
             message_parts = [
                 struct.Struct('>b').pack(client_flags & server_flags),
-                msg[1:],
+                msg[1:], # always agree to max message size from server
                 self.auth_id.encode('utf-8'),
             ]
             # add authorization identity to the response, and GSS-wrap

kafka_python-2.2.14/kafka/version.py

@@ -0,0 +1 @@
+__version__ = '2.2.14'

{kafka_python-2.2.13 → kafka_python-2.2.14}/kafka_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kafka-python
-Version: 2.2.13
+Version: 2.2.14
 Summary: Pure Python client for Apache Kafka
 Author-email: Dana Powers <dana.powers@gmail.com>
 Project-URL: Homepage, https://github.com/dpkp/kafka-python

kafka_python-2.2.13/kafka/version.py

@@ -1 +0,0 @@
-__version__ = '2.2.13'