Skip to content

Set lifetime-stagger default value to None #7445

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
fjetter merged 4 commits into from
Jan 12, 2023
Merged

Set lifetime-stagger default value to None #7445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62738aa
add tests that break stagger and restart
bstadlbauer Jan 5, 2023
4c1dcb9
set `--lifetime-stagger` default value to `None`
bstadlbauer Jan 3, 2023
afacf2e
set `--lifetime-restart` default value to `None`
bstadlbauer Jan 5, 2023
4ce53df
wait for two workers
bstadlbauer Jan 5, 2023
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: 2 additions & 4 deletions distributed/cli/dask_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,7 @@
@click.option(
"--lifetime-stagger",
type=str,
default="0 seconds",
show_default=True,
default=None,
help="Random amount by which to stagger lifetime values",
)
@click.option(
Expand All @@ -204,8 +203,7 @@
@click.option(
"--lifetime-restart/--no-lifetime-restart",
"lifetime_restart",
default=False,
show_default=True,
default=None,
required=False,
help="Whether or not to restart the worker after the lifetime lapses. "
"This assumes that you are using the --lifetime and --nanny keywords",
Expand Down
33 changes: 33 additions & 0 deletions distributed/cli/tests/test_dask_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,39 @@ def dask_setup(worker):
assert foo == "setup"


@pytest.mark.slow
@gen_cluster(nthreads=[], client=True)
async def test_set_lifetime_stagger_via_env_var(c, s):
# Ensure that lifetime stagger can be set via an environment variable
env = os.environ.copy()
env["DASK_DISTRIBUTED__WORKER__LIFETIME__DURATION"] = "10 seconds"
env["DASK_DISTRIBUTED__WORKER__LIFETIME__STAGGER"] = "2 seconds"
with popen(["dask", "worker", s.address], env=env), popen(
["dask", "worker", s.address], env=env
):
await c.wait_for_workers(2)
[lifetime1, lifetime2] = (
await c.run(lambda dask_worker: dask_worker.lifetime)
).values()
assert lifetime1 != lifetime2
assert 8 <= lifetime1 <= 12
assert 8 <= lifetime2 <= 12


@pytest.mark.slow
@gen_cluster(nthreads=[], client=True)
async def test_set_lifetime_restart_via_env_var(c, s):
# Ensure that lifetime restart can be set via an environment variable
env = os.environ.copy()
env["DASK_DISTRIBUTED__WORKER__LIFETIME__RESTART"] = "True"
with popen(["dask", "worker", s.address], env=env):
await c.wait_for_workers(1)
[lifetime_restart] = (
await c.run(lambda dask_worker: dask_worker.lifetime_restart)
).values()
assert lifetime_restart


@pytest.mark.slow
@pytest.mark.parametrize("nanny", ["--nanny", "--no-nanny"])
def test_timeout(nanny):
Expand Down