CA-408230: Enable destroy op for HA statefile VDI after HA is disabled (#6424)

Author: gangj

ocaml/xapi/xapi_ha.ml

@@ -1745,6 +1745,11 @@ let disable_internal __context =
           )
           errors
     ) ;
+    (* CA-408230: mark current operation, `ha_enable or `ha_disable, as done,
+       as otherwise it will fail to update_allowed_operations for metadata_vdis
+       and statefile_vdis *)
+    let task_id = Ref.string_of (Context.get_task_id __context) in
+    Db.Pool.remove_from_current_operations ~__context ~self:pool ~key:task_id ;
     (* Update the allowed operations on the statefile VDIs for tidiness *)
     List.iter
       (fun vdi -> Xapi_vdi.update_allowed_operations ~__context ~self:vdi)

ocaml/xapi/xapi_vdi.ml

@@ -345,12 +345,12 @@ let check_operation_error ~__context ?sr_records:_ ?(pbd_records = [])
     then
       Error (Api_errors.ha_is_enabled, [])
     else if
-      List.mem record.Db_actions.vDI_type [`ha_statefile; `metadata]
+      List.mem record.Db_actions.vDI_type [`ha_statefile; `redo_log]
       && Xapi_pool_helpers.ha_enable_in_progress ~__context
     then
       Error (Api_errors.ha_enable_in_progress, [])
     else if
-      List.mem record.Db_actions.vDI_type [`ha_statefile; `metadata]
+      List.mem record.Db_actions.vDI_type [`ha_statefile; `redo_log]
       && Xapi_pool_helpers.ha_disable_in_progress ~__context
     then
       Error (Api_errors.ha_disable_in_progress, [])