Merge feature/guest-vm-service-aware into master #6407
Merged
Conversation
This file contains hidden or 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
Add a new field to store service aware data from guest vms Signed-off-by: Changlei Li <changlei.li@cloud.com>
Add a new field to store service aware data from guest vms
1. xenopsd backend read and watch /local/domain/%d/data/service 2. xapi_guest_agent convert the data to (string, string) list to store in VM_guest_metrics.services Signed-off-by: Changlei Li <changlei.li@cloud.com>
Signed-off-by: Changlei Li <changlei.li@cloud.com>
…i-project#6317) The field `VM_guest_metrics.services` added previously (xapi-project#6309) is used to store VM service information reported by guest tools. Xapi does not use this data but just holds it for outside consumers. This PR reads the xenstore path `data/service` and converts to `[("service_name/key", "value")]` pair list and then store to VM_guest_metrics.services. The path to read is like: `/local/domain/<id>/data/service/<service_name>/<key> = <value>`
Signed-off-by: Changlei Li <changlei.li@cloud.com>
Signed-off-by: Changlei Li <changlei.li@cloud.com>
Conflict solved: ``` $ git diff diff --cc ocaml/idl/schematest.ml index b534f10,255e094e1..000000000 --- a/ocaml/idl/schematest.ml +++ b/ocaml/idl/schematest.ml @@@ -3,7 -3,7 +3,11 @@@ let hash x = Digest.string x |> Digest. (* BEWARE: if this changes, check that schema has been bumped accordingly in ocaml/idl/datamodel_common.ml, usually schema_minor_vsn *) ++<<<<<<< HEAD +let last_known_schema_hash = "34390a071f5df0fac8dcf9423a9111ae" ++======= + let last_known_schema_hash = "ad67a64cd47cdea32085518c1fb38d27" ++>>>>>>> master ``` Commit b6ced44 is new for updating last_known_schema_hash and datamodel lifecycle
No conflict during merge. The code scanning warnings are introduced by xapi-project#5995 , not relevant to this feature.
Sync master before merging to master. No confilct.
Signed-off-by: Changlei Li <changlei.li@cloud.com>
Vincent-lau
approved these changes
Apr 7, 2025
minglumlu
approved these changes
Apr 8, 2025
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.
commit 2653f74 is new to update datamodel lifecycle