openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix mariadb_recovery when mariadb container is missing"

Browse Source
This commit is contained in:
Zuul 2020-12-16 09:36:54 +00:00 committed by Gerrit Code Review
commit cb6ffa25e8
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ansible/roles/mariadb/tasks/recover_cluster.yml
View File

@ -26,6 +26,7 @@
kolla_docker: kolla_docker:
name: "{{ mariadb_service.container_name }}" name: "{{ mariadb_service.container_name }}"
action: "stop_container" action: "stop_container"
ignore_missing: true
# Run wsrep recovery with detach=false to block until completion. Use a # Run wsrep recovery with detach=false to block until completion. Use a
# different container name to avoid the mariadb container being removed. # different container name to avoid the mariadb container being removed.
@ -47,7 +48,7 @@
- name: Copying MariaDB log file to /tmp - name: Copying MariaDB log file to /tmp
become: true become: true
command: "docker cp {{ mariadb_service.container_name }}:/var/log/kolla/mariadb/mariadb.log /tmp/mariadb_tmp.log" command: "cp {{ docker_runtime_directory or '/var/lib/docker' }}/volumes/kolla_logs/_data/mariadb/mariadb.log /tmp/mariadb_tmp.log"
# Look for sequence number in logs. Format is: # Look for sequence number in logs. Format is:
# WSREP: Recovered position: <UUID>:<seqno>. # WSREP: Recovered position: <UUID>:<seqno>.
@ -100,18 +101,10 @@
set_fact: set_fact:
bootstrap_host: "{{ mariadb_recover_inventory_name }}" bootstrap_host: "{{ mariadb_recover_inventory_name }}"
- name: Copying grastate.dat file from MariaDB container in bootstrap host
become: true
command: "docker cp {{ mariadb_service.container_name }}:/var/lib/mysql/grastate.dat /tmp/kolla_mariadb_grastate.dat"
changed_when: false
when:
- bootstrap_host is defined
- bootstrap_host == inventory_hostname
- name: Set grastate.dat file from MariaDB container in bootstrap host - name: Set grastate.dat file from MariaDB container in bootstrap host
become: true become: true
lineinfile: lineinfile:
dest: /tmp/kolla_mariadb_grastate.dat dest: "{{ docker_runtime_directory or '/var/lib/docker' }}/volumes/mariadb/_data/grastate.dat"
regexp: 'safe_to_bootstrap:(.*)$' regexp: 'safe_to_bootstrap:(.*)$'
line: 'safe_to_bootstrap: 1' line: 'safe_to_bootstrap: 1'
state: present state: present
@ -119,14 +112,6 @@
- bootstrap_host is defined - bootstrap_host is defined
- bootstrap_host == inventory_hostname - bootstrap_host == inventory_hostname
- name: Copying grastate.dat file to mariadb container
become: true
command: docker cp /tmp/kolla_mariadb_grastate.dat {{ mariadb_service.container_name }}:/var/lib/mysql/grastate.dat
changed_when: false
when:
- bootstrap_host is defined
- bootstrap_host == inventory_hostname
- name: Starting first MariaDB container - name: Starting first MariaDB container
become: true become: true
kolla_docker: kolla_docker:

6
releasenotes/notes/bug-1907658-a24ddc45f63893b5.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes an issue with ``kolla-ansible mariadb_recovery`` when the ``mariadb``
container does not exist on one or more hosts. `LP#1907658
<https://bugs.launchpad.net/kolla-ansible/+bug/1907658>`__