kafkatest: VerifiableConsumer must send shutdown message even on failure

edenhill · edenhill · commit f70b82fbcdcd · 2020-04-03T16:52:07.000+02:00
Needed for fenced static consumer test to correctly calculate
active members.
diff --git a/confluent_kafka/kafkatest/verifiable_consumer.py b/confluent_kafka/kafkatest/verifiable_consumer.py
@@ -275,6 +275,8 @@ def to_dict(self):
     vc.consumer.subscribe(args['topic'],
                           on_assign=vc.on_assign, on_revoke=vc.on_revoke)
 
+    failed = False
+
     try:
         while vc.run:
             msg = vc.consumer.poll(timeout=1.0)
@@ -295,13 +297,22 @@ def to_dict(self):
         vc.run = False
         pass
 
+    except Exception as e:
+        vc.dbg('Terminating on exception: %s' % str(e))
+        failed = True
+
     vc.dbg('Closing consumer')
     vc.send_records_consumed(immediate=True)
-    if not vc.use_auto_commit:
-        vc.do_commit(immediate=True, asynchronous=False)
 
-    vc.consumer.close()
+    if not failed:
+        try:
+            if not vc.use_auto_commit:
+                vc.do_commit(immediate=True, asynchronous=False)
+            vc.consumer.close()
+        except Exception as e:
+            vc.dbg('Ignoring exception while closing: %s' % str(e))
+            failed = True
 
-    vc.send({'name': 'shutdown_complete'})
+    vc.send({'name': 'shutdown_complete', 'failed': failed})
 
     vc.dbg('All done')
