Skip to content

CA-389319: Wait and retry for GET_UPDATES_IN_PROGRESS #5617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2024
Merged

CA-389319: Wait and retry for GET_UPDATES_IN_PROGRESS #5617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ocaml/idl/datamodel_errors.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1913,11 +1913,6 @@ let _ =
~doc:"Failed to get available updates from a host." () ;
error Api_errors.get_updates_failed []
~doc:"Failed to get available updates from the pool." () ;
error Api_errors.get_updates_in_progress []
~doc:
"The operation could not be performed because getting updates is in \
progress."
() ;
error Api_errors.apply_updates_in_progress []
~doc:
"The operation could not be performed because applying updates is in \
Expand Down
2 changes: 0 additions & 2 deletions ocaml/xapi-consts/api_errors.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,8 +1261,6 @@ let invalid_repomd_xml = "INVALID_REPOMD_XML"

let get_updates_failed = "GET_UPDATES_FAILED"

let get_updates_in_progress = "GET_UPDATES_IN_PROGRESS"

let apply_updates_in_progress = "APPLY_UPDATES_IN_PROGRESS"

let apply_updates_failed = "APPLY_UPDATES_FAILED"
Expand Down
2 changes: 1 addition & 1 deletion ocaml/xapi/xapi_pool_helpers.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ let blocking_ops =
; (`tls_verification_enable, Api_errors.tls_verification_enable_in_progress)
; (`configure_repositories, Api_errors.configure_repositories_in_progress)
; (`sync_updates, Api_errors.sync_updates_in_progress)
; (`get_updates, Api_errors.get_updates_in_progress)
; (`apply_updates, Api_errors.apply_updates_in_progress)
]

Expand All @@ -52,6 +51,7 @@ let wait_ops =
; `exchange_ca_certificates_on_join
; `copy_primary_host_certs
; `eject
; `get_updates
]

let all_operations = blocking_ops |> List.map fst |> List.append wait_ops
Expand Down