hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-06 10:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] Fix ClientBuilder for Local Clusters (#16204)

Browse source 
* Fix client builder

* Make tests actually run in CI (required marking a few Windows tests as flaky)
This commit is contained in:
Ian Rodney 2021-06-03 08:27:37 -07:00 • committed by GitHub
parent 51da90aa09
commit 206802b96f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
python/ray/client_builder.py
View file

@ -119,7 +119,8 @@ class _LocalClientBuilder(ClientBuilder):
sys.version_info[0], sys.version_info[1], sys.version_info[2]), sys.version_info[0], sys.version_info[1], sys.version_info[2]),
ray_version=ray.__version__, ray_version=ray.__version__,
ray_commit=ray.__commit__, ray_commit=ray.__commit__,
protocol_version=None) protocol_version=None,
_num_clients=1)
def _split_address(address: str) -> Tuple[str, str]: def _split_address(address: str) -> Tuple[str, str]:

27
python/ray/tests/test_client_builder.py
View file

@ -28,7 +28,7 @@ def test_split_address(address):
address) address)
non_url_compliant_module = f"module_test://{address}" non_url_compliant_module = f"module_test://{address}"
assert client_builder._split_address(non_url_compliant_module) == ( assert client_builder._split_address(non_url_compliant_module) == (
"module", address) "module_test", address)
@pytest.mark.parametrize( @pytest.mark.parametrize(
@ -44,6 +44,7 @@ def test_client(address):
assert builder.address == address.replace("ray://", "") assert builder.address == address.replace("ray://", "")
@pytest.mark.skipif(sys.platform == "win32", reason="Flaky on Windows.")
def test_namespace(): def test_namespace():
""" """
Most of the "checks" in this test case rely on the fact that Most of the "checks" in this test case rely on the fact that
@ -108,6 +109,7 @@ def test_connect_to_cluster(ray_start_regular_shared):
subprocess.check_output("ray stop --force", shell=True) subprocess.check_output("ray stop --force", shell=True)
@pytest.mark.skipif(sys.platform == "win32", reason="Flaky on Windows.")
def test_local_clusters(): def test_local_clusters():
""" """
This tests the various behaviors of connecting to local clusters: This tests the various behaviors of connecting to local clusters:
@ -221,6 +223,8 @@ def test_module_lacks_client_builder():
assert "does not have ClientBuilder" in str(exception) assert "does not have ClientBuilder" in str(exception)
@pytest.mark.skipif(
sys.platform == "win32", reason="RC Proxy is Flaky on Windows.")
def test_disconnect(call_ray_stop_only): def test_disconnect(call_ray_stop_only):
subprocess.check_output( subprocess.check_output(
"ray start --head --ray-client-server-port=25555", shell=True) "ray start --head --ray-client-server-port=25555", shell=True)
@ -254,8 +258,12 @@ def test_disconnect(call_ray_stop_only):
ray.put(300) ray.put(300)
def test_address_resolution(ray_start_regular_shared): @pytest.mark.skipif(
server = ray_client_server.serve("localhost:50055") sys.platform == "win32", reason="RC Proxy is Flaky on Windows.")
def test_address_resolution(call_ray_stop_only):
subprocess.check_output(
"ray start --head --ray-client-server-port=50055", shell=True)
with ray.client("localhost:50055").connect(): with ray.client("localhost:50055").connect():
assert ray.util.client.ray.is_connected() assert ray.util.client.ray.is_connected()
@ -265,12 +273,15 @@ def test_address_resolution(ray_start_regular_shared):
# client(...) takes precedence of RAY_ADDRESS=local # client(...) takes precedence of RAY_ADDRESS=local
assert ray.util.client.ray.is_connected() assert ray.util.client.ray.is_connected()
ray.client(None).connect() with pytest.raises(Exception):
assert ray.worker.global_worker.node.is_head() # This tries to call `ray.init(address="local") which
# breaks.`
ray.client(None).connect()
finally: finally:
if os.environ["RAY_ADDRESS"]: if os.environ.get("RAY_ADDRESS"):
del os.environ["RAY_ADDRESS"] del os.environ["RAY_ADDRESS"]
server.stop(0)
subprocess.check_output("ray stop --force", shell=True) if __name__ == "__main__":
sys.exit(pytest.main(["-v", __file__]))