CA-405754: Update xapi-storage-script state.db

xapi-storage-script maintains a state.db which is loaded on startup
every time. This state.db contains currently attached SRs, and this
information can be used later on by xapi to decide whether to plug a PBD
in.

This information is correctly updated when adding an attached SR in, but
not when removing an SR. This will cause problems when an SR is
detached, followed by a toolstack restart. As now xapi-storage-script
still thinks that SR is attached, but in fact it is not.

Signed-off-by: Vincent Liu <[email protected]>

Author: Vincent-lau

ocaml/xapi-storage-script/main.ml

@@ -637,10 +637,8 @@ module Attached_SRs = struct
 
   let state_path = ref None
 
-  let add smapiv2 plugin uids =
-    let key = Storage_interface.Sr.string_of smapiv2 in
-    Base.Hashtbl.set !sr_table ~key ~data:{sr= plugin; uids} ;
-    ( match !state_path with
+  let update_state_path () =
+    match !state_path with
     | None ->
         Lwt.return_unit
     | Some path ->
@@ -650,8 +648,11 @@ module Attached_SRs = struct
         in
         let dir = Filename.dirname path in
         Sys.mkdir_p dir >>= fun () -> Sys.save path ~contents
-    )
-    >>= fun () -> return ()
+
+  let add smapiv2 plugin uids =
+    let key = Storage_interface.Sr.string_of smapiv2 in
+    Base.Hashtbl.set !sr_table ~key ~data:{sr= plugin; uids} ;
+    update_state_path () >>= fun () -> return ()
 
   let find smapiv2 =
     let key = Storage_interface.Sr.string_of smapiv2 in
@@ -674,7 +675,7 @@ module Attached_SRs = struct
   let remove smapiv2 =
     let key = Storage_interface.Sr.string_of smapiv2 in
     Base.Hashtbl.remove !sr_table key ;
-    return ()
+    update_state_path () >>= fun () -> return ()
 
   let list () =
     let srs =