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

[core] Rename OVERRIDE_NODE_ID_FOR_TESTING to RAYLET_NODE_ID to make it a feature (#28275)

Browse source 
This PR changed the OVERRIDE_NODE_ID_FOR_TESTING to RAYLET_NODE_ID so that this is a feature which can be used to start raylet with a given raylet id by setting os env RAY_RAYLET_NODE_ID.
This commit is contained in:
Yi Cheng 2022-09-05 21:22:06 +00:00 • committed by GitHub
parent 63ab063997
commit 10e9422f8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
python/ray/autoscaler/_private/fake_multi_node/node_provider.py
View file

@ -322,7 +322,7 @@ class FakeMultiNodeProvider(NodeProvider):
ray._private.services.get_node_ip_address() ray._private.services.get_node_ip_address()
), ),
env_vars={ env_vars={
"RAY_OVERRIDE_NODE_ID_FOR_TESTING": next_id, "RAY_RAYLET_NODE_ID": next_id,
"RAY_OVERRIDE_RESOURCES": json.dumps(resources), "RAY_OVERRIDE_RESOURCES": json.dumps(resources),
}, },
) )
@ -472,7 +472,7 @@ class FakeMultiNodeDockerProvider(FakeMultiNodeProvider):
host_client_port=self._host_client_port, host_client_port=self._host_client_port,
resources=resources, resources=resources,
env_vars={ env_vars={
"RAY_OVERRIDE_NODE_ID_FOR_TESTING": node_id, "RAY_RAYLET_NODE_ID": node_id,
"RAY_OVERRIDE_RESOURCES": resource_str, "RAY_OVERRIDE_RESOURCES": resource_str,
**self.provider_config.get("env_vars", {}), **self.provider_config.get("env_vars", {}),
}, },

4
python/ray/scripts/scripts.py
View file

@ -675,9 +675,7 @@ def start(
ray_params.gcs_server_port = port ray_params.gcs_server_port = port
if os.environ.get("RAY_FAKE_CLUSTER"): if os.environ.get("RAY_FAKE_CLUSTER"):
ray_params.env_vars = { ray_params.env_vars = {"RAY_RAYLET_NODE_ID": FAKE_HEAD_NODE_ID}
"RAY_OVERRIDE_NODE_ID_FOR_TESTING": FAKE_HEAD_NODE_ID
}
num_redis_shards = None num_redis_shards = None
# Start Ray on the head node. # Start Ray on the head node.

2
src/ray/common/ray_internal_flag_def.h
View file

@ -29,4 +29,4 @@ RAY_INTERNAL_FLAG(std::string, JOB_ID, "")
RAY_INTERNAL_FLAG(std::string, RAYLET_PID, "") RAY_INTERNAL_FLAG(std::string, RAYLET_PID, "")
/// Override the random node ID for testing. /// Override the random node ID for testing.
RAY_INTERNAL_FLAG(std::string, OVERRIDE_NODE_ID_FOR_TESTING, "") RAY_INTERNAL_FLAG(std::string, RAYLET_NODE_ID, "")

5
src/ray/raylet/raylet.cc
View file

@ -64,9 +64,8 @@ Raylet::Raylet(instrumented_io_context &main_service,
std::shared_ptr<gcs::GcsClient> gcs_client, std::shared_ptr<gcs::GcsClient> gcs_client,
int metrics_export_port) int metrics_export_port)
: main_service_(main_service), : main_service_(main_service),
self_node_id_( self_node_id_(!RayConfig::instance().RAYLET_NODE_ID().empty()
!RayConfig::instance().OVERRIDE_NODE_ID_FOR_TESTING().empty() ? NodeID::FromHex(RayConfig::instance().RAYLET_NODE_ID())
? NodeID::FromHex(RayConfig::instance().OVERRIDE_NODE_ID_FOR_TESTING())
: NodeID::FromRandom()), : NodeID::FromRandom()),
gcs_client_(gcs_client), gcs_client_(gcs_client),
node_manager_(main_service, node_manager_(main_service,