fixup! context: complete_tracing should be called last

Author: GabrielBuica

ocaml/xapi/taskHelper.ml

@@ -20,7 +20,7 @@ let with_lock = Xapi_stdext_threads.Threadext.Mutex.execute
 
 let ( let@ ) f x = f x
 
-let finally_complete_tracing ?error ~__context f =
+let finally_complete_tracing ?error __context f =
   Xapi_stdext_pervasives.Pervasiveext.finally f (fun () ->
       Context.complete_tracing ?error __context
   )
@@ -192,7 +192,7 @@ let status_is_completed task_status =
   task_status = `success || task_status = `failure || task_status = `cancelled
 
 let complete ~__context result =
-  let@ () = finally_complete_tracing ?error:None ~__context in
+  let@ () = finally_complete_tracing __context in
   let@ self = operate_on_db_task ~__context in
   let status = Db_actions.DB_Action.Task.get_status ~__context ~self in
   match status with
@@ -241,7 +241,7 @@ let exn_if_cancelling ~__context =
     raise_cancelled ~__context
 
 let cancel_this ~__context ~self =
-  let@ () = finally_complete_tracing ?error:None ~__context in
+  let@ () = finally_complete_tracing __context in
   assert_op_valid ~__context self ;
   let status = Db_actions.DB_Action.Task.get_status ~__context ~self in
   if status = `pending then (
@@ -261,7 +261,7 @@ let cancel ~__context =
 
 let failed ~__context exn =
   let backtrace = Printexc.get_backtrace () in
-  let@ () = finally_complete_tracing ~error:(exn, backtrace) ~__context in
+  let@ () = finally_complete_tracing ~error:(exn, backtrace) __context in
   let code, params = ExnHelper.error_of_exn exn in
   let@ self = operate_on_db_task ~__context in
   let status = Db_actions.DB_Action.Task.get_status ~__context ~self in