[core] change GcsClient.get_all_node_info return type to proto type. #46057
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Ruiyang Wang <rywang014@gmail.com>
rynewang
requested review from
ericl,
richardliaw,
rkooo567 and
jjyao
as code owners
This was referenced Jun 14, 2024
Signed-off-by: Ruiyang Wang <rywang014@gmail.com>
Signed-off-by: Ruiyang Wang <rywang014@gmail.com>
jjyao
reviewed
Jun 17, 2024
Signed-off-by: Ruiyang Wang <rywang014@gmail.com>
jjyao
approved these changes
Jun 17, 2024
Comment on lines
+2883
to
2899
| def get_all_node_info(self, timeout=None) -> Dict[NodeID, GcsNodeInfo]: | ||
| cdef: | ||
| int64_t timeout_ms = round(1000 * timeout) if timeout else -1 | ||
| CGcsNodeInfo node_info | ||
| c_vector[CGcsNodeInfo] node_infos | ||
| CGcsNodeInfo c_node_info | ||
| c_vector[CGcsNodeInfo] c_node_infos | ||
| c_vector[c_string] serialized_node_infos | ||
| with nogil: | ||
| check_status(self.inner.get().GetAllNodeInfo(timeout_ms, node_infos)) | ||
| check_status(self.inner.get().GetAllNodeInfo(timeout_ms, c_node_infos)) | ||
| for c_node_info in c_node_infos: | ||
| serialized_node_infos.push_back(c_node_info.SerializeAsString()) | ||
|
|
||
| result = {} | ||
| for node_info in node_infos: | ||
| c_resources = PythonGetResourcesTotal(node_info) | ||
| result[node_info.node_id()] = { | ||
| "node_name": node_info.node_name(), | ||
| "state": node_info.state(), | ||
| "labels": PythonGetNodeLabels(node_info), | ||
| "resources": {key.decode(): value for key, value in c_resources} | ||
| } | ||
| for serialized in serialized_node_infos: | ||
| node_info = GcsNodeInfo() | ||
| node_info.ParseFromString(serialized) | ||
| result[NodeID.from_binary(node_info.node_id)] = node_info | ||
| return result |
There was a problem hiding this comment.
We need to be careful about the performance since it now has ser + deser overhead.
There was a problem hiding this comment.
I feel it should be ok because the current code just "manually" re-serializes by taking some C++ fields into python dicts and strings. Should be on par.
chungen04
pushed a commit
to chungen04/ray
that referenced
this pull request
Jun 18, 2024
…ay-project#46057) Signed-off-by: Ruiyang Wang <rywang014@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes a custom proto-to-dict conversion by directly returning protos. This avoids some arbitrary data type semantics and prepares for the removal of PythonGcsClient. Also returns dict keys with JobID and NodeID.
Before:
After: