From e628ec88a1fcc1b7eff48d30bd8c693e4c544e86 Mon Sep 17 00:00:00 2001 From: jlarriba Date: Mon, 17 Oct 2022 14:20:11 +0200 Subject: [PATCH] Improved way of detecting Galera cluster is up&running There is a script in every node that checks correctly if the Galera node has been correctly re-introduced in the cluster as the previous check on the local port open had some disadvantages, and does not wait for IST to complete. This is an unclean cherry-pick because backup_and_restore in train is called backup-and-restore. No extra changes implemented. Change-Id: Id49274f5bade4af5b88b6354cfa092e4b041eb6e (cherry picked from commit dc4e574ba10807ea23155017c0bd9e734023fae5) (cherry picked from commit 79f92e70ade9d119a2e0d0c7d1bbe478f1481eb8) --- .../roles/backup-and-restore/backup/tasks/db_backup.yml | 8 +------- .../backup-and-restore/backup/tasks/pacemaker_start.yml | 9 +-------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/tripleo_ansible/roles/backup-and-restore/backup/tasks/db_backup.yml b/tripleo_ansible/roles/backup-and-restore/backup/tasks/db_backup.yml index 0855529d7..dd2dd6b69 100644 --- a/tripleo_ansible/roles/backup-and-restore/backup/tasks/db_backup.yml +++ b/tripleo_ansible/roles/backup-and-restore/backup/tasks/db_backup.yml @@ -65,13 +65,7 @@ - bar_create_recover_image - name: Wait until pacemaker has Galera up&running - shell: | - set -o pipefail - ss -tunlp | grep ":3306 " | sed -e 's/.*\///' - register: mysql_result - retries: 300 - until: mysql_result is search('mysqld') - delay: 5 + shell: /var/lib/container-config-scripts/pacemaker_wait_bundle.sh galera galera-bundle Master when: - enabled_galera tags: diff --git a/tripleo_ansible/roles/backup-and-restore/backup/tasks/pacemaker_start.yml b/tripleo_ansible/roles/backup-and-restore/backup/tasks/pacemaker_start.yml index b01726d6e..2ab0f2f62 100644 --- a/tripleo_ansible/roles/backup-and-restore/backup/tasks/pacemaker_start.yml +++ b/tripleo_ansible/roles/backup-and-restore/backup/tasks/pacemaker_start.yml @@ -21,13 +21,6 @@ - bar_create_recover_image - name: Wait until pacemaker has Galera up&running - shell: | - set -o pipefail - ss -tunlp | grep ":3306 " | sed -e 's/.*\///' - register: mysql_result - retries: 300 - until: mysql_result is search('mysqld') - delay: 5 - when: tripleo_backup_and_restore_enabled_services.stdout is search('mysql^') + shell: /var/lib/container-config-scripts/pacemaker_wait_bundle.sh galera galera-bundle Master tags: - bar_create_recover_image