Skip to content
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

Improve logging for distributed algorithms #284

Merged
merged 2 commits into from
Dec 4, 2020
Merged

Improve logging for distributed algorithms #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04a7495
Improve logging for distributed algorithms
brainix Dec 4, 2020
647fe46
Use well named variable to make code more readable
brainix Dec 4, 2020
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
21 changes: 12 additions & 9 deletions pottery/nextid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@

from redis import Redis
from redis.client import Script
from redis.exceptions import ConnectionError
from redis.exceptions import TimeoutError
from typing_extensions import Final

from .base import Primitive
Expand Down Expand Up @@ -77,7 +75,8 @@ class NextId(Primitive):
_set_id_script: ClassVar[Optional[Script]] = None

def __init__(self,
*, key: str = KEY,
*,
key: str = KEY,
num_tries: int = NUM_TRIES,
masters: Iterable[Redis] = frozenset(),
) -> None:
Expand Down Expand Up @@ -132,18 +131,20 @@ def __repr__(self) -> str:

@property
def __current_id(self) -> int:
futures, current_id, num_masters_gotten = set(), 0, 0
futures, current_ids = set(), []
with concurrent.futures.ThreadPoolExecutor() as executor:
for master in self.masters:
futures.add(executor.submit(master.get, self.key))
for future in concurrent.futures.as_completed(futures):
with contextlib.suppress(TimeoutError, ConnectionError):
current_id = max(current_id, int(future.result()))
num_masters_gotten += 1
try:
current_ids.append(int(future.result()))
except Exception as error:
_logger.error(error, exc_info=True)
num_masters_gotten = len(current_ids)
if num_masters_gotten < len(self.masters) // 2 + 1:
raise QuorumNotAchieved(self.masters, self.key)
else:
return current_id
return max(current_ids)

@__current_id.setter
def __current_id(self, value: int) -> None:
Expand All @@ -158,8 +159,10 @@ def __current_id(self, value: int) -> None:
)
futures.add(future)
for future in concurrent.futures.as_completed(futures):
with contextlib.suppress(TimeoutError, ConnectionError):
try:
num_masters_set += future.result() == value
except Exception as error:
_logger.error(error, exc_info=True)
if num_masters_set < len(self.masters) // 2 + 1:
raise QuorumNotAchieved(self.masters, self.key)

Expand Down
25 changes: 15 additions & 10 deletions pottery/redlock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@

from redis import Redis
from redis.client import Script
from redis.exceptions import ConnectionError
from redis.exceptions import TimeoutError
from typing_extensions import Final

from .base import Primitive
Expand Down Expand Up @@ -254,8 +252,10 @@ def __acquire_masters(self) -> bool:
for master in self.masters:
futures.add(executor.submit(self.__acquire_master, master))
for future in concurrent.futures.as_completed(futures):
with contextlib.suppress(TimeoutError, ConnectionError):
try:
num_masters_acquired += future.result()
except Exception as error: # pragma: no cover
_logger.error(error, exc_info=True)
quorum = num_masters_acquired >= len(self.masters) // 2 + 1
elapsed = timer.elapsed() - self.__drift()
validity_time = self.auto_release_time - elapsed
Expand Down Expand Up @@ -351,16 +351,17 @@ def locked(self) -> int:
>>> printer_lock_1.release()

'''
futures, num_masters_acquired, ttls = set(), 0, []
futures, ttls = set(), []
with ContextTimer() as timer, \
concurrent.futures.ThreadPoolExecutor() as executor:
for master in self.masters:
futures.add(executor.submit(self.__acquired_master, master))
for future in concurrent.futures.as_completed(futures):
with contextlib.suppress(TimeoutError, ConnectionError):
ttl = future.result()
num_masters_acquired += ttl > 0
ttls.append(ttl)
try:
ttls.append(future.result())
except Exception as error: # pragma: no cover
_logger.error(error, exc_info=True)
num_masters_acquired = sum(1 for ttl in ttls if ttl > 0)
quorum = num_masters_acquired >= len(self.masters) // 2 + 1
if quorum:
ttls = sorted(ttls, reverse=True)
Expand Down Expand Up @@ -398,8 +399,10 @@ def extend(self) -> None:
for master in self.masters:
futures.add(executor.submit(self.__extend_master, master))
for future in concurrent.futures.as_completed(futures):
with contextlib.suppress(TimeoutError, ConnectionError):
try:
num_masters_extended += future.result()
except Exception as error: # pragma: no cover
_logger.error(error, exc_info=True)
quorum = num_masters_extended >= len(self.masters) // 2 + 1
self._extension_num += quorum
if not quorum:
Expand All @@ -426,8 +429,10 @@ def release(self) -> None:
for master in self.masters:
futures.add(executor.submit(self.__release_master, master))
for future in concurrent.futures.as_completed(futures):
with contextlib.suppress(TimeoutError, ConnectionError):
try:
num_masters_released += future.result()
except Exception as error: # pragma: no cover
_logger.error(error, exc_info=True)
quorum = num_masters_released >= len(self.masters) // 2 + 1
if not quorum:
raise ReleaseUnlockedLock(self.masters, self.key)
Expand Down