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

[Core] Multi-tenancy: Pass env variables from job config to worker processes (#10022)

Browse Source
This commit is contained in:
Kai Yang
2020-08-11 05:31:37 +08:00
committed by GitHub
parent df676bc9aa
commit 3bc17fa62a
7 changed files with 154 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/test/src/main/java/io/ray/test/JobConfigTest.java
+31 -8
View File
@@ -16,6 +16,9 @@ public class JobConfigTest extends BaseTest {
System.setProperty("ray.raylet.config.enable_multi_tenancy", "true");
System.setProperty("ray.job.num-java-workers-per-process", "3");
System.setProperty("ray.job.jvm-options.0", "-DX=999");
System.setProperty("ray.job.jvm-options.1", "-DY=998");
System.setProperty("ray.job.worker-env.foo1", "bar1");
System.setProperty("ray.job.worker-env.foo2", "bar2");
}
@AfterClass
@@ -23,10 +26,17 @@ public class JobConfigTest extends BaseTest {
System.clearProperty("ray.raylet.config.enable_multi_tenancy");
System.clearProperty("ray.job.num-java-workers-per-process");
System.clearProperty("ray.job.jvm-options.0");
System.clearProperty("ray.job.jvm-options.1");
System.clearProperty("ray.job.worker-env.foo1");
System.clearProperty("ray.job.worker-env.foo2");
}
public static String getJvmOptions() {
return System.getProperty("X");
public static String getJvmOptions(String propertyName) {
return System.getProperty(propertyName);
}
public static String getEnvVariable(String key) {
return System.getenv(key);
}
public static Integer getWorkersNum() {
@@ -39,14 +49,23 @@ public class JobConfigTest extends BaseTest {
return TestUtils.getRuntime().getRayConfig().numWorkersPerProcess;
}
public String getJvmOptions() {
return System.getProperty("X");
public String getJvmOptions(String propertyName) {
return System.getProperty(propertyName);
}
public static String getEnvVariable(String key) {
return System.getenv(key);
}
}
public void testJvmOptions() {
ObjectRef<String> obj = Ray.task(JobConfigTest::getJvmOptions).remote();
Assert.assertEquals("999", obj.get());
Assert.assertEquals("999", Ray.task(JobConfigTest::getJvmOptions, "X").remote().get());
Assert.assertEquals("998", Ray.task(JobConfigTest::getJvmOptions, "Y").remote().get());
}
public void testWorkerEnvVariable() {
Assert.assertEquals("bar1", Ray.task(JobConfigTest::getEnvVariable, "foo1").remote().get());
Assert.assertEquals("bar2", Ray.task(JobConfigTest::getEnvVariable, "foo2").remote().get());
}
public void testNumJavaWorkerPerProcess() {
@@ -59,8 +78,12 @@ public class JobConfigTest extends BaseTest {
ActorHandle<MyActor> actor = Ray.actor(MyActor::new).remote();
// test jvm options.
ObjectRef<String> obj1 = actor.task(MyActor::getJvmOptions).remote();
Assert.assertEquals("999", obj1.get());
Assert.assertEquals("999", actor.task(MyActor::getJvmOptions, "X").remote().get());
Assert.assertEquals("998", actor.task(MyActor::getJvmOptions, "Y").remote().get());
// test worker env variables
Assert.assertEquals("bar1", Ray.task(MyActor::getEnvVariable, "foo1").remote().get());
Assert.assertEquals("bar2", Ray.task(MyActor::getEnvVariable, "foo2").remote().get());
// test workers number.
ObjectRef<Integer> obj2 = actor.task(MyActor::getWorkersNum).remote();