Merge pull request confluentinc#113 from confluentinc/callstate_destroy

edenhill · web-flow · commit 7bef98044c34 · 2017-02-01T08:51:29.000+01:00
Callstate destroy
diff --git a/confluent_kafka/src/Consumer.c b/confluent_kafka/src/Consumer.c
@@ -472,19 +472,16 @@ static PyObject *Consumer_poll (Handle *self, PyObject *args,
 
 static PyObject *Consumer_close (Handle *self, PyObject *ignore) {
 	CallState cs;
-	int raise = 0;
 
 	CallState_begin(self, &cs);
 
 	rd_kafka_consumer_close(self->rk);
 
-	raise = !CallState_end(self, &cs);
-
 	rd_kafka_destroy(self->rk);
 	self->rk = NULL;
 
-	if (raise)
-		return NULL;
+        if (!CallState_end(self, &cs))
+                return NULL;
 
 	Py_RETURN_NONE;
 }
diff --git a/confluent_kafka/src/Producer.c b/confluent_kafka/src/Producer.c
@@ -108,8 +108,14 @@ static void Producer_dealloc (Handle *self) {
 
 	Producer_clear(self);
 
-	if (self->rk)
-		rd_kafka_destroy(self->rk);
+	if (self->rk) {
+                CallState cs;
+                CallState_begin(self, &cs);
+
+                rd_kafka_destroy(self->rk);
+
+                CallState_end(self, &cs);
+        }
 
 	Py_TYPE(self)->tp_free((PyObject *)self);
 }
diff --git a/examples/integration_test.py b/examples/integration_test.py
@@ -239,17 +239,19 @@ def verify_producer_performance(with_dr_cb=True):
         bar = None
 
     for i in range(0, msgcnt):
-        try:
-            if with_dr_cb:
-                p.produce(topic, value=msg_payload, callback=dr.delivery)
-            else:
-                p.produce(topic, value=msg_payload)
-        except BufferError as e:
-            # Local queue is full (slow broker connection?)
-            msgs_backpressure += 1
-            if bar is not None and (msgs_backpressure % 1000) == 0:
-                bar.next(n=0)
-            p.poll(0)
+        while True:
+            try:
+                if with_dr_cb:
+                    p.produce(topic, value=msg_payload, callback=dr.delivery)
+                else:
+                    p.produce(topic, value=msg_payload)
+                break
+            except BufferError as e:
+                # Local queue is full (slow broker connection?)
+                msgs_backpressure += 1
+                if bar is not None and (msgs_backpressure % 1000) == 0:
+                    bar.next(n=0)
+                p.poll(100)
             continue
 
         if bar is not None and (msgs_produced % 5000) == 0:
@@ -268,7 +270,7 @@ def verify_producer_performance(with_dr_cb=True):
           (msgs_produced, bytecnt / (1024*1024), t_produce_spent,
            msgs_produced / t_produce_spent,
            (bytecnt/t_produce_spent) / (1024*1024)))
-    print('# %d messages not produce()d due to backpressure (local queue full)' % msgs_backpressure)
+    print('# %d temporary produce() failures due to backpressure (local queue full)' % msgs_backpressure)
 
     print('waiting for %d/%d deliveries' % (len(p), msgs_produced))
     # Wait for deliveries
