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

[fix] Fix ray.home configuration item. (#2977)

Browse Source 
If we set `ray.home` configuration item to `""`.
The current `RayConfig` will set it to current work directory, like `/User/My/Ray`.
But the some other configuration items(like `redisServerExecutablePath`) will be set to `/User/My/Ray//build/src/common/thirdparty/redis/src/redis-server` by mistake.
Note: There are 2 `/` between current work directory and `build/src/common....`

This PR will fix this issue.
This commit is contained in:
Wang Qing
2018-09-28 13:06:14 +08:00
committed by Robert Nishihara
parent 5eaf429c53
commit 68cf194e90
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/runtime/src/main/java/org/ray/runtime/config/RayConfig.java
+6 -5
View File
@@ -84,12 +84,12 @@ public class RayConfig {
// run mode
runMode = config.getEnum(RunMode.class, "ray.run-mode");
// ray home
String rayHome = config.getString("ray.home");
if (!rayHome.startsWith("/")) {
String localRayHome = config.getString("ray.home");
if (!localRayHome.startsWith("/")) {
// If ray.home isn't an absolute path, prepend it with current work dir.
rayHome = System.getProperty("user.dir") + "/" + rayHome;
localRayHome = System.getProperty("user.dir") + "/" + localRayHome;
}
this.rayHome = removeTrailingSlash(rayHome);
rayHome = removeTrailingSlash(localRayHome);
// node ip
String nodeIp = config.getString("ray.node-ip");
if (nodeIp.isEmpty()) {
@@ -150,7 +150,8 @@ public class RayConfig {
rayHome + "/build/src/local_scheduler"
).addAll(customLibraryPath).build();
redisServerExecutablePath = rayHome + "/build/src/common/thirdparty/redis/src/redis-server";
redisServerExecutablePath = rayHome +
"/build/src/common/thirdparty/redis/src/redis-server";
redisModulePath = rayHome + "/build/src/common/redis_module/libray_redis_module.so";
plasmaStoreExecutablePath = rayHome + "/build/src/plasma/plasma_store_server";
rayletExecutablePath = rayHome + "/build/src/ray/raylet/raylet";