wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-06-30 20:18:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow address instead of redis_address (#5412)

Browse Source 
* addr

* wip

* fix typo

* add to start

* switch to ray address for train

* say address

* disambiguate help

* comments 2
This commit is contained in:
Eric Liang
2019-08-10 00:18:41 -07:00
committed by GitHub
parent 7e8a4a62ea
commit df47bdf6c9
4 changed files with 61 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/scripts/scripts.py
+16 -34
View File
@@ -8,7 +8,6 @@ import json
import logging
import os
import subprocess
import sys
import ray.services as services
from ray.autoscaler.commands import (
@@ -74,6 +73,8 @@ def cli(logging_level, logging_format):
required=False,
type=str,
help="the address to use for connecting to Redis")
@click.option(
"--address", required=False, type=str, help="same as --redis-address")
@click.option(
"--redis-port",
required=False,
@@ -216,12 +217,12 @@ def cli(logging_level, logging_format):
is_flag=True,
default=False,
help="Specify whether load code from local file or GCS serialization.")
def start(node_ip_address, redis_address, redis_port, num_redis_shards,
redis_max_clients, redis_password, redis_shard_ports,
object_manager_port, node_manager_port, object_store_memory,
redis_max_memory, num_cpus, num_gpus, resources, head, include_webui,
block, plasma_directory, huge_pages, autoscaling_config,
no_redirect_worker_output, no_redirect_output,
def start(node_ip_address, redis_address, address, redis_port,
num_redis_shards, redis_max_clients, redis_password,
redis_shard_ports, object_manager_port, node_manager_port,
object_store_memory, redis_max_memory, num_cpus, num_gpus, resources,
head, include_webui, block, plasma_directory, huge_pages,
autoscaling_config, no_redirect_worker_output, no_redirect_output,
plasma_store_socket_name, raylet_socket_name, temp_dir, include_java,
java_worker_options, load_code_from_local, internal_config):
# Convert hostnames to numerical IP address.
@@ -229,6 +230,13 @@ def start(node_ip_address, redis_address, redis_port, num_redis_shards,
node_ip_address = services.address_to_ip(node_ip_address)
if redis_address is not None:
redis_address = services.address_to_ip(redis_address)
if address:
if redis_address:
raise ValueError(
"You should specify address instead of redis_address.")
if address == "auto":
address = services.find_redis_address_or_die()
redis_address = address
try:
resources = json.loads(resources)
@@ -741,33 +749,7 @@ done
help="Override the redis address to connect to.")
def timeline(redis_address):
if not redis_address:
import psutil
pids = psutil.pids()
redis_addresses = set()
for pid in pids:
try:
proc = psutil.Process(pid)
for arglist in proc.cmdline():
for arg in arglist.split(" "):
if arg.startswith("--redis-address="):
addr = arg.split("=")[1]
redis_addresses.add(addr)
except psutil.AccessDenied:
pass
except psutil.NoSuchProcess:
pass
if len(redis_addresses) > 1:
logger.info(
"Found multiple active Ray instances: {}. ".format(
redis_addresses) +
"Please specify the one to connect to with --redis-address.")
sys.exit(1)
elif not redis_addresses:
logger.info(
"Could not find any running Ray instance. "
"Please specify the one to connect to with --redis-address.")
sys.exit(1)
redis_address = redis_addresses.pop()
redis_address = services.find_redis_address_or_die()
logger.info("Connecting to Ray instance at {}.".format(redis_address))
ray.init(redis_address=redis_address)
time = datetime.today().strftime("%Y-%m-%d_%H-%M-%S")