Merge pull request xapi-project#3142 from gaborigloi/fix_rpu_vdi_allowed_ops

CA-260262: Restrict allowed VDI operations during rolling pool upgrade to those supported by older releases

Author: robhoes

ocaml/xapi/test_vdi_allowed_operations.ml

@@ -272,6 +272,45 @@ 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 test_check_operation_error () =
+    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
+  in
+
+  let test_update_allowed_operations () =
+    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";
+    let self, _ = setup_test ~__context ~vdi_fun:(fun vdi -> Db.VDI.set_type ~__context ~self:vdi ~value:`user) () in
+    Xapi_vdi.update_allowed_operations ~__context ~self;
+    OUnit.assert_bool "update_allowed_operations should exclude `enable_cbt during RPU" (not @@ List.mem `enable_cbt (Db.VDI.get_allowed_operations ~__context ~self));
+    Db.Pool.remove_from_other_config ~__context ~self:pool ~key:Xapi_globs.rolling_upgrade_in_progress;
+    Xapi_vdi.update_allowed_operations ~__context ~self;
+    OUnit.assert_bool "update_allowed_operations should consider `enable_cbt when RPU is not running" (List.mem `enable_cbt (Db.VDI.get_allowed_operations ~__context ~self))
+  in
+
+  "test_operations_restricted_during_rpu" >:::
+  [ "test_check_operation_error" >:: test_check_operation_error
+  ; "test_update_allowed_operations" >:: test_update_allowed_operations
+  ]
+
 let test =
   "test_vdi_allowed_operations" >:::
   [
@@ -280,4 +319,5 @@ let test =
     "test_ca125187" >:: test_ca125187;
     "test_ca126097" >:: test_ca126097;
     test_cbt;
+    test_operations_restricted_during_rpu;
   ]

ocaml/xapi/xapi_globs.ml

@@ -454,6 +454,20 @@ let rpu_allowed_vm_operations = [
   `update_allowed_operations;
 ]
 
+let rpu_allowed_vdi_operations = [
+  `clone;
+  `copy;
+  `resize;
+  `resize_online;
+  `snapshot;
+  `destroy;
+  `forget;
+  `update;
+  `force_unlock;
+  `generate_config;
+  `blocked;
+]
+
 (* Viridian key name (goes in platform flags) *)
 let viridian_key_name = "viridian"
 (* Viridian key value (set in new templates, in built-in templates on upgrade and when Orlando PV drivers up-to-date first detected) *)

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
@@ -241,6 +246,11 @@ let update_allowed_operations_internal ~__context ~self ~sr_records ~pbd_records
     let check x = match check_operation_error ~__context ~sr_records ~pbd_records ~vbd_records ha_enabled all self x with None ->  [ x ] | _ -> [] in
     List.fold_left (fun accu op -> check op @ accu) []
       (Listext.List.set_difference Xapi_vdi_helpers.all_ops [`blocked]) in
+  let allowed =
+    if Helpers.rolling_upgrade_in_progress ~__context
+    then Listext.List.intersect allowed Xapi_globs.rpu_allowed_vdi_operations
+    else allowed
+  in
   Db.VDI.set_allowed_operations ~__context ~self ~value:allowed
 
 let update_allowed_operations ~__context ~self : unit =