cleanup

python/ray/services.py

@@ -200,7 +200,7 @@ def start_redis(node_ip_address, port=None, num_retries=20, cleanup=True, redire
  assert os.path.isfile(redis_filepath)
  assert os.path.isfile(redis_module)
  counter = 0
- if port:
+ if port is not None:
  if num_retries != 1:
  raise Exception("Num retries must be 1 if port is specified")
  else:
@@ -399,6 +399,8 @@ def start_ray_processes(address_info=None,
  /dev/null.
  include_global_scheduler (bool): If include_global_scheduler is True, then
  start a global scheduler process.
+ include_redis (bool): If include_redis is True, then start a Redis
+ server process.
 
  Returns:
  A dictionary of the address information for the processes that were
@@ -538,12 +540,12 @@ def start_ray_node(node_ip_address,
  redirect_output=redirect_output)
 
 def start_ray_head(address_info=None,
-  node_ip_address="127.0.0.1",
-  num_workers=0,
-  num_local_schedulers=1,
-  worker_path=None,
-  cleanup=True,
-  redirect_output=False):
+ node_ip_address="127.0.0.1",
+ num_workers=0,
+ num_local_schedulers=1,
+ worker_path=None,
+ cleanup=True,
+ redirect_output=False):
  """Start Ray in local mode.
 
  Args:

python/ray/worker.py

@@ -781,10 +781,10 @@ def _init(address_info=None, start_ray_local=False, object_id_seed=None,
  num_local_schedulers = 1
  # Start the scheduler, object store, and some workers. These will be killed
  # by the call to cleanup(), which happens when the Python script exits.
- address_info = services.start_ray_local(address_info=address_info,
-  node_ip_address=node_ip_address,
-  num_workers=num_workers,
-  num_local_schedulers=num_local_schedulers)
+ address_info = services.start_ray_head(address_info=address_info,
+ node_ip_address=node_ip_address,
+ num_workers=num_workers,
+ num_local_schedulers=num_local_schedulers)
  else:
  if redis_address is None:
  raise Exception("If start_ray_local=False, then redis_address must be provided.")

scripts/start_ray.py

@@ -56,10 +56,10 @@ def check_no_existing_redis_clients(node_ip_address, redis_address):
  address_info_in = None
 
  address_info = services.start_ray_head(address_info=address_info_in,
-  node_ip_address=node_ip_address,
-  num_workers=args.num_workers,
-  cleanup=False,
-  redirect_output=True)
+ node_ip_address=node_ip_address,
+ num_workers=args.num_workers,
+ cleanup=False,
+ redirect_output=True)
  print(address_info)
  print("\nStarted Ray with {} workers on this node. A different number of "
  "workers can be set with the --num-workers flag (but you have to "
@@ -78,7 +78,7 @@ def check_no_existing_redis_clients(node_ip_address, redis_address):
  address_info["redis_address"]))
  else:
  # Start Ray on a non-head node.
- if args.redis_port:
+ if args.redis_port is not None:
  raise Exception("If --head is not passed in, --redis-port is not allowed")
  if args.redis_address is None:
  raise Exception("If --head is not passed in, --redis-address must be provided.")