Skip to content

CA-249662: Pool_patch handler: If an SR is not specified, use default_SR #3003

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
merged 1 commit into from
Apr 21, 2017
Merged

CA-249662: Pool_patch handler: If an SR is not specified, use default_SR #3003

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
14 changes: 13 additions & 1 deletion ocaml/xapi/xapi_pool_patch.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,21 @@ let pool_patch_upload_handler (req: Http.Request.t) s _ =
is to avoid our task being prematurely marked as completed by
the import_raw_vdi handler. *)
let strip = List.filter (fun (k,v) -> k <> "task_id") in
let add_sr query =
match Importexport.sr_of_req ~__context req with
| Some _ -> query (* There was already an SR specified *)
| None ->
let pool = Db.Pool.get_all ~__context |> List.hd in
let default_SR = Db.Pool.get_default_SR ~__context ~self:pool in
("sr_id",Ref.string_of default_SR)::query
in
let subtask = Client.Task.create rpc session_id "VDI upload" "" in
Stdext.Pervasiveext.finally (fun () ->
let req = Http.Request.{req with cookie = strip req.cookie; query = ("task_id",Ref.string_of subtask) :: strip req.query} in
let req = Http.Request.{
req with
cookie = strip req.cookie;
query = ("task_id",Ref.string_of subtask) :: strip req.query |> add_sr;
} in
let vdi_opt = Import_raw_vdi.localhost_handler rpc session_id (Importexport.vdi_of_req ~__context req) req s in
match vdi_opt with
| Some vdi ->
Expand Down