Merge pull request xapi-project#3329 from mcintyre94/private/callumiandam/CA-271014-master

[CA-271014] Only get local SRs on the physical utilisation thread

Author: lindig

ocaml/xapi/helpers.ml

@@ -1012,10 +1012,20 @@ let i_am_srmaster ~__context ~sr =
   get_srmaster ~__context ~sr = get_localhost ~__context
 
 let get_all_plugged_srs ~__context =
-  let pbds = Db.PBD.get_all ~__context in
-  let pbds_plugged_in = List.filter (fun self -> Db.PBD.get_currently_attached ~__context ~self) pbds in
+  let pbds_plugged_in = Db.PBD.get_refs_where ~__context ~expr:(
+    Eq (Field "currently_attached", Literal "true")) in
   List.setify (List.map (fun self -> Db.PBD.get_SR ~__context ~self) pbds_plugged_in)
 
+let get_local_plugged_srs ~__context =
+  let localhost = get_localhost __context in
+  let localhost = Ref.string_of localhost in
+  let my_pbds_plugged_in = Db.PBD.get_refs_where  ~__context ~expr:(And (
+    Eq (Field "host", Literal localhost),
+    Eq (Field "currently_attached", Literal "true")
+  ))
+  in
+  List.setify (List.map (fun self -> Db.PBD.get_SR ~__context ~self) my_pbds_plugged_in)
+
 let find_health_check_task ~__context ~sr =
   Db.Task.get_refs_where ~__context ~expr:(And (
       Eq (Field "name__label", Literal Xapi_globs.sr_health_check_task_label),

ocaml/xapi/xapi_sr.ml

@@ -665,7 +665,7 @@ let physical_utilisation_thread ~__context () =
   let sr_cache : bool SRMap.t ref = ref SRMap.empty in
 
   let srs_to_update () =
-    let plugged_srs = Helpers.get_all_plugged_srs ~__context in
+    let plugged_srs = Helpers.get_local_plugged_srs ~__context in
     (* Remove SRs that are no longer plugged *)
     sr_cache := SRMap.filter (fun sr _ -> List.mem sr plugged_srs) !sr_cache;
     (* Cache wether we should manage stats for newly plugged SRs *)