Skip to content

HH-130008 extend exceptions for caches and add backoff delay #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicholasgribanov merged 1 commit into from
May 26, 2021
Merged

HH-130008 extend exceptions for caches and add backoff delay #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions consul/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import os
import re
import threading
import time
import warnings

import six
Expand Down Expand Up @@ -349,10 +350,11 @@ class ConsulCacheBase(metaclass=abc.ABCMeta):
calls to wait for changes since this query was last run.
"""

def __init__(self, watch_seconds: str):
def __init__(self, watch_seconds: str, backoff_delay_seconds: int):
self.cache = dict()
self.callbacks = []
self.watch_seconds = watch_seconds
self.backoff_delay_seconds = backoff_delay_seconds
self.index = None
self._running = True
self._cache_thread = threading.Thread(
Expand Down Expand Up @@ -392,10 +394,11 @@ class HealthCache(ConsulCacheBase):
def __init__(self,
health_client: Consul.Health,
watch_seconds: str,
backoff_delay_seconds: int,
service: str,
passing: bool,
dc: str):
super().__init__(watch_seconds)
super().__init__(watch_seconds, backoff_delay_seconds)
self.service = service
self.health_client = health_client
self.passing = passing
Expand Down Expand Up @@ -426,8 +429,9 @@ def _update_cache(self):
new_value = self.cache.get(key, None)
for callback in self.callbacks:
callback(key, new_value)
except ConsulException as e:
log.error(f'Some problem with update consul cache: {e}')
except Exception as e:
log.error(f'Some problem with update consul cache: {e}. Will retry in {self.backoff_delay_seconds}s')
time.sleep(self.backoff_delay_seconds)


class KVCache(ConsulCacheBase):
Expand All @@ -450,12 +454,13 @@ class KVCache(ConsulCacheBase):
def __init__(self,
kv_client: Consul.KV,
watch_seconds: str,
backoff_delay_seconds: int,
path: str,
total_timeout: int,
recurse: bool,
consistency_mode: ConsistencyMode,
cache_initial_warmup_timeout=None):
super().__init__(watch_seconds)
super().__init__(watch_seconds, backoff_delay_seconds)
self.kv_client = kv_client
self.path = path
self.recurse = recurse
Expand Down Expand Up @@ -499,8 +504,9 @@ def _update_cache(self):
log.debug(f'Value was changed for key={key}. old: {old_value} new: {new_value}')
for callback in self.callbacks:
callback(key, new_value)
except ConsulException as e:
log.error(f'Some problem with update consul cache: {e}')
except Exception as e:
log.error(f'Some problem with update consul cache: {e}. Will retry in {self.backoff_delay_seconds}s')
time.sleep(self.backoff_delay_seconds)


class HTTPClient(six.with_metaclass(abc.ABCMeta, object)):
Expand Down