Merge pull request #5562 from MarkSymsCtx/CP-47991

xapi-project · Apr 16, 2024 · 9bc4c1f · 9bc4c1f
2 parents 5b59bc6 + eb5d0fe
commit 9bc4c1f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 0 deletions.
diff --git a/ocaml/xapi-storage/generator/lib/control.ml b/ocaml/xapi-storage/generator/lib/control.ml
@@ -30,6 +30,12 @@ type health =
       (** Storage is busy recovering, e.g. rebuilding mirrors *)
 [@@deriving rpcty]
 
+type volume_type =
+  | Data  (** Normal data volume *)
+  | CBT_Metadata  (** CBT Metadata only, data destroyed *)
+  | Data_and_CBT_Metadata  (** Both Data and CBT Metadata *)
+[@@deriving rpcty]
+
 (** Primary key for a specific Storage Repository. This can be any string
     which is meaningful to the implementation. For example this could be an
     NFS directory name, an LVM VG name or even a URI. This string is
@@ -116,6 +122,11 @@ type volume = {
   ; keys: (string * string) list
         (** A list of key=value pairs which have been stored in the Volume
       metadata. These should not be interpreted by the Volume plugin. *)
+  ; volume_type: volume_type option [@default Some Data]
+        (** The content type of this volume *)
+  ; cbt_enabled: bool option [@default Some false]
+        (** True means that the storage datapath will track changed dirty blocks
+      while writing and will be able to provide CBT Metadata when requested *)
 }
 [@@deriving rpcty]
 

diff --git a/ocaml/xapi-storage/generator/test/storage_test.ml b/ocaml/xapi-storage/generator/test/storage_test.ml
@@ -57,6 +57,8 @@ let test_volume =
     ; physical_utilisation= 0L
     ; uri= ["uri1"]
     ; keys= []
+    ; cbt_enabled= Some false
+    ; volume_type= Some Data
     }
 
 (** Check that we successfully parse the responses and

diff --git a/ocaml/xapi-storage/rpc-light/SR.ls/response b/ocaml/xapi-storage/rpc-light/SR.ls/response
@@ -12,6 +12,8 @@
                                                             <member><name>physical_utilisation</name><value>0</value></member>
                                                             <member><name>uri</name><value><array><data><value>uri1</value></data></array></value></member>
                                                             <member><name>keys</name><value><struct></struct></value></member>
+                                                            <member><name>volume_type</name><value>Data</value></member>
+                                                            <member><name>cbt_enabled</name><value>false</value></member>
                                        </struct></value></data>
                                   </array></value></member>
     </struct></value></param></params>

diff --git a/ocaml/xapi-storage/rpc-light/Volume.clone/response b/ocaml/xapi-storage/rpc-light/Volume.clone/response
@@ -11,6 +11,8 @@
                                                          <member><name>physical_utilisation</name><value>0</value></member>
                                                          <member><name>uri</name><value><array><data><value>uri1</value></data></array></value></member>
                                                          <member><name>keys</name><value><struct></struct></value></member>
+                                                         <member><name>volume_type</name><value>Data</value></member>
+                                                         <member><name>cbt_enabled</name><value>false</value></member>
                                          </struct>
                                  </value></member>
    </struct></value></param>

diff --git a/ocaml/xapi-storage/rpc-light/Volume.create/response b/ocaml/xapi-storage/rpc-light/Volume.create/response
@@ -11,6 +11,8 @@
                                                          <member><name>physical_utilisation</name><value>0</value></member>
                                                          <member><name>uri</name><value><array><data><value>uri1</value></data></array></value></member>
                                                          <member><name>keys</name><value><struct></struct></value></member>
+                                                         <member><name>volume_type</name><value>Data</value></member>
+                                                         <member><name>cbt_enabled</name><value>false</value></member>
                                          </struct>
                                  </value></member>
    </struct></value></param>

diff --git a/ocaml/xapi-storage/rpc-light/Volume.snapshot/response b/ocaml/xapi-storage/rpc-light/Volume.snapshot/response
@@ -11,6 +11,8 @@
                                                          <member><name>physical_utilisation</name><value>0</value></member>
                                                          <member><name>uri</name><value><array><data><value>uri1</value></data></array></value></member>
                                                          <member><name>keys</name><value><struct></struct></value></member>
+                                                         <member><name>volume_type</name><value>Data</value></member>
+                                                         <member><name>cbt_enabled</name><value>false</value></member>
                                          </struct>
                                  </value></member>
    </struct></value></param>