openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Allow override of mysql/galera open files limit"

This commit is contained in:
Zuul 2020-03-31 23:27:47 +00:00 committed by Gerrit Code Review
parent eb716fe728 57de7a597b
commit 0bef823532
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/profile/pacemaker/database/mysql.pp
View File

@ -93,6 +93,10 @@
# (Optional) The number of times pcs commands should be retried. # (Optional) The number of times pcs commands should be retried.
# Defaults to hiera('pcs_tries', 20) # Defaults to hiera('pcs_tries', 20)
# #
# [*open_files_limit*]
# (Optional) Maximum value for open-files-limit
# Defaults to 16384
#
class tripleo::profile::pacemaker::database::mysql ( class tripleo::profile::pacemaker::database::mysql (
$bootstrap_node = hiera('mysql_short_bootstrap_node_name'), $bootstrap_node = hiera('mysql_short_bootstrap_node_name'),
$bind_address = $::hostname, $bind_address = $::hostname,
@ -108,6 +112,7 @@ class tripleo::profile::pacemaker::database::mysql (
$ipv6 = str2bool(hiera('mysql_ipv6', false)), $ipv6 = str2bool(hiera('mysql_ipv6', false)),
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$pcs_tries = hiera('pcs_tries', 20), $pcs_tries = hiera('pcs_tries', 20),
$open_files_limit = 16384,
) { ) {
if $::hostname == downcase($bootstrap_node) { if $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true $pacemaker_master = true
@ -250,7 +255,7 @@ class tripleo::profile::pacemaker::database::mysql (
op_params => 'promote timeout=300s on-fail=block', op_params => 'promote timeout=300s on-fail=block',
master_params => '', master_params => '',
meta_params => "master-max=${galera_nodes_count} ordered=true", meta_params => "master-max=${galera_nodes_count} ordered=true",
resource_params => "additional_parameters='--open-files-limit=16384' enable_creation=true wsrep_cluster_address='gcomm://${galera_nodes}' cluster_host_map='${cluster_host_map}'", resource_params => "additional_parameters='--open-files-limit=${open_files_limit}' enable_creation=true wsrep_cluster_address='gcomm://${galera_nodes}' cluster_host_map='${cluster_host_map}'",
tries => $pcs_tries, tries => $pcs_tries,
location_rule => { location_rule => {
resource_discovery => 'exclusive', resource_discovery => 'exclusive',

7
manifests/profile/pacemaker/database/mysql_bundle.pp
View File

@ -136,6 +136,10 @@
# (optional) Set the --user= switch to be passed to pcmk # (optional) Set the --user= switch to be passed to pcmk
# Defaults to 'root' # Defaults to 'root'
# #
# [*open_files_limit*]
# (Optional) Maximum value for open-files-limit
# Defaults to 16384
#
class tripleo::profile::pacemaker::database::mysql_bundle ( class tripleo::profile::pacemaker::database::mysql_bundle (
$mysql_docker_image = hiera('tripleo::profile::pacemaker::database::mysql_bundle::mysql_docker_image', undef), $mysql_docker_image = hiera('tripleo::profile::pacemaker::database::mysql_bundle::mysql_docker_image', undef),
$control_port = hiera('tripleo::profile::pacemaker::database::mysql_bundle::control_port', '3123'), $control_port = hiera('tripleo::profile::pacemaker::database::mysql_bundle::control_port', '3123'),
@ -161,6 +165,7 @@ class tripleo::profile::pacemaker::database::mysql_bundle (
$bundle_user = 'root', $bundle_user = 'root',
$pcs_tries = hiera('pcs_tries', 20), $pcs_tries = hiera('pcs_tries', 20),
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$open_files_limit = 16384,
) { ) {
if $::hostname == downcase($bootstrap_node) { if $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true $pacemaker_master = true
@ -464,7 +469,7 @@ MYSQL_HOST=localhost\n",
master_params => '', master_params => '',
meta_params => "master-max=${galera_nodes_count} ordered=true container-attribute-target=host", meta_params => "master-max=${galera_nodes_count} ordered=true container-attribute-target=host",
op_params => 'promote timeout=300s on-fail=block', op_params => 'promote timeout=300s on-fail=block',
resource_params => "log='/var/log/mysql/mysqld.log' additional_parameters='--open-files-limit=16384' enable_creation=true wsrep_cluster_address='gcomm://${galera_nodes}' cluster_host_map='${cluster_host_map_string}'", resource_params => "log='/var/log/mysql/mysqld.log' additional_parameters='--open-files-limit=${open_files_limit}' enable_creation=true wsrep_cluster_address='gcomm://${galera_nodes}' cluster_host_map='${cluster_host_map_string}'",
tries => $pcs_tries, tries => $pcs_tries,
location_rule => { location_rule => {
resource_discovery => 'exclusive', resource_discovery => 'exclusive',