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

[Java]Add actor id when throw RayActorException (#10886)

Browse source
This commit is contained in:
fangfengbin 2020-09-20 16:51:14 +08:00 • committed by GitHub
parent 3f90ec5963
commit 1d06e025ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/api/src/main/java/io/ray/api/id/TaskId.java
View file

@ -9,7 +9,7 @@ import java.util.Arrays;
*/
public class TaskId extends BaseId implements Serializable {
private static final int UNIQUE_BYTES_LENGTH = 8;
public static final int UNIQUE_BYTES_LENGTH = 8;
public static final int LENGTH = ActorId.LENGTH + UNIQUE_BYTES_LENGTH;

10
java/runtime/src/main/java/io/ray/runtime/exception/RayActorException.java
View file

@ -1,5 +1,7 @@
package io.ray.runtime.exception;
import io.ray.api.id.ActorId;
/**
* Indicates that the actor died unexpectedly before finishing a task.
*
@ -8,10 +10,18 @@ package io.ray.runtime.exception;
*/
public class RayActorException extends RayException {
public ActorId actorId;
public RayActorException() {
super("The actor died unexpectedly before finishing this task.");
}
public RayActorException(ActorId actorId) {
super(String.format(
"The actor %s died unexpectedly before finishing this task.", actorId));
this.actorId = actorId;
}
public RayActorException(String message) {
super(message);
}

3
java/runtime/src/main/java/io/ray/runtime/object/ObjectSerializer.java
View file

@ -9,6 +9,7 @@ import io.ray.runtime.exception.RayWorkerException;
import io.ray.runtime.exception.UnreconstructableException;
import io.ray.runtime.generated.Common.ErrorType;
import io.ray.runtime.serializer.Serializer;
import io.ray.runtime.util.IdUtil;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
@ -74,7 +75,7 @@ public class ObjectSerializer {
} else if (Arrays.equals(meta, WORKER_EXCEPTION_META)) {
return new RayWorkerException();
} else if (Arrays.equals(meta, ACTOR_EXCEPTION_META)) {
return new RayActorException();
return new RayActorException(IdUtil.getActorIdFromObjectId(objectId));
} else if (Arrays.equals(meta, UNRECONSTRUCTABLE_EXCEPTION_META)) {
return new UnreconstructableException(objectId);
} else if (Arrays.equals(meta, TASK_EXECUTION_EXCEPTION_META)) {

17
java/runtime/src/main/java/io/ray/runtime/util/IdUtil.java
View file

@ -1,6 +1,9 @@
package io.ray.runtime.util;
import io.ray.api.id.ActorId;
import io.ray.api.id.BaseId;
import io.ray.api.id.ObjectId;
import io.ray.api.id.TaskId;
/**
* Helper method for different Ids. Note: any changes to these methods must be synced with C++
@ -75,4 +78,18 @@ public class IdUtil {
return h;
}
/**
* Compute the actor ID of the task which created this object.
* @return The actor ID of the task which created this object.
*/
public static ActorId getActorIdFromObjectId(ObjectId objectId) {
byte[] taskIdBytes = new byte[TaskId.LENGTH];
System.arraycopy(objectId.getBytes(), 0, taskIdBytes, 0, TaskId.LENGTH);
TaskId taskId = TaskId.fromBytes(taskIdBytes);
byte[] actorIdBytes = new byte[ActorId.LENGTH];
System.arraycopy(taskId.getBytes(), TaskId.UNIQUE_BYTES_LENGTH,
actorIdBytes, 0, ActorId.LENGTH);
return ActorId.fromBytes(actorIdBytes);
}
}

1
java/test/src/main/java/io/ray/test/FailureTest.java
View file

@ -121,6 +121,7 @@ public class FailureTest extends BaseTest {
} catch (RayActorException e) {
// When the actor process dies while executing a task, we should receive an
// RayActorException.
Assert.assertEquals(e.actorId, actor.getId());
}
try {
actor.task(BadActor::badMethod).remote().get();