Skip to content

xapi-cli-server: stop using SR records for cross pool migrations (master) #6947

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

Open
psafont wants to merge 3 commits into
base: master
Choose a base branch
from
Open

xapi-cli-server: stop using SR records for cross pool migrations (master) #6947

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b5352f
xapi-cli-server: stop using SR records to filter ISO-backed PBDs on c…
psafont Feb 10, 2026
96c570c
xapi-cli-server: stop using SR records for cross pool migrations
psafont Feb 10, 2026
dfb2d4e
xapi-cli-server: print reason for failing to select preferred SR
psafont Mar 12, 2026
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
107 changes: 62 additions & 45 deletions ocaml/xapi-cli-server/cli_operations.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4839,56 +4839,73 @@ let vm_migrate printer rpc session_id params =
(read_map_params "vgpu" params)
in
let preferred_sr =
(* The preferred SR is determined to be as the SR that the destine host has a PDB attached to it,
and among the choices of that the shared is preferred first(as it is recommended to have shared storage
in pool to host VMs), and then the one with the maximum available space *)
(* The preferred SR is determined to be as the SR that the
destination host has a PDB attached to it, and among the choices
of that the shared is preferred first (as it is recommended to
have shared storage in pool to host VMs), and then the one with
the maximum available space *)
try
let expr =
Printf.sprintf
{|(field "host"="%s") and (field "currently_attached"="true")|}
(Ref.string_of host)
let host_attached_pbds =
let expr =
Printf.sprintf
{|(field "host"="%s") and (field "currently_attached"="true")|}
(Ref.string_of host)
in
remote Client.PBD.get_all_records_where ~expr
in
let srs =
remote Client.PBD.get_all_where ~expr
|> List.map (fun pbd ->
let sr = remote Client.PBD.get_SR ~self:pbd in
(sr, remote Client.SR.get_record ~self:sr)
)
let shared_non_iso_srs () =
let expr =
{|(not (field "content_type"="iso")) and (field "shared"="true")|}
in
remote Client.SR.get_all_where ~expr
in
(* In the following loop, the current SR:sr' will be compared with previous checked ones,
first if it is an ISO type, then pass this one for selection, then the only shared one from this and
previous one will be valued, and if not that case (both shared or none shared), choose the one with
more space available *)
let sr, _ =
List.fold_left
(fun (sr, free_space) ((_, sr_rec') as sr') ->
if sr_rec'.API.sR_content_type = "iso" then
(sr, free_space)
else
let free_space' =
Int64.sub sr_rec'.API.sR_physical_size
sr_rec'.API.sR_physical_utilisation
let local_non_iso_srs () =
let expr =
{|(not (field "content_type"="iso")) and (field "shared"="false")|}
in
remote Client.SR.get_all_where ~expr
in
let get_free_space_of non_iso_srs =
host_attached_pbds
|> List.filter_map (fun (_, pbd_rec) ->
let sr = pbd_rec.API.pBD_SR in
if List.mem sr non_iso_srs then
let size = remote Client.SR.get_physical_size ~self:sr in
let used =
remote Client.SR.get_physical_utilisation ~self:sr
in
match sr with
| None ->
(Some sr', free_space')
| Some ((_, sr_rec) as sr) -> (
match (sr_rec.API.sR_shared, sr_rec'.API.sR_shared) with
| true, false ->
(Some sr, free_space)
| false, true ->
(Some sr', free_space')
| _ ->
if free_space' > free_space then
(Some sr', free_space')
else
(Some sr, free_space)
)
)
(None, Int64.zero) srs
Some (sr, Int64.sub size used)
else
None
)
in
match sr with Some (sr_ref, _) -> Some sr_ref | _ -> None
with _ -> None
let find_most_free_space srs =
match
List.fast_sort
(fun (_, a) (_, b) -> Int64.compare b a)
(get_free_space_of srs)
with
| (sr, _) :: _ ->
Some sr
| [] ->
None
in
match find_most_free_space (shared_non_iso_srs ()) with
| Some sr ->
Some sr
| None ->
find_most_free_space (local_non_iso_srs ())
with exn ->
printer
(Cli_printer.PMsg
(Printf.sprintf
"Couldn't compute preferred SR, continuing with the \
user-provided VDI mapping. The reason is: %s"
(Printexc.to_string exn)
)
) ;

None
in
let vdi_map =
match preferred_sr with
Expand Down
Loading