Skip to content

[Core]Fix NullPointerException cause by raylet id is empty when get actor info in java worker #40560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SongGuyang merged 1 commit into from
Oct 24, 2023
Merged

[Core]Fix NullPointerException cause by raylet id is empty when get actor info in java worker #40560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions java/runtime/src/main/java/io/ray/runtime/gcs/GcsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,19 @@ public List<ActorInfo> getAllActorInfo(JobId jobId, ActorState actorState) {
result -> {
try {
Gcs.ActorTableData info = Gcs.ActorTableData.parseFrom(result);
UniqueId nodeId = UniqueId.NIL;
if (!info.getAddress().getRayletId().isEmpty()) {
nodeId =
UniqueId.fromByteBuffer(
ByteBuffer.wrap(info.getAddress().getRayletId().toByteArray()));
}
actorInfos.add(
new ActorInfo(
ActorId.fromBytes(info.getActorId().toByteArray()),
ActorState.fromValue(info.getState().getNumber()),
info.getNumRestarts(),
new Address(
UniqueId.fromByteBuffer(
ByteBuffer.wrap(info.getAddress().getRayletId().toByteArray())),
info.getAddress().getIpAddress(),
info.getAddress().getPort()),
nodeId, info.getAddress().getIpAddress(), info.getAddress().getPort()),
info.getName()));
} catch (InvalidProtocolBufferException e) {
throw new RayException("Failed to parse actor info.", e);
Expand Down
2 changes: 1 addition & 1 deletion java/runtime/src/main/java/io/ray/runtime/gcs/GlobalStateAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ private void destroyGlobalStateAccessor() {
private native List<byte[]> nativeGetAllNodeInfo(long nativePtr);

private native List<byte[]> nativeGetAllActorInfo(
long nativePtr, byte[] jobId, String actor_state_name);
long nativePtr, byte[] jobId, String actorStateName);

private native byte[] nativeGetActorInfo(long nativePtr, byte[] actorId);

Expand Down