Merge pull request #1207 from eduolivares/retry-ovn-restore

Add retries when OVN DBs are restored

Author: openshift-merge-bot[bot]

.gitignore

@@ -20,3 +20,6 @@
 *.swp
 *.swo
 *~
+
+# CLAUDE
+CLAUDE.md

tests/roles/ovn_adoption/tasks/main.yaml

@@ -249,47 +249,27 @@
     --certificate=/etc/pki/tls/misc/tls.crt ssl:$PODIFIED_OVSDB_SB_IP:6642 > /backup/ovs-sb.ovsschema && ovsdb-tool convert /backup/ovs-sb.db /backup/ovs-sb.ovsschema"
   when: enable_tlse|bool
 
-- name: restore OVN database backups to podified ovsdb-servers
-  when: enable_tlse|bool is false
-  block:
-    - name: restore OVN NB database backup to podified ovsdb-servers
-      no_log: "{{ use_no_log }}"
-      ansible.builtin.shell: |
-        {{ shell_header }}
-        {{ oc_header }}
-        {{ ovn_copy_shell_vars }}
-
-        oc exec ovn-copy-data -- bash -c "ovsdb-client -v restore tcp:$PODIFIED_OVSDB_NB_IP:6641 < /backup/ovs-nb.db"
-
-    - name: restore OVN SB database backup to podified ovsdb-servers
-      no_log: "{{ use_no_log }}"
-      ansible.builtin.shell: |
-        {{ shell_header }}
-        {{ oc_header }}
-        {{ ovn_copy_shell_vars }}
-
-        oc exec ovn-copy-data -- bash -c "ovsdb-client -v restore tcp:$PODIFIED_OVSDB_SB_IP:6642 < /backup/ovs-sb.db"
-
-- name: restore OVN database backups to podified ovsdb-servers (tls)
-  when: enable_tlse|bool
-  block:
-    - name: restore OVN NB database backup to podified ovsdb-servers (tls)
-      no_log: "{{ use_no_log }}"
-      ansible.builtin.shell: |
-        {{ shell_header }}
-        {{ oc_header }}
-        {{ ovn_copy_shell_vars }}
-
-        oc exec ovn-copy-data -- bash -c "ovsdb-client -v restore --ca-cert=/etc/pki/tls/misc/ca.crt --private-key=/etc/pki/tls/misc/tls.key --certificate=/etc/pki/tls/misc/tls.crt ssl:$PODIFIED_OVSDB_NB_IP:6641 < /backup/ovs-nb.db"
-
-    - name: restore OVN SB database backup to podified ovsdb-servers (tls)
-      no_log: "{{ use_no_log }}"
-      ansible.builtin.shell: |
-        {{ shell_header }}
-        {{ oc_header }}
-        {{ ovn_copy_shell_vars }}
-
-        oc exec ovn-copy-data -- bash -c "ovsdb-client -v restore --ca-cert=/etc/pki/tls/misc/ca.crt --private-key=/etc/pki/tls/misc/tls.key --certificate=/etc/pki/tls/misc/tls.crt ssl:$PODIFIED_OVSDB_SB_IP:6642 < /backup/ovs-sb.db"
+- name: restore OVN database backup to podified ovsdb-servers - {{ item }}
+  vars:
+    ovn_db_ip: "{{ 'PODIFIED_OVSDB_NB_IP' if item == 'nb' else 'PODIFIED_OVSDB_SB_IP' }}"
+    ovn_db_port: "{{ '6641' if item == 'nb' else '6642' }}"
+    ovn_db_file: "ovs-{{ item }}.db"
+    tls_opts: "{{ '--ca-cert=/etc/pki/tls/misc/ca.crt --private-key=/etc/pki/tls/misc/tls.key --certificate=/etc/pki/tls/misc/tls.crt' if enable_tlse | bool else '' }}"
+    proto: "{{ 'ssl' if enable_tlse | bool else 'tcp' }}"
+  no_log: "{{ use_no_log }}"
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    {{ ovn_copy_shell_vars }}
+
+    oc exec ovn-copy-data -- bash -c "ovsdb-client -v restore {{ tls_opts }} {{ proto }}:${{ ovn_db_ip }}:{{ ovn_db_port }} < /backup/{{ ovn_db_file }}"
+  register: podified_ovn_db_restore
+  until: podified_ovn_db_restore is success
+  retries: 5
+  delay: "{{ ovn_retry_delay }}"
+  loop:
+    - nb
+    - sb
 
 - name: deploy podified OVN northd service to keep databases in sync
   ansible.builtin.shell: |