Merge "Bump MariaDB version to 10.4"

defaults/main.yml

@@ -41,8 +41,9 @@ galera_mariadb_service_name: mariadb
 galera_mariadb_server_package: "{{ _galera_mariadb_server_package }}"
 
 # The major version used to select the repo URL path
-galera_major_version: 10.3
-galera_minor_version: 18
+# NOTE(noonedeadpunk) 10.4.13 seems broken, as it crushed during requests http://paste.openstack.org/show/794059/
+galera_major_version: 10.4
+galera_minor_version: 12
 
 # Set the URL for the MariaDB repository
 galera_repo_host: "downloads.mariadb.com"
@@ -122,7 +123,7 @@ galera_wsrep_node_incoming_address: "{{ galera_wsrep_address }}"
 galera_wsrep_slave_threads_max: 16
 galera_wsrep_slave_threads: "{{ [[ansible_processor_vcpus|default(2), 2] | max, galera_wsrep_slave_threads_max] | min }}"
 galera_wsrep_retry_autocommit: 3
-galera_wsrep_debug: 0
+galera_wsrep_debug: NONE
 galera_wsrep_sst_method: mariabackup
 galera_wsrep_provider_options:
   - { option: "gcache.size", value: "{{ galera_gcache_size }}" }

tasks/galera_server_main.yml

@@ -88,5 +88,6 @@
   meta: flush_handlers
 
 - include_tasks: galera_server_setup.yml
+  when: inventory_hostname == galera_server_bootstrap_node
   tags:
     - galera_server-config

tasks/galera_server_post_install.yml

@@ -104,6 +104,7 @@
     config_overrides: "{{ item.config_overrides }}"
     config_type: "{{ item.config_type }}"
     ignore_none_type: False
+  when: item.condition | default(True)
   with_items:
     - src: my.cnf.j2
       dest: "{{ galera_etc_conf_file }}"
@@ -117,6 +118,7 @@
       dest: /etc/mysql/debian.cnf
       config_overrides: "{{ galera_debian_cnf_overrides }}"
       config_type: "ini"
+      condition: "{{ (ansible_os_family | lower == 'debian') }}"
   notify:
     - Manage LB
     - Restart all mysql

tasks/galera_server_setup.yml

@@ -20,6 +20,7 @@
     password: "{{ item.password }}"
     priv: "{{ item.priv }}"
     state: "{{ item.state }}"
+    login_unix_socket: "{{ galera_unix_socket }}"
   with_items:
     - name: "{{ galera_root_user }}"
       host: "%"
@@ -29,8 +30,8 @@
     - name: "{{ galera_root_user }}"
       host: "localhost"
       password: "{{ galera_root_password }}"
-      priv: "*.*:ALL"
-      state: absent
+      priv: "*.*:ALL,GRANT"
+      state: present
     - name: "{{ galera_monitoring_user }}"
       host: '%'
       password: "{{ galera_monitoring_user_password }}"
@@ -45,8 +46,6 @@
   until: galera_users is success
   retries: 3
   delay: 10
-  delegate_to: "{{ galera_server_bootstrap_node }}"
-  run_once: true
   no_log: True
 
 - name: Run MySQL Upgrade
@@ -57,5 +56,3 @@
   until: galera_mysql_upgrade is success
   retries: 3
   delay: 10
-  delegate_to: "{{ galera_server_bootstrap_node }}"
-  run_once: true

tests/test-galera-server-functional.yml

@@ -18,6 +18,18 @@
   user: root
   gather_facts: true
   tasks:
+    - name: Wait for cluster ready state
+      command: |
+        mysql -h {{ ansible_host }} \
+              -p"{{ galera_root_password }}" \
+              -e "show status like 'wsrep_incoming_addresses';" \
+              --silent \
+              --skip-column-names
+      register: mysql_instance_ready
+      retries: 20
+      delay: 5
+      changed_when: false
+      until: mysql_instance_ready is success
     - name: Check cluster incoming addresses
       command: |
         mysql -h {{ ansible_host }} \
@@ -26,7 +38,6 @@
               --silent \
               --skip-column-names
       register: wsrep_incoming_addresses
-      no_log: true
       changed_when: false
       tags:
         - skip_ansible_lint
@@ -37,7 +48,6 @@
               -e "show status like 'wsrep_local_state_comment';" \
               --silent \
               --skip-column-names
-      no_log: true
       register: wsrep_local_state_comment
       changed_when: false
       tags:
@@ -50,7 +60,6 @@
               --silent \
               --skip-column-names
       register: wsrep_evs_state
-      no_log: true
       changed_when: false
       tags:
         - skip_ansible_lint
@@ -70,7 +79,8 @@
         name: "OSA-test"
         state: "present"
       when: ansible_host == '10.1.0.2'
-      no_log: true
+      tags:
+        - skip_ansible_lint
     - name: Grant access to the DB on 10.1.0.3
       mysql_user:
         login_user: "{{ galera_root_user }}"
@@ -81,10 +91,11 @@
         host: "{{ item }}"
         state: "present"
         priv: "OSA-test.*:ALL"
-      no_log: true
       with_items:
         - "localhost"
         - "%"
       when: ansible_host == '10.1.0.3'
+      tags:
+        - skip_ansible_lint
   vars_files:
     - common/test-vars.yml

vars/debian.yml

@@ -56,7 +56,6 @@ galera_server_mariadb_distro_packages:
   - mariadb-client
   - mariadb-backup
   - "{{ galera_mariadb_server_package }}"
-  - galera-3
   - rsync
   - socat
 
@@ -86,3 +85,5 @@ galera_wsrep_provider: "/usr/lib/galera/libgalera_smm.so"
 
 galera_client_distro_packages:
   - "mariadb-client-{{ galera_major_version }}"
+
+galera_unix_socket: "/var/run/mysqld/mysqld.sock"

vars/redhat.yml

@@ -66,7 +66,9 @@ _galera_repo:
   description: "MariaDB Repo"
   baseurl: "{{ galera_repo_url }}"
 
-galera_wsrep_provider: "/usr/lib/galera/libgalera_smm.so"
+galera_wsrep_provider: "/usr/lib64/galera-4/libgalera_smm.so"
 
 galera_client_distro_packages:
   - MariaDB-client
+
+galera_unix_socket: "/var/lib/mysql/mysql.sock"

vars/suse.yml

@@ -67,6 +67,7 @@ _galera_repo:
   baseurl: "{{ galera_repo_url }}"
 
 galera_wsrep_provider: "/usr/lib64/galera/libgalera_smm.so"
+galera_unix_socket: "/var/lib/mysqld/mysqld.sock"
 
 mariadb_delete_etc_conf_files:
   - default_plugins.cnf