Consumer destructor will no longer trigger consumer_close()

edenhill · edenhill · commit 5bd43b62072c · 2020-10-26T15:38:14.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,12 @@ v1.5.2 is a maintenance release with the following fixing and enhancements:
  - Add AdminClient.list_groups API (@messense, #948)
  - Rename asyncio.py example to avoid circular import (#945)
  - Upgrade bundled OpenSSL to v1.1.1h (from v1.0.2u)
+ - The Consumer destructor will no longer trigger `consumer.close()`
+   callbacks, `consumer.close()` must now be explicitly called to cleanly
+   close down the consumer and leave the group.
+ - Fix `PY_SSIZE_T_CLEAN` warning in calls to produce().
+ - Restructure source tree to avoid undesired local imports of confluent_kafka
+   when running pytest.
 
 confluent-kafka-python is based on librdkafka v1.5.2, see the
 [librdkafka release notes](https://github.com/edenhill/librdkafka/releases/tag/v1.5.2)
diff --git a/src/confluent_kafka/src/Consumer.c b/src/confluent_kafka/src/Consumer.c
@@ -63,12 +63,8 @@ static void Consumer_dealloc (Handle *self) {
 
                 CallState_begin(self, &cs);
 
-                /* If application has not called c.close() then
-                 * rd_kafka_destroy() will, and that might trigger
-                 * callbacks to be called from consumer_close().
-                 * This should probably be fixed in librdkafka,
-                 * or the application. */
-                rd_kafka_destroy(self->rk);
+                rd_kafka_destroy_flags(self->rk,
+                                       RD_KAFKA_DESTROY_F_NO_CONSUMER_CLOSE);
 
                 CallState_end(self, &cs);
         }
