Skip to content

Fix cleanup with empty response in gather dep #2112

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 1 commit into from
Jul 15, 2018
Merged

Fix cleanup with empty response in gather dep #2112

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
7 changes: 4 additions & 3 deletions distributed/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1861,15 +1861,16 @@ def gather_dep(self, worker, dep, deps, total_nbytes, cause=None):
finally:
self.comm_nbytes -= total_nbytes
busy = response.get('status', '') == 'busy'
data = response.get('data', {})

for d in self.in_flight_workers.pop(worker):
if not busy and d in response['data']:
self.transition_dep(d, 'memory', value=response['data'][d])
if not busy and d in data:
self.transition_dep(d, 'memory', value=data[d])
elif self.dep_state.get(d) != 'memory':
self.transition_dep(d, 'waiting', worker=worker,
remove=not busy)

if not busy and d not in response['data'] and d in self.dependents:
if not busy and d not in data and d in self.dependents:
self.log.append(('missing-dep', d))
self.batched_stream.send({'op': 'missing-data',
'errant_worker': worker,
Expand Down