Skip to content

Commit e40c1ae

Browse files
committed
CP-51692: feat(use-event-next): cli_util: use Event.from instead of Event.next
This is more efficient: we can watch a single task, instead of everything in the DB. Feature-flag: use-event-next Signed-off-by: Edwin Török <edwin.torok@cloud.com>
1 parent 3a36ed9 commit e40c1ae

File tree

1 file changed

+24
-4
lines changed

1 file changed

+24
-4
lines changed

ocaml/xapi-cli-server/cli_util.ml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,41 @@ exception Cli_failure of string
4242

4343
(** call [callback task_record] on every update to the task, until it completes or fails *)
4444
let track callback rpc (session_id : API.ref_session) task =
45-
let classes = ["task"] in
45+
let use_event_next = !Constants.use_event_next in
46+
let classes =
47+
if use_event_next then
48+
["task"]
49+
else
50+
[Printf.sprintf "task/%s" (Ref.string_of task)]
51+
in
4652
finally
4753
(fun () ->
4854
let finished = ref false in
4955
while not !finished do
50-
Client.Event.register ~rpc ~session_id ~classes ;
56+
if use_event_next then
57+
Client.Event.register ~rpc ~session_id ~classes ;
5158
try
5259
(* Need to check once after registering to avoid a race *)
5360
finished :=
5461
Client.Task.get_status ~rpc ~session_id ~self:task <> `pending ;
62+
let token = ref "" in
5563
while not !finished do
5664
let events =
57-
Event_types.events_of_rpc (Client.Event.next ~rpc ~session_id)
65+
if use_event_next then
66+
let events =
67+
Event_types.events_of_rpc (Client.Event.next ~rpc ~session_id)
68+
in
69+
List.map Event_helper.record_of_event events
70+
else
71+
let event_from =
72+
Event_types.event_from_of_rpc
73+
(Client.Event.from ~rpc ~session_id ~classes ~token:!token
74+
~timeout:30.
75+
)
76+
in
77+
token := event_from.token ;
78+
List.map Event_helper.record_of_event event_from.events
5879
in
59-
let events = List.map Event_helper.record_of_event events in
6080
List.iter
6181
(function
6282
| Event_helper.Task (t, Some t_rec) when t = task ->

0 commit comments

Comments
 (0)