Update examples/tests to reflect enable.partition.eof default chanage from true to false

rnpridgeon · Ryan P · commit a087411c34c0 · 2018-12-07T08:37:35.000-05:00
diff --git a/README.md b/README.md
@@ -85,11 +85,8 @@ while True:
     if msg is None:
         continue
     if msg.error():
-        if msg.error().code() == KafkaError._PARTITION_EOF:
-            continue
-        else:
-            print(msg.error())
-            break
+        print("Consumer error: {}".format(msg.error()))
+        continue
 
     print('Received message: {}'.format(msg.value().decode('utf-8')))
 
@@ -172,11 +169,8 @@ while True:
         continue
 
     if msg.error():
-        if msg.error().code() == KafkaError._PARTITION_EOF:
-            continue
-        else:
-            print(msg.error())
-            break
+        print("AvroConsumer error: {}".format(msg.error()))
+        continue
 
     print(msg.value())
 
diff --git a/confluent_kafka/kafkatest/verifiable_consumer.py b/confluent_kafka/kafkatest/verifiable_consumer.py
@@ -188,11 +188,7 @@ def do_commit(self, immediate=False, asynchronous=None):
     def msg_consume(self, msg):
         """ Handle consumed message (or error event) """
         if msg.error():
-            if msg.error().code() == KafkaError._PARTITION_EOF:
-                # ignore EOF
-                pass
-            else:
-                self.err('Consume failed: %s' % msg.error(), term=False)
+            self.err('Consume failed: %s' % msg.error(), term=False)
             return
 
         if False:
diff --git a/examples/confluent_cloud.py b/examples/confluent_cloud.py
@@ -48,7 +48,7 @@
 
 import uuid
 
-from confluent_kafka import Producer, Consumer, KafkaError
+from confluent_kafka import Producer, Consumer
 
 
 p = Producer({
@@ -98,14 +98,14 @@ def acked(err, msg):
         if msg is None:
             # No message available within timeout.
             # Initial message consumption may take up to `session.timeout.ms` for
-            #   the group to rebalance and start consuming
+            #   the group to rebalance and start consuming.
             continue
-        elif not msg.error():
-            print('consumed: {0}'.format(msg.value()))
-        elif msg.error().code() == KafkaError._PARTITION_EOF:
-            print('end of partition: {0} [{1}] @ {2}'.format(msg.topic(), msg.partition(), msg.offset()))
-        else:
-            print('error: {0}'.format(msg.error().str()))
+        if msg.error():
+            # Most error message are typically temporary log error and continue.
+            print("Consumer error: {}".format(msg.error()))
+            continue
+
+        print('consumed: {0}'.format(msg.value()))
 
 except KeyboardInterrupt:
     pass
diff --git a/examples/consumer.py b/examples/consumer.py
@@ -18,7 +18,7 @@
 #
 # Example high-level Kafka 0.9 balanced Consumer
 #
-from confluent_kafka import Consumer, KafkaException, KafkaError
+from confluent_kafka import Consumer, KafkaException
 import sys
 import getopt
 import json
@@ -95,14 +95,7 @@ def print_assignment(consumer, partitions):
             if msg is None:
                 continue
             if msg.error():
-                # Error or event
-                if msg.error().code() == KafkaError._PARTITION_EOF:
-                    # End of partition event
-                    sys.stderr.write('%% %s [%d] reached end at offset %d\n' %
-                                     (msg.topic(), msg.partition(), msg.offset()))
-                else:
-                    # Error
-                    raise KafkaException(msg.error())
+                raise KafkaException(msg.error())
             else:
                 # Proper message
                 sys.stderr.write('%% %s [%d] at offset %d with key %s:\n' %
diff --git a/tests/integration/integration_test.py b/tests/integration/integration_test.py
@@ -368,7 +368,8 @@ def verify_consumer():
             'enable.auto.commit': False,
             'on_commit': print_commit_result,
             'error_cb': error_cb,
-            'auto.offset.reset': 'earliest'}
+            'auto.offset.reset': 'earliest',
+            'enable.partition.eof': True}
 
     # Create consumer
     c = confluent_kafka.Consumer(conf)
@@ -535,11 +536,7 @@ def my_on_revoke(consumer, partitions):
                             (msgcnt, max_msgcnt))
 
         if msg.error():
-            if msg.error().code() == confluent_kafka.KafkaError._PARTITION_EOF:
-                # Reached EOF for a partition, ignore.
-                continue
-            else:
-                raise confluent_kafka.KafkaException(msg.error())
+            raise confluent_kafka.KafkaException(msg.error())
 
         bytecnt += len(msg)
         msgcnt += 1
@@ -714,11 +711,7 @@ def my_on_revoke(consumer, partitions):
 
         for msg in msglist:
             if msg.error():
-                if msg.error().code() == confluent_kafka.KafkaError._PARTITION_EOF:
-                    # Reached EOF for a partition, ignore.
-                    continue
-                else:
-                    raise confluent_kafka.KafkaException(msg.error())
+                raise confluent_kafka.KafkaException(msg.error())
 
             bytecnt += len(msg)
             msgcnt += 1
@@ -1008,11 +1001,7 @@ def stats_cb(stats_json_str):
                             (msgcnt, max_msgcnt))
 
         if msg.error():
-            if msg.error().code() == confluent_kafka.KafkaError._PARTITION_EOF:
-                # Reached EOF for a partition, ignore.
-                continue
-            else:
-                raise confluent_kafka.KafkaException(msg.error())
+            raise confluent_kafka.KafkaException(msg.error())
 
         bytecnt += len(msg)
         msgcnt += 1
@@ -1227,6 +1216,7 @@ def verify_avro_explicit_read_schema():
         conf = copy(cons_conf)
         if schema_registry_url:
             conf['schema.registry.url'] = schema_registry_url
+            conf['enable.partition.eof'] = True
             c = avro.AvroConsumer(
                         conf,
                         reader_key_schema=reader_key_schema,
