Skip to content

Commit

Permalink
Merge pull request #2785 from xapi-project/revert-2781-locally-catch-…
Browse files Browse the repository at this point in the history
…guest-metric-absence

Revert "When GuestMetrics are NULL, `update_vm` is partial"
  • Loading branch information
robhoes authored Sep 27, 2016
2 parents 212ab69 + fe4f27a commit 94f46cc
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions ocaml/xapi/xapi_xenops.ml
Original file line number Diff line number Diff line change
Expand Up @@ -1460,11 +1460,8 @@ let update_vm ~__context id =
(fun (_, state) ->
let gm = Db.VM.get_guest_metrics ~__context ~self in
debug "xenopsd event: Updating VM %s PV drivers detected %b" id state.pv_drivers_detected;
try
Db.VM_guest_metrics.set_PV_drivers_detected ~__context ~self:gm ~value:state.pv_drivers_detected;
Db.VM_guest_metrics.set_PV_drivers_up_to_date ~__context ~self:gm ~value:state.pv_drivers_detected
with e ->
error "Caught %s: while updating VM %s PV driver detection" (Printexc.to_string e) id
Db.VM_guest_metrics.set_PV_drivers_detected ~__context ~self:gm ~value:state.pv_drivers_detected;
Db.VM_guest_metrics.set_PV_drivers_up_to_date ~__context ~self:gm ~value:state.pv_drivers_detected
) info in
Opt.iter
(fun (_, state) ->
Expand Down

0 comments on commit 94f46cc

Please sign in to comment.