Merge pull request #1046 from fyanac/mariadb_wa

WA mariadb pod - ipv6 adoption

Author: openshift-merge-bot[bot]

tests/roles/common_defaults/defaults/main.yaml

@@ -211,3 +211,8 @@ pull_openstack_configuration_ssh_shell_vars: |
 # Whether to adopt Octavia
 enable_octavia: true
 octavia_adoption: true
+
+# MariaDB client connection timeout in seconds
+# Related to OSPRH-18618
+mariadb_client_timeout: 0
+mariadbcheck: true

tests/roles/get_services_configuration/tasks/main.yaml

@@ -15,7 +15,7 @@
     declare -xA PULL_OPENSTACK_CONFIGURATION_DATABASES
     for CELL in $(echo $CELLS); do
         PULL_OPENSTACK_CONFIGURATION_DATABASES[$CELL]=$(oc run mariadb-client-1-$CELL ${MARIADB_RUN_OVERRIDES} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \
-            mysql -rsh "${SOURCE_MARIADB_IP[$CELL]}" -uroot -p"${SOURCE_DB_ROOT_PASSWORD[$CELL]}" -e 'SHOW databases;')
+            bash -c "sleep {{ mariadb_client_timeout }} && mysql -rsh \"${SOURCE_MARIADB_IP[$CELL]}\" -uroot -p\"${SOURCE_DB_ROOT_PASSWORD[$CELL]}\" -e 'SHOW databases;' ")
     done
 
 - name: run mysqlcheck on the original DB to look for things that are not OK
@@ -27,7 +27,7 @@
     declare -xA PULL_OPENSTACK_CONFIGURATION_MYSQLCHECK_NOK
     run_mysqlcheck() {
         PULL_OPENSTACK_CONFIGURATION_MYSQLCHECK_NOK=$(oc run mariadb-client-2-$1 ${MARIADB_RUN_OVERRIDES} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \
-            mysqlcheck --all-databases -h ${SOURCE_MARIADB_IP[$CELL]} -u root -p"${SOURCE_DB_ROOT_PASSWORD[$CELL]}" | grep -v OK)
+            bash -c "sleep {{ mariadb_client_timeout }} && mysqlcheck --all-databases -h ${SOURCE_MARIADB_IP[$CELL]} -u root -p\"${SOURCE_DB_ROOT_PASSWORD[$CELL]}\" | grep -v OK")
     }
     for CELL in $(echo $CELLS); do
       run_mysqlcheck $CELL
@@ -36,7 +36,7 @@
         # Try mysql_upgrade to fix mysqlcheck failure
         for CELL in $(echo $CELLS); do
             MYSQL_UPGRADE=$(oc run mariadb-client-3-$CELL ${MARIADB_CLIENT_ANNOTATIONS} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \
-                mysql_upgrade --skip-version-check -v -h ${SOURCE_MARIADB_IP[$CELL]} -u root -p"${SOURCE_DB_ROOT_PASSWORD[$CELL]}")
+                bash -c "sleep {{ mariadb_client_timeout }} && mysql_upgrade --skip-version-check -v -h ${SOURCE_MARIADB_IP[$CELL]} -u root -p\"${SOURCE_DB_ROOT_PASSWORD[$CELL]}\" ")
             # rerun mysqlcheck to check if problem is resolved
             run_mysqlcheck
         done
@@ -53,8 +53,8 @@
         {{ oc_header }}
         {{ mariadb_copy_shell_vars_src }}
         export PULL_OPENSTACK_CONFIGURATION_NOVADB_MAPPED_CELLS=$(oc run mariadb-client-1 ${MARIADB_RUN_OVERRIDES} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \
-        mysql -rsh "${SOURCE_MARIADB_IP[default]}" -uroot -p"${SOURCE_DB_ROOT_PASSWORD[default]}" nova_api -e \
-          'select uuid,name,transport_url,database_connection,disabled from cell_mappings;')
+          bash -c "sleep {{ mariadb_client_timeout }} && mysql -rsh \"${SOURCE_MARIADB_IP[default]}\" -uroot -p\"${SOURCE_DB_ROOT_PASSWORD[default]}\" nova_api -e \
+              'select uuid,name,transport_url,database_connection,disabled from cell_mappings;' ")
 
     - name: get the host names of the registered Nova compute services
       ansible.builtin.shell: |
@@ -64,8 +64,8 @@
         declare -xA PULL_OPENSTACK_CONFIGURATION_NOVA_COMPUTE_HOSTNAMES
         for CELL in $(echo $CELLS); do
             PULL_OPENSTACK_CONFIGURATION_NOVA_COMPUTE_HOSTNAMES[$CELL]=$(oc run mariadb-client-4-$CELL ${MARIADB_RUN_OVERRIDES} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \
-                mysql -rsh "${SOURCE_MARIADB_IP[$CELL]}" -uroot -p"${SOURCE_DB_ROOT_PASSWORD[$CELL]}" -e \
-                    "select host from nova.services where services.binary='nova-compute' and deleted=0;")
+                bash -c "sleep {{ mariadb_client_timeout }} && mysql -rsh \"${SOURCE_MARIADB_IP[$CELL]}\" -uroot -p\"${SOURCE_DB_ROOT_PASSWORD[$CELL]}\" -e \
+                    \"select host from nova.services where services.binary='nova-compute' and deleted=0;\" ")
         done
 
     - name: get the list of mapped Nova cells
@@ -90,16 +90,16 @@
     declare -xA PULL_OPENSTACK_CONFIGURATION_MYSQLCHECK_NOK
     declare -xA PULL_OPENSTACK_CONFIGURATION_NOVA_COMPUTE_HOSTNAMES
     PULL_OPENSTACK_CONFIGURATION_DATABASES[$CELL]="$(oc run mariadb-client-5-$CELL ${MARIADB_RUN_OVERRIDES} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \
-        mysql -rsh ${SOURCE_MARIADB_IP[$RCELL]} -uroot -p${SOURCE_DB_ROOT_PASSWORD[$RCELL]} -e 'SHOW databases;')"
+        bash -c "sleep {{ mariadb_client_timeout }} && mysql -rsh ${SOURCE_MARIADB_IP[$RCELL]} -uroot -p${SOURCE_DB_ROOT_PASSWORD[$RCELL]} -e 'SHOW databases;'")"
     PULL_OPENSTACK_CONFIGURATION_MYSQLCHECK_NOK[$CELL]="$(oc run mariadb-client-6-$CELL ${MARIADB_RUN_OVERRIDES} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \
-        mysqlcheck --all-databases -h ${SOURCE_MARIADB_IP[$RCELL]} -u root -p${SOURCE_DB_ROOT_PASSWORD[$RCELL]} | grep -v OK)"
+        bash -c "sleep {{ mariadb_client_timeout }} && mysqlcheck --all-databases -h ${SOURCE_MARIADB_IP[$RCELL]} -u root -p${SOURCE_DB_ROOT_PASSWORD[$RCELL]} | grep -v OK")"
     PULL_OPENSTACK_CONFIGURATION_NOVA_COMPUTE_HOSTNAMES[$CELL]="$(oc run mariadb-client-7-$CELL ${MARIADB_RUN_OVERRIDES} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \
-        mysql -rsh ${SOURCE_MARIADB_IP[$RCELL]} -uroot -p${SOURCE_DB_ROOT_PASSWORD[$RCELL]} -e \
-        "select host from nova.services where services.binary='nova-compute' and deleted=0;")"
+        bash -c "sleep {{ mariadb_client_timeout }} && mysql -rsh ${SOURCE_MARIADB_IP[$RCELL]} -uroot -p${SOURCE_DB_ROOT_PASSWORD[$RCELL]} -e \
+            \"select host from nova.services where services.binary='nova-compute' and deleted=0;\" ")"
     if [ "$RCELL" = "default" ]; then
         PULL_OPENSTACK_CONFIGURATION_NOVADB_MAPPED_CELLS="$(oc run mariadb-client-2 ${MARIADB_RUN_OVERRIDES} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \
-            mysql -rsh ${SOURCE_MARIADB_IP[$RCELL]} -uroot -p${SOURCE_DB_ROOT_PASSWORD[$RCELL]} nova_api -e \
-                'select uuid,name,transport_url,database_connection,disabled from cell_mappings;')"
+            bash -c "sleep {{ mariadb_client_timeout }} && mysql -rsh ${SOURCE_MARIADB_IP[$RCELL]} -uroot -p${SOURCE_DB_ROOT_PASSWORD[$RCELL]} nova_api -e \
+                'select uuid,name,transport_url,database_connection,disabled from cell_mappings;'")"
         PULL_OPENSTACK_CONFIGURATION_NOVAMANAGE_CELL_MAPPINGS="$($CONTROLLER1_SSH sudo podman exec -it nova_conductor nova-manage cell_v2 list_cells)"
     fi
     EOF

tests/roles/mariadb_copy/tasks/main.yaml

@@ -66,6 +66,12 @@
   retries: 25
   delay: "{{ mariadb_retry_delay }}"
 
+# MariaDB client connection timeout in seconds
+# Related to OSPRH-18618
+- name: Add sleep time
+  ansible.builtin.pause:
+    seconds: "{{ mariadb_client_timeout }}"
+
 - name: check that the Galera database cluster(s) members are online and synced, for all cells
   no_log: "{{ use_no_log }}"
   ansible.builtin.shell: |

tests/roles/mariadb_copy/tasks/mariadb_verify.yaml

@@ -10,3 +10,4 @@
     cmd: "{{ lookup('ansible.builtin.template', 'post_checks.bash') }}"
   register: result
   failed_when: result.rc != 0 or 'CHECK FAILED' in result.stdout
+  when: mariadbcheck | bool

tests/roles/mariadb_copy/templates/pre_checks.bash

@@ -4,5 +4,5 @@
 # Test the connection to the control plane "upcall" and cells' databases
 for CELL in $(echo "super $RENAMED_CELLS"); do
   oc run mariadb-client --image $MARIADB_IMAGE -i --rm --restart=Never -- \
-    mysql -rsh "${PODIFIED_MARIADB_IP[$CELL]}" -uroot -p"${PODIFIED_DB_ROOT_PASSWORD[$CELL]}" -e 'SHOW databases;'
+    bash -c "sleep {{ mariadb_client_timeout }} && mysql -rsh \"${PODIFIED_MARIADB_IP[$CELL]}\" -uroot -p\"${PODIFIED_DB_ROOT_PASSWORD[$CELL]}\" -e 'SHOW databases;'"
 done