Skip to content

Added gc on mem usage warning #1504

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
mrocklin merged 2 commits into from
Nov 1, 2017
Merged

Added gc on mem usage warning #1504

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
354afe6
added gc on mem usage warning
Oct 25, 2017
ab00986
moved gc collection point; renamed/moved ThrottledGC instance
Oct 27, 2017
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
6 changes: 4 additions & 2 deletions distributed/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ def __init__(self, scheduler_ip=None, scheduler_port=None,
self.memory_monitor_interval,
io_loop=self.loop)
self.periodic_callbacks['memory'] = pc
self._throttled_gc = ThrottledGC(logger=logger)

@property
def worker_address(self):
Expand Down Expand Up @@ -1089,7 +1090,6 @@ def __init__(self, *args, **kwargs):

self.log = deque(maxlen=100000)
self.validate = kwargs.pop('validate', False)
self.gc = ThrottledGC(logger=logger)

self._transitions = {
('waiting', 'ready'): self.transition_waiting_ready,
Expand Down Expand Up @@ -2180,6 +2180,8 @@ def memory_monitor(self):

# Pause worker threads if above 80% memory use
if self.memory_pause_fraction and frac > self.memory_pause_fraction:
# Try to free some memory while in paused state
self._throttled_gc.collect()
if not self.paused:
logger.warn("Worker is at %d%% memory usage. Pausing worker. "
"Process memory: %s -- Worker memory limit: %s",
Expand Down Expand Up @@ -2220,7 +2222,7 @@ def memory_monitor(self):
# Issue a GC to ensure that the evicted data is actually
# freed from memory and taken into account by the monitor
# before trying to evict even more data.
self.gc.collect()
self._throttled_gc.collect()
memory = proc.memory_info().rss
if count:
logger.debug("Moved %d pieces of data data and %s to disk",
Expand Down