Просмотр исходного кода

Fix async commands

Fixes a regression introduced in d1b5681ba0.

Looks like `.finished` is a property on the main object, not on some
`.async_result` object.
pull/2154/head
Slavi Pantaleev 3 лет назад
Родитель
Сommit
a12cbeac3b
4 измененных файлов: 9 добавлений и 9 удалений
  1. +2
    -2
      roles/matrix-postgres/tasks/import_postgres.yml
  2. +2
    -2
      roles/matrix-postgres/tasks/run_vacuum.yml
  3. +4
    -4
      roles/matrix-synapse/tasks/rust-synapse-compress-state/compress_room.yml
  4. +1
    -1
      roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml

+ 2
- 2
roles/matrix-postgres/tasks/import_postgres.yml Просмотреть файл

@@ -108,5 +108,5 @@
async: "{{ postgres_import_wait_time }}"
poll: 10
register: matrix_postgres_import_postgres_command_result
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
failed_when: not matrix_postgres_import_postgres_command_result.finished
changed_when: matrix_postgres_import_postgres_command_result.finished and matrix_postgres_import_postgres_command_result.rc == 0

+ 2
- 2
roles/matrix-postgres/tasks/run_vacuum.yml Просмотреть файл

@@ -78,8 +78,8 @@
async: "{{ postgres_vacuum_wait_time }}"
poll: 10
register: matrix_postgres_synapse_vacuum_result
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
failed_when: not matrix_postgres_synapse_vacuum_result.finished
changed_when: matrix_postgres_synapse_vacuum_result.finished and matrix_postgres_synapse_vacuum_result.rc == 0

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


+ 4
- 4
roles/matrix-synapse/tasks/rust-synapse-compress-state/compress_room.yml Просмотреть файл

@@ -21,8 +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
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
failed_when: not matrix_synapse_rust_synapse_compress_state_compress_room_command_result.finished
changed_when: matrix_synapse_rust_synapse_compress_state_compress_room_command_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"

@@ -45,8 +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
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
failed_when: not matrix_synapse_rust_synapse_compress_state_psql_import_command_result.finished
changed_when: matrix_synapse_rust_synapse_compress_state_psql_import_command_result.finished and matrix_synapse_rust_synapse_compress_state_psql_import_command_result.rc == 0

- name: Clean up
ansible.builtin.file:


+ 1
- 1
roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml Просмотреть файл

@@ -70,7 +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
failed_when: not matrix_synapse_rust_synapse_compress_state_find_rooms_command_result.finished
changed_when: false

# We expect the output to be like this:


Загрузка…
Отмена
Сохранить