Skip to content

Commit cec6207

Browse files
committed
CA-89884: vdi-introduce failed on slave
Partial application makes a function call always succeed (prematurely). Signed-off-by: Zheng Li <[email protected]>
1 parent 675658f commit cec6207

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

ocaml/xapi/message_forwarding.ml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3193,15 +3193,14 @@ module Forward = functor(Local: Custom_actions.CUSTOM_ACTIONS) -> struct
31933193
Sm.assert_session_has_internal_sr_access ~__context ~sr;
31943194
Local.VDI.db_forget ~__context ~vdi
31953195

3196-
let introduce ~__context ~uuid ~name_label ~name_description ~sR ~_type ~sharable ~read_only ~other_config ~location ~xenstore_data ~sm_config =
3196+
let introduce ~__context ~uuid ~name_label ~name_description ~sR ~_type ~sharable ~read_only ~other_config ~location ~xenstore_data ~sm_config ~managed ~virtual_size ~physical_utilisation ~metadata_of_pool ~is_a_snapshot ~snapshot_time ~snapshot_of=
31973197
info "VDI.introduce: SR = '%s'; name label = '%s'" (sr_uuid ~__context sR) name_label;
3198-
let local_fn = Local.VDI.introduce ~uuid ~name_label ~name_description ~sR ~_type ~sharable ~read_only ~other_config ~location ~xenstore_data ~sm_config in
3199-
3198+
let local_fn = Local.VDI.introduce ~uuid ~name_label ~name_description ~sR ~_type ~sharable ~read_only ~other_config ~location ~xenstore_data ~sm_config ~managed ~virtual_size ~physical_utilisation ~metadata_of_pool ~is_a_snapshot ~snapshot_time ~snapshot_of in
32003199
with_sr_andor_vdi ~__context ~sr:(sR, `vdi_introduce) ~doc:"VDI.introduce"
32013200
(fun () ->
32023201
SR.forward_sr_op ~local_fn ~__context ~self:sR
32033202
(fun session_id rpc ->
3204-
Client.VDI.introduce ~rpc ~session_id ~uuid ~name_label ~name_description ~sR ~_type ~sharable ~read_only ~other_config ~location ~xenstore_data ~sm_config))
3203+
Client.VDI.introduce ~rpc ~session_id ~uuid ~name_label ~name_description ~sR ~_type ~sharable ~read_only ~other_config ~location ~xenstore_data ~sm_config ~managed ~virtual_size ~physical_utilisation ~metadata_of_pool ~is_a_snapshot ~snapshot_time ~snapshot_of))
32053204

32063205
let update ~__context ~vdi =
32073206
let local_fn = Local.VDI.update ~vdi in

0 commit comments

Comments
 (0)