Move the update_snapshot_info_dest to storage mux
#6433
Merged
+118
−128
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
changlei-li
reviewed
Apr 22, 2025
ocaml/xapi/storage_mux.ml
Outdated
| let update_snapshot_info_dest () ~dbg ~sr ~vdi ~src_vdi ~snapshot_pairs = | ||
| with_dbg ~name:"SR.update_snapshot_info_dest" ~dbg @@ fun di -> | ||
| with_dbg ~name:"SR.update_snapshot_info_dest" ~dbg @@ fun _di -> | ||
| let module C = StorageAPI (Idl.Exn.GenClient (struct | ||
| let rpc = of_sr sr | ||
| end)) in |
There was a problem hiding this comment.
I find module C is not used any more in this function after modification, please check.
Vincent-lau
force-pushed
the
private/shul2/content-id
branch
2 times, most recently
from
2032fe6 to
3045e63
Compare
changlei-li
approved these changes
Apr 23, 2025
ocaml/xapi/storage_mux.ml
Outdated
| exception No_VDI | ||
|
|
||
| (* Find a VDI given a storage-layer SR and VDI *) | ||
| let find_vdi ~__context sr vdi = |
There was a problem hiding this comment.
There are two same find_vdi functions both here and storage_smapiv1.ml. Could you move it to storage_utils.ml or somewhere else to avoid two duplications. As well as the exception No_VDI.
This function updates the snapshot related db fields after the storage migration. There is no need to leave this in the storage layer as xapi-storage-script will not be able to access xapi db. Signed-off-by: Vincent Liu <[email protected]>
robhoes
reviewed
Apr 23, 2025
| (Storage_interface.Vdi.string_of vdi) | ||
| ) | ||
| in | ||
| let local_vdi = find_vdi ~dbg ~sr ~vdi (module Local) in |
There was a problem hiding this comment.
We are now doing an extra Local.SR.scan in this function call. Is that cheap? Otherwise you could perhaps return all vdis from the scan from find_vdi as well.
robhoes
approved these changes
Apr 23, 2025
Vincent-lau
force-pushed
the
private/shul2/content-id
branch
3 times, most recently
from
1bd6483 to
ad25956
Compare
Move this to storage_utils.ml since it is used by storage_smapiv1.ml and storage_mux.ml Signed-off-by: Vincent Liu <[email protected]>
Signed-off-by: Vincent Liu <[email protected]>
Extract common logic on finding vdi_info given vdi, and also add a parameter to specify where to find the VDI (locally or remotely). Signed-off-by: Vincent Liu <[email protected]>
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.
Move the update_snapshot_info_dest to storage mux as this function just does db operations.
Also rescan the SR after updaing the content_id during SXM, so that the latest content_id can be reflected in the returned vdi_info, which gets used later on in
update_snapshot_info