dubeejw closed pull request #250: Remove error callback
URL: https://github.com/apache/incubator-openwhisk-package-kafka/pull/250
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/provider/consumer.py b/provider/consumer.py
index 55735bd..a8427d0 100644
--- a/provider/consumer.py
+++ b/provider/consumer.py
@@ -131,20 +131,6 @@ def __init__(self, trigger, params, sharedDictionary):
self.brokers = params["brokers"]
self.topic = params["topic"]
- self.authErrors = 0
-
- # We want to account for the number of brokers when deciding the
maximum number
- # number of auth errors to allow
- self.maxAuthErrors = len(self.brokers) * 30
-
- # There is the possibility of being disconnected from one or more
brokers while
- # still maintaining a connection to one or more others. We'll use this
flag to
- # signal when we have been disconnected from all brokers. Value will
be set to
- # 'True' when we have received a partition assignment and 'False' when
our
- # partition assignment has been revoked. When disconnected we will
begin to
- # increment the 'authErrors' counter.
- self.connected = False
-
self.sharedDictionary = sharedDictionary
if 'status' in params and params['status']['active'] == False:
@@ -267,8 +253,7 @@ def __createConsumer(self):
'group.id': self.trigger,
'default.topic.config': {'auto.offset.reset':
'latest'},
'enable.auto.commit': False,
- 'api.version.request': True,
- 'error_cb': self.__error_callback
+ 'api.version.request': True
}
if self.isMessageHub:
@@ -488,20 +473,8 @@ def __encodeKeyIfNeeded(self, key):
logging.debug('[{}] Returning un-encoded message'.format(self.trigger))
return key
- def __error_callback(self, error):
- if not self.connected and error.code() == KafkaError._AUTHENTICATION:
- self.authErrors = self.authErrors + 1
- if self.authErrors > self.maxAuthErrors:
- logging.warning('[{}] Shutting down consumer and disabling
trigger. Exceeded the allowable number of _AUTHENTICATION
errors'.format(self.trigger))
- self.setDesiredState(Consumer.State.Disabled)
- message = 'Automatically disabled trigger. Consumer was unable
to connect to broker(s) after 30 attempts'.format()
- self.database.disableTrigger(self.trigger, 403, message)
-
def __on_assign(self, consumer, partitions):
logging.info('[{}] Completed partition assignment. Connected to
broker(s)'.format(self.trigger))
- self.authErrors = 0
- self.connected = True
def __on_revoke(self, consumer, partitions):
logging.info('[{}] Partition assignment has been revoked. Disconnected
from broker(s)'.format(self.trigger))
- self.connected = False
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
