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
7 changes: 6 additions & 1 deletion distributed/cli/dask_scheduler.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import print_function, division, absolute_import

import atexit
import dask
import logging
import os
import shutil
Expand Down Expand Up @@ -58,7 +59,7 @@
"cluster is on a shared network file system.")
@click.option('--local-directory', default='', type=str,
help="Directory to place scheduler files")
@click.option('--preload', type=str, multiple=True, is_eager=True,
@click.option('--preload', type=str, multiple=True, is_eager=True, default='',
help='Module that should be loaded by the scheduler process '
'like "foo.bar" or "/path/to/foo.py".')
@click.argument('preload_argv', nargs=-1,
Expand Down Expand Up @@ -125,6 +126,10 @@ def del_pid_file():
scheduler_file=scheduler_file,
security=sec)
scheduler.start(addr)
if not preload:
preload = dask.config.get('distributed.scheduler.preload')
if not preload_argv:
preload_argv = dask.config.get('distributed.scheduler.preload-argv')
preload_modules(preload, parameter=scheduler, file_dir=local_directory, argv=preload_argv)

logger.info('Local Directory: %26s', local_directory)
Expand Down
4 changes: 4 additions & 0 deletions distributed/distributed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@ distributed:
transition-log-length: 100000
work-stealing: True # workers should steal tasks from each other
worker-ttl: null # like '60s'. Time to live for workers. They must heartbeat faster than this
preload: []
preload-argv: []

worker:
multiprocessing-method: forkserver
use-file-locking: True
connections: # Maximum concurrent connections for data
outgoing: 50 # This helps to control network saturation
incoming: 10
preload: []
preload-argv: []

profile:
interval: 10ms # Time between statistical profiling queries
Expand Down
8 changes: 6 additions & 2 deletions distributed/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def __init__(self, scheduler_ip=None, scheduler_port=None,
services=None, service_ports=None, name=None,
reconnect=True, memory_limit='auto',
executor=None, resources=None, silence_logs=None,
death_timeout=None, preload=(), preload_argv=[], security=None,
death_timeout=None, preload=None, preload_argv=None, security=None,
contact_address=None, memory_monitor_interval='200ms',
extensions=None, metrics=None, **kwargs):

Expand All @@ -108,7 +108,11 @@ def __init__(self, scheduler_ip=None, scheduler_port=None,
self.available_resources = (resources or {}).copy()
self.death_timeout = death_timeout
self.preload = preload
self.preload_argv = preload_argv,
if self.preload is None:
self.preload = dask.config.get('distributed.worker.preload')
self.preload_argv = preload_argv
if self.preload_argv is None:
self.preload_argv = dask.config.get('distributed.worker.preload-argv')
self.contact_address = contact_address
self.memory_monitor_interval = parse_timedelta(memory_monitor_interval, default='ms')
self.extensions = dict()
Expand Down