fixup! fixup! CP-308863: Count vGPU migrations

Signed-off-by: Ming Lu <[email protected]>

Author: minglumlu

ocaml/xapi/message_forwarding.ml

@@ -2501,10 +2501,8 @@ functor
             let snapshot = Db.VM.get_record ~__context ~self:vm in
             reserve_memory_for_vm ~__context ~vm ~host ~snapshot
               ~host_op:`vm_migrate (fun () ->
-                Db.VM.get_VGPUs ~__context ~self:vm
-                |> List.iter (fun _ ->
-                       Xapi_stats.incr_pool_vgpu_migration_count ()
-                   ) ;
+                if Db.VM.get_VGPUs ~__context ~self:vm <> [] then
+                  Xapi_stats.incr_pool_vgpu_migration_count () ;
                 forward_vm_op ~local_fn ~__context ~vm ~remote_fn
             )
         ) ;
@@ -2626,10 +2624,8 @@ functor
                   assert_can_migrate ~__context ~vm ~dest ~live ~vdi_map
                     ~vif_map ~vgpu_map ~options
               ) ;
-              vgpu_map
-              |> List.iter (fun _ ->
-                     Xapi_stats.incr_pool_vgpu_migration_count ()
-                 ) ;
+              if vgpu_map <> [] then
+                Xapi_stats.incr_pool_vgpu_migration_count () ;
               forward_migrate_send ()
           )
         in

ocaml/xapi/xapi_stats.ml

@@ -54,7 +54,7 @@ let generate_master_stats ~__context =
   let vgpu_migration_count_ds =
     ( Rrd.Host
     , Ds.ds_make ~name:"pool_vgpu_migration_count"
-        ~description:"Number of vGPU migrations occurred since last rrd update"
+        ~description:"Number of vGPU migrations occurred"
         ~value:(Rrd.VT_Int64 vgpu_migration_count) ~ty:Rrd.Absolute
         ~default:true ~min:0. ~units:"count" ()
     )