Skip to content

Commit

Permalink
avoid deprecated Worker.memory_limit property
Browse files Browse the repository at this point in the history
  • Loading branch information
graingert committed Apr 8, 2022
1 parent 4e19b69 commit 6367375
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
9 changes: 6 additions & 3 deletions distributed/deploy/tests/test_local.py
Expand Up @@ -353,7 +353,7 @@ async def test_worker_params():
memory_limit=500,
asynchronous=True,
) as c:
assert [w.memory_limit for w in c.workers.values()] == [500] * 2
assert [w.memory_manager.memory_limit for w in c.workers.values()] == [500] * 2


@gen_test()
Expand All @@ -368,7 +368,7 @@ async def test_memory_limit_none():
) as c:
w = c.workers[0]
assert type(w.data) is dict
assert w.memory_limit is None
assert w.memory_manager.memory_limit is None


def test_cleanup():
Expand Down Expand Up @@ -500,7 +500,10 @@ def test_memory(loop, n_workers):
dashboard_address=":0",
loop=loop,
) as cluster:
assert sum(w.memory_limit for w in cluster.workers.values()) <= MEMORY_LIMIT
assert (
sum(w.memory_manager.memory_limit for w in cluster.workers.values())
<= MEMORY_LIMIT
)


@pytest.mark.parametrize("n_workers", [None, 3])
Expand Down
8 changes: 4 additions & 4 deletions distributed/tests/test_worker.py
Expand Up @@ -567,13 +567,13 @@ async def test_memory_limit_auto(s):
async with Worker(s.address, nthreads=1) as a, Worker(
s.address, nthreads=2
) as b, Worker(s.address, nthreads=100) as c, Worker(s.address, nthreads=200) as d:
assert isinstance(a.memory_limit, Number)
assert isinstance(b.memory_limit, Number)
assert isinstance(a.memory_manager.memory_limit, Number)
assert isinstance(b.memory_manager.memory_limit, Number)

if CPU_COUNT > 1:
assert a.memory_limit < b.memory_limit
assert a.memory_manager.memory_limit < b.memory_manager.memory_limit

assert c.memory_limit == d.memory_limit
assert c.memory_manager.memory_limit == d.memory_manager.memory_limit


@gen_cluster(client=True)
Expand Down

0 comments on commit 6367375

Please sign in to comment.