Merge pull request #5756 from rdn32/private/rnewton/CP-50050

xapi-project · Jul 1, 2024 · 6969a8a · 6969a8a
2 parents 31eeb93 + f5e35fd
commit 6969a8a
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/ocaml/xapi-storage-script/main.ml b/ocaml/xapi-storage-script/main.ml
@@ -684,7 +684,7 @@ let vdi_of_volume x =
   ; snapshot_time= find_string _snapshot_time_key ~default:"19700101T00:00:00Z"
   ; snapshot_of= Vdi.of_string (find_string _snapshot_of_key ~default:"")
   ; read_only= not x.Xapi_storage.Control.read_write
-  ; cbt_enabled= false
+  ; cbt_enabled= Option.value x.Xapi_storage.Control.cbt_enabled ~default:false
   ; virtual_size= x.Xapi_storage.Control.virtual_size
   ; physical_utilisation= x.Xapi_storage.Control.physical_utilisation
   ; sm_config= []
@@ -1553,9 +1553,13 @@ let bind ~volume_script_dir =
     @@
     let* sr = Attached_SRs.find sr in
     let vdi = Storage_interface.Vdi.string_of vdi in
-    return_volume_rpc (fun () ->
-        Volume_client.data_destroy volume_rpc dbg sr vdi
-    )
+    let* response =
+      return_volume_rpc (fun () ->
+          Volume_client.data_destroy volume_rpc dbg sr vdi
+      )
+    in
+    let* () = set ~dbg ~sr ~vdi ~key:_vdi_type_key ~value:"cbt_metadata" in
+    Deferred.Result.return response
   in
   S.VDI.data_destroy vdi_data_destroy_impl ;
   let u name _ = failwith ("Unimplemented: " ^ name) in