Browse files

Merge pull request #1084 from robhoes/ca96541-cw

CLEARWATER: CA-96541/SCTX-1188: Fix race condition when creating metrics for VLAN PI...
  • Loading branch information...
Malcolm Crossley
Malcolm Crossley committed Apr 6, 2013
2 parents 9c87b0b + 140635d commit baf28d0a76ebf86ca4d03046a40e1a90e85e1910
Showing with 2 additions and 1 deletion.
  1. +2 −1 ocaml/xapi/
@@ -352,8 +352,9 @@ let create ~__context ~network ~members ~mAC ~mode ~properties =
(* Create master PIF and Bond objects *)
let device = choose_bond_device_name ~__context ~host in
let device_name = device in
+ let metrics = Xapi_pif.make_pif_metrics ~__context in
Db.PIF.create ~__context ~ref:master ~uuid:(Uuid.to_string (Uuid.make_uuid ()))
- ~device ~device_name ~network ~host ~mAC ~mTU:(-1L) ~vLAN:(-1L) ~metrics:Ref.null
+ ~device ~device_name ~network ~host ~mAC ~mTU:(-1L) ~vLAN:(-1L) ~metrics
~physical:false ~currently_attached:false
~ip_configuration_mode:`None ~iP:"" ~netmask:"" ~gateway:"" ~dNS:"" ~bond_slave_of:Ref.null
~vLAN_master_of:Ref.null ~management:false ~other_config:[] ~disallow_unplug:false

0 comments on commit baf28d0

Please sign in to comment.