From ece430ab2f3752f6a471d357861b606cbe349f92 Mon Sep 17 00:00:00 2001 From: Adam Reznechek Date: Fri, 26 Aug 2016 14:17:18 -0500 Subject: [PATCH] Work around Ansible vcpu fact bug on ppc64le This changes how several fields using ansible_processor_vcpus are set to work around a bug in Ansible where ansible_processor_vcpus is reported as 0 on ppc64le today due to issues with /proc/cpuinfo format differences. An upstream fix has been proposed at [1]. [1] - ansible/ansible#16533 Change-Id: I49a024aa2165db6501d9e26d09d7940cb0531bd4 --- defaults/main.yml | 2 +- templates/my.cnf.j2 | 2 +- templates/mysql_defaults.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index dc32c74b..b8b67ee2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -65,7 +65,7 @@ galera_innodb_log_buffer_size: 128M galera_wsrep_address: "{{ ansible_ssh_host }}" galera_wsrep_cluster_address: "{% for host in galera_cluster_members %}{{ hostvars[host]['ansible_ssh_host'] }}{% if not loop.last %},{% endif %}{% endfor %}" galera_wsrep_node_incoming_address: "{{ galera_wsrep_address }}" -galera_wsrep_slave_threads: "{{ ansible_processor_vcpus | default(2) }}" +galera_wsrep_slave_threads: "{{ (ansible_processor_vcpus | int > 0) | ternary (ansible_processor_vcpus, 2) }}" galera_wsrep_retry_autocommit: 3 galera_wsrep_debug: 0 galera_wsrep_sst_method: xtrabackup-v2 diff --git a/templates/my.cnf.j2 b/templates/my.cnf.j2 index f4be79fc..fd682386 100644 --- a/templates/my.cnf.j2 +++ b/templates/my.cnf.j2 @@ -1,6 +1,6 @@ {%- set all_calculated_max_connections = [] %} {%- for galera_node in galera_cluster_members %} - {%- if all_calculated_max_connections.append(hostvars[galera_node]['ansible_processor_vcpus'] | default(2) * 100) %} + {%- if all_calculated_max_connections.append((hostvars[galera_node]['ansible_processor_vcpus'] | int > 0) | ternary (ansible_processor_vcpus, 2) * 100) %} {%- endif %} {%- endfor %} {%- set calculated_max_connections = all_calculated_max_connections|sort %} diff --git a/templates/mysql_defaults.j2 b/templates/mysql_defaults.j2 index c2e13b83..c0ac18d5 100644 --- a/templates/mysql_defaults.j2 +++ b/templates/mysql_defaults.j2 @@ -2,7 +2,7 @@ {%- set all_calculated_max_connections = [] %} {%- for galera_node in galera_cluster_members %} - {%- set _ = all_calculated_max_connections.append(hostvars[galera_node]['ansible_processor_vcpus'] | default(2) * 100) %} + {%- set _ = all_calculated_max_connections.append((hostvars[galera_node]['ansible_processor_vcpus'] | int > 0) | ternary (ansible_processor_vcpus, 2) * 100) %} {%- endfor %} {%- set calculated_min_connections = all_calculated_max_connections | min %} {%- set calculated_max_connections = galera_max_connections | default(calculated_min_connections) %}