Procházet zdrojové kódy

Report async task failures better

We were previously trying to reach into `.rc`,
but there's no such thing if `async_result.finished == 0`.

Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2153
pull/2154/head
Slavi Pantaleev před 3 roky
rodič
revize
d1b5681ba0
4 změnil soubory, kde provedl 9 přidání a 4 odebrání
  1. +2
    -1
      roles/matrix-postgres/tasks/import_postgres.yml
  2. +2
    -1
      roles/matrix-postgres/tasks/run_vacuum.yml
  3. +4
    -2
      roles/matrix-synapse/tasks/rust-synapse-compress-state/compress_room.yml
  4. +1
    -0
      roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml

+ 2
- 1
roles/matrix-postgres/tasks/import_postgres.yml Zobrazit soubor

@@ -108,4 +108,5 @@
async: "{{ postgres_import_wait_time }}"
poll: 10
register: matrix_postgres_import_postgres_command_result
changed_when: matrix_postgres_import_postgres_command_result.rc == 0
failed_when: not matrix_postgres_import_postgres_command_result.async_result.finished
changed_when: matrix_postgres_import_postgres_command_result.async_result.finished and matrix_postgres_import_postgres_command_result.rc == 0

+ 2
- 1
roles/matrix-postgres/tasks/run_vacuum.yml Zobrazit soubor

@@ -78,7 +78,8 @@
async: "{{ postgres_vacuum_wait_time }}"
poll: 10
register: matrix_postgres_synapse_vacuum_result
changed_when: matrix_postgres_synapse_vacuum_result.rc == 0
failed_when: not matrix_postgres_synapse_vacuum_result.async_result.finished
changed_when: matrix_postgres_synapse_vacuum_result.async_result.finished and matrix_postgres_synapse_vacuum_result.rc == 0

# Intentionally show the results
- ansible.builtin.debug: var="matrix_postgres_synapse_vacuum_result"


+ 4
- 2
roles/matrix-synapse/tasks/rust-synapse-compress-state/compress_room.yml Zobrazit soubor

@@ -21,7 +21,8 @@
async: "{{ matrix_synapse_rust_synapse_compress_state_compress_room_time }}"
poll: 10
register: matrix_synapse_rust_synapse_compress_state_compress_room_command_result
changed_when: matrix_synapse_rust_synapse_compress_state_compress_room_command_result.rc == 0
failed_when: not matrix_synapse_rust_synapse_compress_state_compress_room_command_result.async_result.finished
changed_when: matrix_synapse_rust_synapse_compress_state_compress_room_command_result.async_result.finished and matrix_synapse_rust_synapse_compress_state_compress_room_command_result.rc == 0

- ansible.builtin.debug: var="matrix_synapse_rust_synapse_compress_state_compress_room_command_result"

@@ -44,7 +45,8 @@
async: "{{ matrix_synapse_rust_synapse_compress_state_psql_import_time }}"
poll: 10
register: matrix_synapse_rust_synapse_compress_state_psql_import_command_result
changed_when: matrix_synapse_rust_synapse_compress_state_psql_import_command_result.rc == 0
failed_when: not matrix_synapse_rust_synapse_compress_state_psql_import_command_result.async_result.finished
changed_when: matrix_synapse_rust_synapse_compress_state_psql_import_command_result.async_result.finished and matrix_synapse_rust_synapse_compress_state_psql_import_command_result.rc == 0

- name: Clean up
ansible.builtin.file:


+ 1
- 0
roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml Zobrazit soubor

@@ -70,6 +70,7 @@
async: "{{ matrix_synapse_rust_synapse_compress_state_find_rooms_command_wait_time }}"
poll: 10
register: matrix_synapse_rust_synapse_compress_state_find_rooms_command_result
failed_when: not matrix_synapse_rust_synapse_compress_state_find_rooms_command_result.async_result.finished
changed_when: false

# We expect the output to be like this:


Načítá se…
Zrušit
Uložit