From 4c0970d31e980d63764c97ce0853e7e2d89fdfff Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Thu, 1 Nov 2018 10:11:08 +0200 Subject: [PATCH] Make postgres_start_wait_time (affecting upgrades) configurable This also raises the default from 5 seconds to 15 seconds. --- roles/matrix-server/tasks/upgrade_postgres.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/roles/matrix-server/tasks/upgrade_postgres.yml b/roles/matrix-server/tasks/upgrade_postgres.yml index 822bd428f..05cf8d548 100644 --- a/roles/matrix-server/tasks/upgrade_postgres.yml +++ b/roles/matrix-server/tasks/upgrade_postgres.yml @@ -10,10 +10,16 @@ postgres_dump_name: "matrix-postgres.out" when: "postgres_dump_name|default('') == ''" -- set_fact: +- name: Set postgres_auto_upgrade_backup_data_path, if not provided + set_fact: postgres_auto_upgrade_backup_data_path: "{{ matrix_postgres_data_path }}-auto-upgrade-backup" when: "postgres_auto_upgrade_backup_data_path|default('') == ''" +- name: Set postgres_start_wait_time, if not provided + set_fact: + postgres_start_wait_time: 15 + when: "postgres_start_wait_time|default('') == ''" + - name: Fail, if trying to upgrade external Postgres database fail: msg: "Your configuration indicates that you're using an external Postgres database. Refusing to try and upgrade that." @@ -80,7 +86,7 @@ - name: Wait a bit, so that Postgres can start wait_for: - timeout: 5 + timeout: "{{ postgres_start_wait_time }}" delegate_to: 127.0.0.1 become: false @@ -108,7 +114,7 @@ - name: Wait a bit, so that Postgres can start wait_for: - timeout: 5 + timeout: "{{ postgres_start_wait_time }}" delegate_to: 127.0.0.1 become: false