Skip to content
Merged
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions distributed/scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -1888,7 +1888,7 @@ async def add_worker(
now=None,
resources=None,
host_info=None,
memory_limit=None,
memory_limit=0,
metrics=None,
pid=0,
services=None,
Expand Down Expand Up @@ -3555,10 +3555,10 @@ async def replicate(
del_worker_tasks[ws].add(ts)

await asyncio.gather(
*(
*[
self._delete_worker_data(ws._address, [t.key for t in tasks])
for ws, tasks in del_worker_tasks.items()
)
]
)

# Copy not-yet-filled data
Expand Down Expand Up @@ -5536,8 +5536,10 @@ def profile_to_figure(state):
tasks_timings=tasks_timings,
address=self.address,
nworkers=len(self.workers),
threads=sum(ws._nthreads for ws in self.workers.values()),
memory=format_bytes(sum(ws._memory_limit for ws in self.workers.values())),
threads=sum([ws._nthreads for ws in self.workers.values()]),
memory=format_bytes(
sum([ws._memory_limit for ws in self.workers.values()])
),
code=code,
dask_version=dask.__version__,
distributed_version=distributed.__version__,
Expand Down