From 91eb4140b5b8337cbd029a58ea1cb4c3bab3fa21 Mon Sep 17 00:00:00 2001 From: Antonio Romito Date: Thu, 24 Nov 2022 09:06:30 +0000 Subject: [PATCH] Template option addition for --pids-limit on Galera cluster resource mysql_bundle.pp has been modified to be able to configure --pids-limit option using a template. By default the parameter remains 'undef' when not specified. When "tripleo::profile::pacemaker::database::mysql_bundle::pids_limit:" is used as an ExtraConfig it will automatically set the value in the Galera cluster resource. Closes-Bug: #1982751 Change-Id: Iffe9c9a1d7ca736f273d2da43928d7da4a99d1d6 --- .../profile/pacemaker/database/mysql_bundle.pp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/manifests/profile/pacemaker/database/mysql_bundle.pp b/manifests/profile/pacemaker/database/mysql_bundle.pp index 75e569e56..8aaf0df70 100644 --- a/manifests/profile/pacemaker/database/mysql_bundle.pp +++ b/manifests/profile/pacemaker/database/mysql_bundle.pp @@ -204,6 +204,12 @@ # (optional) Allows passing extra options to wsrep_provider_options. # Defaults to undef # +# [*pids_limit*] +# (optional) Tune the container's pids limit. Set to 0 to have unlimited +# pids for the container. The default is 4096 on systems that support +# "pids" cgroup controller. +# Defaults to undef +# class tripleo::profile::pacemaker::database::mysql_bundle ( $mysql_docker_image = undef, $control_port = 3123, @@ -244,6 +250,7 @@ class tripleo::profile::pacemaker::database::mysql_bundle ( $gcache_size = undef, $gcache_recover = false, $provider_options = undef, + $pids_limit = undef, ) { if $bootstrap_node and $::hostname == downcase($bootstrap_node) { $pacemaker_master = true @@ -523,6 +530,11 @@ MYSQL_HOST=localhost\n", }, } + if $pids_limit != undef { + $pids_limit_real = " --pids-limit ${pids_limit}" + } else { + $pids_limit_real = '' + } if $enable_internal_tls { $mysql_storage_maps_tls = { 'mysql-pki-gcomm-key' => { @@ -573,7 +585,7 @@ MYSQL_HOST=localhost\n", }, container_options => 'network=host', # lint:ignore:140chars - options => "--user=${bundle_user} --log-driver=${log_driver}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS${tls_priorities_real}", + options => "--user=${bundle_user}${pids_limit_real} --log-driver=${log_driver_real}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS${tls_priorities_real}", # lint:endignore run_command => '/bin/bash /usr/local/bin/kolla_start', network => "control-port=${control_port}",