Merge pull request #4927 from robhoes/smapi

CA-375427: Make DP.destroy idempotent again
xapi-project · Mar 8, 2023 · d7f2f6d · d7f2f6d
2 parents a5b1dfc + 9193b45
commit d7f2f6d
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/ocaml/xapi/storage_mux.ml b/ocaml/xapi/storage_mux.ml
@@ -229,15 +229,14 @@ module Mux = struct
 
     let destroy _context ~dbg ~dp ~allow_leak =
       info "DP.destroy dbg:%s dp:%s allow_leak:%b" dbg dp allow_leak ;
-      let sr, vdi, vm =
-        let open DP_info in
-        match read dp with
-        | Some x ->
-            (x.sr, x.vdi, x.vm)
-        | None ->
-            failwith "DP not found"
-      in
-      destroy2 _context ~dbg ~dp ~sr ~vdi ~vm ~allow_leak
+      let open DP_info in
+      match read dp with
+      | Some {sr; vdi; vm; _} ->
+          destroy2 _context ~dbg ~dp ~sr ~vdi ~vm ~allow_leak
+      | None ->
+          info
+            "dp %s is not associated with a locally attached VDI; nothing to do"
+            dp
 
     let diagnostics () = Storage_smapiv1_wrapper.Impl.DP.diagnostics ()