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

[Java] Do not expose GcsClient to normal users (#4675)

Browse Source
This commit is contained in:
Qing Wang
2019-04-24 10:50:35 +08:00
committed by Hao Chen
parent c99e3caaca
commit 4dd628a837
13 changed files with 37 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/test/src/main/java/org/ray/api/benchmark/MicroBenchmarks.java
+2 -1
View File
@@ -20,7 +20,8 @@ public class MicroBenchmarks {
}
final long duration = System.nanoTime() - start;
LOGGER.info(
"Benchmark \"{}\" finished, repeated {} times, total duration {} ms, average duration {} ns.",
"Benchmark \"{}\" finished, repeated {} times, total duration {} ms," +
" average duration {} ns.",
name, numRepeats, duration / 1_000_000, duration / numRepeats);
}
java/test/src/main/java/org/ray/api/test/GcsClientTest.java
+3 -3
View File
@@ -4,10 +4,10 @@ import com.google.common.base.Preconditions;
import java.util.List;
import org.ray.api.Ray;
import org.ray.api.TestUtils;
import org.ray.api.gcs.GcsClient;
import org.ray.api.gcs.NodeInfo;
import org.ray.api.runtimecontext.NodeInfo;
import org.ray.runtime.AbstractRayRuntime;
import org.ray.runtime.config.RayConfig;
import org.ray.runtime.gcs.GcsClient;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -31,7 +31,7 @@ public class GcsClientTest extends BaseTest {
RayConfig config = ((AbstractRayRuntime)Ray.internal()).getRayConfig();
Preconditions.checkNotNull(config);
GcsClient gcsClient = Ray.getGcsClient();
GcsClient gcsClient = ((AbstractRayRuntime)Ray.internal()).getGcsClient();
List<NodeInfo> allNodeInfo = gcsClient.getAllNodeInfo();
Assert.assertEquals(allNodeInfo.size(), 1);
Assert.assertEquals(allNodeInfo.get(0).nodeAddress, config.nodeIp);
java/test/src/main/java/org/ray/api/test/PlasmaFreeTest.java
+2 -2
View File
@@ -6,7 +6,6 @@ import org.ray.api.RayObject;
import org.ray.api.TestUtils;
import org.ray.api.annotation.RayRemote;
import org.ray.runtime.AbstractRayRuntime;
import org.ray.runtime.gcs.GcsClientImpl;
import org.ray.runtime.util.UniqueIdUtil;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -37,7 +36,8 @@ public class PlasmaFreeTest extends BaseTest {
Assert.assertEquals("hello", helloId.get());
Ray.internal().free(ImmutableList.of(helloId.getId()), true, true);
final boolean result = TestUtils.waitForCondition(() -> !((GcsClientImpl) Ray.getGcsClient())
final boolean result = TestUtils.waitForCondition(
() -> !(((AbstractRayRuntime)Ray.internal()).getGcsClient())
.rayletTaskExistsInGcs(UniqueIdUtil.computeTaskId(helloId.getId())), 50);
Assert.assertTrue(result);
}