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

Fixed dead lock in telemetry #4873

Merged
merged 5 commits into from
Mar 19, 2021
Merged

Fixed dead lock in telemetry #4873

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a330e91
Fixed dead lock in telemetry
lazarevevgeny Mar 18, 2021
ac20ea6
Refactored TelemetrySender.send function
lazarevevgeny Mar 18, 2021
4f9aeb0
Refactored send function implementation to avoid deadlocks
lazarevevgeny Mar 19, 2021
5f5f385
Unit tests for telemetry sender function
lazarevevgeny Mar 19, 2021
03994d4
Added legal header
lazarevevgeny Mar 19, 2021
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: 14 additions & 6 deletions model-optimizer/telemetry/utils/sender.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,18 @@ def _future_callback(future):
with self._lock:
self.queue_size -= 1

free_space = False
with self._lock:
if self.queue_size < MAX_QUEUE_SIZE:
fut = self.executor.submit(backend.send, message)
fut.add_done_callback(_future_callback)
free_space = True
self.queue_size += 1
else:
pass # dropping a message because the queue is full
# to avoid dead lock we should not add callback inside the "with self._lock" block because it will be executed
# immediately if the fut is available
if free_space:
fut = self.executor.submit(backend.send, message)
fut.add_done_callback(_future_callback)
lazarevevgeny marked this conversation as resolved.
Show resolved Hide resolved

def force_shutdown(self, timeout: float):
"""
Expand All @@ -53,11 +58,14 @@ def force_shutdown(self, timeout: float):
:return: None
"""
try:
need_sleep = False
with self._lock:
if self.queue_size > 0:
sleep(timeout)
self.executor.shutdown(wait=False)
self.executor._threads.clear()
futures.thread._threads_queues.clear()
need_sleep = True
if need_sleep:
sleep(timeout)
self.executor.shutdown(wait=False)
self.executor._threads.clear()
futures.thread._threads_queues.clear()
except Exception:
pass