Skip to content

Commit

Permalink
CP-51692: use event-from instead of event-next
Browse files Browse the repository at this point in the history 
Feature flagged, not yet on by default.

Signed-off-by: Edwin Török <[email protected]>
  • Loading branch information
@edwintorok
edwintorok committed Nov 18, 2024
2 parents be447b9 + e144810 commit 3735673
Showing 1 changed file with 104 additions and 91 deletions.
195 changes: 104 additions & 91 deletions ocaml/xapi-cli-server/cli_operations.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2848,8 +2848,6 @@ exception Finished
let event_wait_gen rpc session_id classname record_matches =
(* Immediately register *)
let classes = [classname] in
Client.Event.register ~rpc ~session_id ~classes ;
debug "Registered for events" ;
(* Check to see if the condition is already satisfied - get all objects of whatever class specified... *)
let poll () =
let current_tbls =
Expand Down Expand Up @@ -2930,96 +2928,111 @@ let event_wait_gen rpc session_id classname record_matches =
in
List.exists record_matches all_recs
in
finally
(fun () ->
if not (poll ()) then
try
while true do
try
let events =
Event_types.events_of_rpc (Client.Event.next ~rpc ~session_id)
in
let doevent event =
let tbl =
match Event_helper.record_of_event event with
| Event_helper.VM (r, Some x) ->
let record = vm_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.VDI (r, Some x) ->
let record = vdi_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.SR (r, Some x) ->
let record = sr_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.Host (r, Some x) ->
let record = host_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.Network (r, Some x) ->
let record = net_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.VIF (r, Some x) ->
let record = vif_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.PIF (r, Some x) ->
let record = pif_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.VBD (r, Some x) ->
let record = vbd_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.PBD (r, Some x) ->
let record = pbd_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.Pool (r, Some x) ->
let record = pool_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.Task (r, Some x) ->
let record = task_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.VMSS (r, Some x) ->
let record = vmss_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.Secret (r, Some x) ->
let record = secret_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| _ ->
failwith
("Cli listening for class '"
^ classname
^ "' not currently implemented"
)
in
let record =
List.map (fun r -> (r.name, fun () -> safe_get_field r)) tbl
in
if record_matches record then raise Finished
let use_event_next = !Constants.use_event_next in
let run () =
if not (poll ()) then
try
let token = ref "" in
while true do
let events =
if use_event_next then
Event_types.events_of_rpc (Client.Event.next ~rpc ~session_id)
else
let event_from =
Event_types.event_from_of_rpc
(Client.Event.from ~rpc ~session_id ~timeout:30. ~token:!token
~classes
)
in
List.iter doevent
(List.filter (fun e -> e.Event_types.snapshot <> None) events)
with
| Api_errors.Server_error (code, _)
when code = Api_errors.events_lost
->
debug "Got EVENTS_LOST; reregistering" ;
Client.Event.unregister ~rpc ~session_id ~classes ;
Client.Event.register ~rpc ~session_id ~classes ;
if poll () then raise Finished
done
with Finished -> ()
)
(fun () -> Client.Event.unregister ~rpc ~session_id ~classes)
token := event_from.token ;
event_from.events
in
let doevent event =
let tbl =
match Event_helper.record_of_event event with
| Event_helper.VM (r, Some x) ->
let record = vm_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.VDI (r, Some x) ->
let record = vdi_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.SR (r, Some x) ->
let record = sr_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.Host (r, Some x) ->
let record = host_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.Network (r, Some x) ->
let record = net_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.VIF (r, Some x) ->
let record = vif_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.PIF (r, Some x) ->
let record = pif_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.VBD (r, Some x) ->
let record = vbd_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.PBD (r, Some x) ->
let record = pbd_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.Pool (r, Some x) ->
let record = pool_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.Task (r, Some x) ->
let record = task_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.VMSS (r, Some x) ->
let record = vmss_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| Event_helper.Secret (r, Some x) ->
let record = secret_record rpc session_id r in
record.setrefrec (r, x) ;
record.fields
| _ ->
failwith
("Cli listening for class '"
^ classname
^ "' not currently implemented"
)
in
let record =
List.map (fun r -> (r.name, fun () -> safe_get_field r)) tbl
in
if record_matches record then raise_notrace Finished
in
List.iter doevent
(List.filter (fun e -> e.Event_types.snapshot <> None) events)
done
with
| Api_errors.Server_error (code, _)
when code = Api_errors.events_lost && use_event_next ->
debug "Got EVENTS_LOST; reregistering" ;
Client.Event.unregister ~rpc ~session_id ~classes ;
Client.Event.register ~rpc ~session_id ~classes ;
if poll () then raise Finished
| Finished ->
()
in
if use_event_next then (
Client.Event.register ~rpc ~session_id ~classes ;
debug "Registered for events" ;
finally run (fun () -> Client.Event.unregister ~rpc ~session_id ~classes)
) else
run ()
(* We're done. Unregister and finish *)
Expand Down

0 comments on commit 3735673

Please sign in to comment.