mirror of
https://github.com/wassname/ray.git
synced 2026-07-02 09:55:08 +08:00
Remove legacy Ray code. (#3121)
* Remove legacy Ray code. * Fix cmake and simplify monitor. * Fix linting * Updates * Fix * Implement some methods. * Remove more plasma manager references. * Fix * Linting * Fix * Fix * Make sure class IDs are strings. * Some path fixes * Fix * Path fixes and update arrow * Fixes. * linting * Fixes * Java fixes * Some java fixes * TaskLanguage -> Language * Minor * Fix python test and remove unused method signature. * Fix java tests * Fix jenkins tests * Remove commented out code.
This commit is contained in:
committed by
Philipp Moritz
parent
055daf17a0
commit
658c14282c
@@ -44,7 +44,6 @@ class Cluster(object):
|
||||
|
||||
All nodes are by default started with the following settings:
|
||||
cleanup=True,
|
||||
use_raylet=True,
|
||||
resources={"CPU": 1},
|
||||
object_store_memory=100 * (2**20) # 100 MB
|
||||
|
||||
@@ -55,12 +54,13 @@ class Cluster(object):
|
||||
Returns:
|
||||
Node object of the added Ray node.
|
||||
"""
|
||||
node_kwargs = dict(
|
||||
cleanup=True,
|
||||
use_raylet=True,
|
||||
resources={"CPU": 1},
|
||||
object_store_memory=100 * (2**20) # 100 MB
|
||||
)
|
||||
node_kwargs = {
|
||||
"cleanup": True,
|
||||
"resources": {
|
||||
"CPU": 1
|
||||
},
|
||||
"object_store_memory": 100 * (2**20) # 100 MB
|
||||
}
|
||||
node_kwargs.update(override_kwargs)
|
||||
|
||||
if self.head_node is None:
|
||||
@@ -179,7 +179,9 @@ class Node(object):
|
||||
for process_name, process_list in self.process_dict.items():
|
||||
logger.info("Killing all {}(s)".format(process_name))
|
||||
for process in process_list:
|
||||
process.kill()
|
||||
# Kill the process if it is still alive.
|
||||
if process.poll() is None:
|
||||
process.kill()
|
||||
|
||||
for process_name, process_list in self.process_dict.items():
|
||||
logger.info("Waiting all {}(s)".format(process_name))
|
||||
|
||||
@@ -28,9 +28,6 @@ class TestRedisPassword(object):
|
||||
@pytest.mark.skipif(
|
||||
os.environ.get("RAY_USE_NEW_GCS") == "on",
|
||||
reason="New GCS API doesn't support Redis authentication yet.")
|
||||
@pytest.mark.skipif(
|
||||
os.environ.get("RAY_USE_XRAY") == "0",
|
||||
reason="Redis authentication is not supported in legacy Ray.")
|
||||
def test_redis_password(self, password, shutdown_only):
|
||||
# Workaround for https://github.com/ray-project/ray/issues/3045
|
||||
@ray.remote
|
||||
|
||||
@@ -35,22 +35,11 @@ def _wait_for_nodes_to_join(num_nodes, timeout=20):
|
||||
client_table = ray.global_state.client_table()
|
||||
num_ready_nodes = len(client_table)
|
||||
if num_ready_nodes == num_nodes:
|
||||
ready = True
|
||||
# Check that for each node, a local scheduler and a plasma manager
|
||||
# are present.
|
||||
if ray.global_state.use_raylet:
|
||||
# In raylet mode, this is a list of map.
|
||||
# The GCS info will appear as a whole instead of part by part.
|
||||
return
|
||||
else:
|
||||
for ip_address, clients in client_table.items():
|
||||
client_types = [client["ClientType"] for client in clients]
|
||||
if "local_scheduler" not in client_types:
|
||||
ready = False
|
||||
if "plasma_manager" not in client_types:
|
||||
ready = False
|
||||
if ready:
|
||||
return
|
||||
# In raylet mode, this is a list of map.
|
||||
# The GCS info will appear as a whole instead of part by part.
|
||||
return
|
||||
if num_ready_nodes > num_nodes:
|
||||
# Too many nodes have joined. Something must be wrong.
|
||||
raise Exception("{} nodes have joined the cluster, but we were "
|
||||
|
||||
Reference in New Issue
Block a user