Skip to content

Commit

Permalink
Add download retries option (#9911)
Browse files Browse the repository at this point in the history
Signed-off-by: tu1h <lihai.tu@daocloud.io>
  • Loading branch information
0ekk authored Mar 21, 2023
1 parent f73b941 commit 8cf5fef
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions roles/download/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ download_validate_certs: true
# Use the first kube_control_plane if download_localhost is not set
download_delegate: "{% if download_localhost %}localhost{% else %}{{ groups['kube_control_plane'][0] }}{% endif %}"

# Allow control the times of download retries for files and containers
download_retries: 4

# The docker_image_info_command might seems weird but we are using raw/endraw and `{{ `{{` }}` to manage the double jinja2 processing
docker_image_pull_command: "{{ docker_bin_dir }}/docker pull"
docker_image_info_command: "{{ docker_bin_dir }}/docker images -q | xargs -i {{ '{{' }} docker_bin_dir }}/docker inspect -f {% raw %}'{{ '{{' }} if .RepoTags }}{{ '{{' }} join .RepoTags \",\" }}{{ '{{' }} end }}{{ '{{' }} if .RepoDigests }},{{ '{{' }} join .RepoDigests \",\" }}{{ '{{' }} end }}' {% endraw %} {} | tr '\n' ','"
Expand Down
4 changes: 2 additions & 2 deletions roles/download/tasks/download_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
register: pull_task_result
until: pull_task_result is succeeded
delay: "{{ retry_stagger | random + 3 }}"
retries: 4
retries: "{{ download_retries }}"
become: "{{ user_can_become_root | default(false) or not download_localhost }}"
environment: "{{ proxy_env if container_manager == 'containerd' else omit }}"
when:
Expand Down Expand Up @@ -101,7 +101,7 @@
register: upload_image
failed_when: not upload_image
until: upload_image is succeeded
retries: 4
retries: "{{ download_retries }}"
delay: "{{ retry_stagger | random + 3 }}"
when:
- pull_required
Expand Down
6 changes: 3 additions & 3 deletions roles/download/tasks/download_file.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
run_once: "{{ download_force_cache }}"
register: uri_result
until: uri_result is success
retries: 4
retries: "{{ download_retries }}"
delay: "{{ retry_stagger | default(5) }}"
environment: "{{ proxy_env }}"
no_log: "{{ not (unsafe_show_logs|bool) }}"
Expand Down Expand Up @@ -97,7 +97,7 @@
register: get_url_result
become: "{{ not download_localhost }}"
until: "'OK' in get_url_result.msg or 'file already exists' in get_url_result.msg"
retries: 4
retries: "{{ download_retries }}"
delay: "{{ retry_stagger | default(5) }}"
environment: "{{ proxy_env }}"
no_log: "{{ not (unsafe_show_logs|bool) }}"
Expand All @@ -122,7 +122,7 @@
register: get_task
until: get_task is succeeded
delay: "{{ retry_stagger | random + 3 }}"
retries: 4
retries: "{{ download_retries }}"
when:
- download_force_cache

Expand Down

0 comments on commit 8cf5fef

Please sign in to comment.