hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-11 21:56:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Core] Fix ray start failure to due to bug of redis address detection (#11735)

Browse source 
* Fix ray start failure to due redis address detection bug

* Address comment
This commit is contained in:
Kai Yang 2020-11-05 04:04:44 +08:00 • committed by GitHub
parent 53aac55739
commit 31598338b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
python/ray/_private/services.py
View file

@ -134,16 +134,20 @@ def find_redis_address(address=None):
# the first argument. # the first argument.
# Explanation: https://unix.stackexchange.com/a/432681 # Explanation: https://unix.stackexchange.com/a/432681
# More info: https://github.com/giampaolo/psutil/issues/1179 # More info: https://github.com/giampaolo/psutil/issues/1179
for arglist in proc.cmdline(): cmdline = proc.cmdline()
# Given we're merely seeking --redis-address, we just split # NOTE(kfstorm): To support Windows, we can't use
# every argument on spaces for now. # `os.path.basename(cmdline[0]) == "raylet"` here.
for arg in arglist.split(" "): if len(cmdline) > 0 and "raylet" in os.path.basename(cmdline[0]):
# TODO(ekl): Find a robust solution for locating Redis. for arglist in cmdline:
if arg.startswith("--redis-address="): # Given we're merely seeking --redis-address, we just split
proc_addr = arg.split("=")[1] # every argument on spaces for now.
if address is not None and address != proc_addr: for arg in arglist.split(" "):
continue # TODO(ekl): Find a robust solution for locating Redis.
redis_addresses.add(proc_addr) if arg.startswith("--redis-address="):
proc_addr = arg.split("=")[1]
if address is not None and address != proc_addr:
continue
redis_addresses.add(proc_addr)
except psutil.AccessDenied: except psutil.AccessDenied:
pass pass
except psutil.NoSuchProcess: except psutil.NoSuchProcess:

7
python/ray/tests/test_advanced_3.py
View file

@ -18,6 +18,7 @@ import ray.cluster_utils
import ray.test_utils import ray.test_utils
from ray import resource_spec from ray import resource_spec
import setproctitle import setproctitle
import subprocess
from ray.test_utils import (check_call_ray, RayTestTimeoutException, from ray.test_utils import (check_call_ray, RayTestTimeoutException,
wait_for_condition, wait_for_num_actors) wait_for_condition, wait_for_num_actors)
@ -522,6 +523,12 @@ def test_export_after_shutdown(ray_start_regular):
ray.get(export_definitions_from_worker.remote(f, Actor)) ray.get(export_definitions_from_worker.remote(f, Actor))
def test_ray_start_and_stop():
for i in range(10):
subprocess.check_call(["ray", "start", "--head"])
subprocess.check_call(["ray", "stop"])
def test_invalid_unicode_in_worker_log(shutdown_only): def test_invalid_unicode_in_worker_log(shutdown_only):
info = ray.init(num_cpus=1) info = ray.init(num_cpus=1)