CA-260262: Only allow VDI operations supported by older releases during RPU

Signed-off-by: Gabor Igloi <[email protected]>

Author: gaborigloi

ocaml/xapi/test_vdi_allowed_operations.ml

@@ -272,6 +272,26 @@ let test_cbt =
   ; "test_vdi_cbt_enabled_check" >:: test_vdi_cbt_enabled_check
   ]
 
+(** The set of allowed operations must be restricted during rolling pool
+    upgrade to the enums known by older releases. *)
+let test_operations_restricted_during_rpu () =
+  let __context = Mock.make_context_with_new_db "Mock context" in
+  let master = Test_common.make_host __context () in
+  let pool = Test_common.make_pool ~__context ~master () in
+  Db.Pool.add_to_other_config ~__context ~self:pool ~key:Xapi_globs.rolling_upgrade_in_progress ~value:"x";
+  run_assert_equal_with_vdi
+    ~__context
+    ~sm_fun:(fun sm -> Db.SM.set_features ~__context ~self:sm ~value:["VDI_MIRROR",1L])
+    `mirror
+    (Some(Api_errors.not_supported_during_upgrade, []));
+  Db.Pool.remove_from_other_config ~__context ~self:pool ~key:Xapi_globs.rolling_upgrade_in_progress;
+  run_assert_equal_with_vdi
+    ~__context
+    ~sm_fun:(fun sm -> Db.SM.set_features ~__context ~self:sm ~value:["VDI_MIRROR",1L])
+    `mirror
+    None
+
+
 let test =
   "test_vdi_allowed_operations" >:::
   [
@@ -280,4 +300,5 @@ let test =
     "test_ca125187" >:: test_ca125187;
     "test_ca126097" >:: test_ca126097;
     test_cbt;
+    "test_operations_restricted_during_rpu" >:: test_operations_restricted_during_rpu;
   ]

ocaml/xapi/xapi_vdi.ml

@@ -70,7 +70,12 @@ let check_operation_error ~__context ?(sr_records=[]) ?(pbd_records=[]) ?(vbd_re
      	   4. for other operations, fail if any VBD has currently-attached=true or any VBD
      	      has a current_operation itself
      	   5. HA prevents you from deleting statefiles or metadata volumes
+     	   6. During rolling pool upgrade, only operations known by older releases are allowed
      	   *)
+  if Helpers.rolling_upgrade_in_progress ~__context &&
+     not (List.mem op Xapi_globs.rpu_allowed_vdi_operations)
+  then Some (Api_errors.not_supported_during_upgrade, [])
+  else
   (* Don't fail with other_operation_in_progress if VDI mirroring is in progress
      	 * and destroy is called as part of VDI mirroring *)
   let is_vdi_mirroring_in_progress = (List.exists (fun (_, op) -> op = `mirror) current_ops) && (op = `destroy) in