Add --wait --timeout options for pg_ctl stop

vitabaks · vitabaks · commit 923c776857ec · 2021-06-03T14:45:16.000+03:00
diff --git a/roles/patroni/tasks/main.yml b/roles/patroni/tasks/main.yml
@@ -552,23 +552,15 @@
     - name: Prepare PostgreSQL | stop PostgreSQL (will be managed by patroni)
       become: true
       become_user: postgres
-      command: "/usr/bin/pg_ctlcluster {{ postgresql_version }} {{ postgresql_cluster_name }} stop -m fast"
-      register: stop_result
-      until: stop_result.rc == 0
-      retries: 300
-      delay: 10
+      command: "/usr/bin/pg_ctlcluster {{ postgresql_version }} {{ postgresql_cluster_name }} stop -m fast -- -w -t 600"
       when: (checkpoint_result.rc is defined and checkpoint_result.rc == 0) and
             (ansible_os_family == "Debian" and postgresql_packages|join(" ") is not search("postgrespro"))
 
       # "RedHat" or PostgresPro
     - name: Prepare PostgreSQL | stop PostgreSQL (will be managed by patroni)
       become: true
       become_user: postgres
-      command: "{{ postgresql_bin_dir }}/pg_ctl stop -D {{ postgresql_data_dir }} -m fast"
-      register: stop_result
-      until: stop_result.rc == 0
-      retries: 300
-      delay: 10
+      command: "{{ postgresql_bin_dir }}/pg_ctl stop -D {{ postgresql_data_dir }} -m fast -w -t 600"
       when: (checkpoint_result.rc is defined and checkpoint_result.rc == 0) and
             (ansible_os_family == "RedHat" or postgresql_packages|join(" ") is search("postgrespro"))
 
@@ -693,20 +685,12 @@
           failed_when: false
 
         - name: Stop PostgreSQL  # "Debian"
-          command: "/usr/bin/pg_ctlcluster {{ postgresql_version }} {{ postgresql_cluster_name }} stop -m fast"
-          register: stop_result
-          until: stop_result.rc == 0
-          retries: 10
-          delay: 10
+          command: "/usr/bin/pg_ctlcluster {{ postgresql_version }} {{ postgresql_cluster_name }} stop -m fast -- -w -t 600"
           when: ansible_os_family == "Debian" and
                 (pg_ctl_status_result.rc is defined and pg_ctl_status_result.rc != 3)
 
         - name: Stop PostgreSQL  # "RedHat" or PostgresPro
-          command: "{{ postgresql_bin_dir }}/pg_ctl stop -D {{ postgresql_data_dir }} -m fast"
-          register: stop_result
-          until: stop_result.rc == 0
-          retries: 10
-          delay: 10
+          command: "{{ postgresql_bin_dir }}/pg_ctl stop -D {{ postgresql_data_dir }} -m fast -w -t 600"
           when: (ansible_os_family == "RedHat" or postgresql_packages|join(" ") is search("postgrespro")) and
                 (pg_ctl_status_result.rc is defined and pg_ctl_status_result.rc != 3)
       when: patroni_cluster_bootstrap_method == "pgbackrest"
