Skip to content
Merged
Show file tree
Hide file tree
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
16 changes: 10 additions & 6 deletions distributed/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ def _repr_html_(self):
info = sync(self.loop, self.scheduler.identity)
scheduler = self.scheduler
else:
info = False
info = self._scheduler_identity
scheduler = self.scheduler

if scheduler is not None:
Expand All @@ -828,18 +828,22 @@ def _repr_html_(self):
text += "</ul>\n"

if info:
workers = len(info["workers"])
cores = sum(w["nthreads"] for w in info["workers"].values())
memory = sum(w["memory_limit"] for w in info["workers"].values())
memory = format_bytes(memory)
workers = list(info["workers"].values())
cores = sum(w["nthreads"] for w in workers)
if all(isinstance(w["memory_limit"], Number) for w in workers):
memory = sum(w["memory_limit"] for w in workers)
memory = format_bytes(memory)
else:
memory = ""

text2 = (
"<h3>Cluster</h3>\n"
"<ul>\n"
" <li><b>Workers: </b>%d</li>\n"
" <li><b>Cores: </b>%d</li>\n"
" <li><b>Memory: </b>%s</li>\n"
"</ul>\n"
) % (workers, cores, memory)
) % (len(workers), cores, memory)

return (
'<table style="border: 2px solid white;">\n'
Expand Down
5 changes: 5 additions & 0 deletions distributed/tests/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1892,6 +1892,11 @@ def test_repr_async(c, s, a, b):
c._repr_html_()


@gen_cluster(client=True, worker_kwargs={"memory_limit": None})
def test_repr_no_memory_limit(c, s, a, b):
c._repr_html_()


@gen_test()
def test_repr_localcluster():
cluster = yield LocalCluster(
Expand Down