Skip to content

Commit 94f46cc

Browse files
authored
Merge pull request #2785 from xapi-project/revert-2781-locally-catch-guest-metric-absence
Revert "When GuestMetrics are NULL, `update_vm` is partial"
2 parents 212ab69 + fe4f27a commit 94f46cc

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

ocaml/xapi/xapi_xenops.ml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,11 +1460,8 @@ let update_vm ~__context id =
14601460
(fun (_, state) ->
14611461
let gm = Db.VM.get_guest_metrics ~__context ~self in
14621462
debug "xenopsd event: Updating VM %s PV drivers detected %b" id state.pv_drivers_detected;
1463-
try
1464-
Db.VM_guest_metrics.set_PV_drivers_detected ~__context ~self:gm ~value:state.pv_drivers_detected;
1465-
Db.VM_guest_metrics.set_PV_drivers_up_to_date ~__context ~self:gm ~value:state.pv_drivers_detected
1466-
with e ->
1467-
error "Caught %s: while updating VM %s PV driver detection" (Printexc.to_string e) id
1463+
Db.VM_guest_metrics.set_PV_drivers_detected ~__context ~self:gm ~value:state.pv_drivers_detected;
1464+
Db.VM_guest_metrics.set_PV_drivers_up_to_date ~__context ~self:gm ~value:state.pv_drivers_detected
14681465
) info in
14691466
Opt.iter
14701467
(fun (_, state) ->

0 commit comments

Comments
 (0)