From 5508557a8a7a2d193308a35f46a10041ee2403f0 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 9 Mar 2017 12:04:10 -0500 Subject: Fixes issues with raising mysql file limit Changes Include: - Adds spec testing - Only raise limits if nonha. puppet-systemd will restart the mariadb service which breaks ha deployments. Hence we only want to do this in noha. - Minor fix to hiera value refrenced not as parameter to mysql.pp Partial-Bug: #1648181 Related-Bug: #1524809 Co-Authored By: Feng Pan Change-Id: Id063bf4b4ac229181b01f40965811cb8ac4230d5 Signed-off-by: Tim Rozet Signed-off-by: Feng Pan (cherry picked from commit c9acf8a687ea64686c1ecceeff45add014752121) --- .../tripleo_profile_base_database_mysql_spec.rb | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 spec/classes/tripleo_profile_base_database_mysql_spec.rb (limited to 'spec') diff --git a/spec/classes/tripleo_profile_base_database_mysql_spec.rb b/spec/classes/tripleo_profile_base_database_mysql_spec.rb new file mode 100644 index 0000000..b192f6c --- /dev/null +++ b/spec/classes/tripleo_profile_base_database_mysql_spec.rb @@ -0,0 +1,75 @@ +# +# Copyright (C) 2017 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + +require 'spec_helper' + +describe 'tripleo::profile::base::database::mysql' do + let :params do + { :step => 2, + :mysql_max_connections => 4096, + } + end + shared_examples_for 'tripleo::profile::base::database::mysql' do + before :each do + facts.merge!({ :step => params[:step] }) + end + + context 'with noha and raise mariadb limit' do + before do + params.merge!({ + :generate_dropin_file_limit => true + }) + end + it 'should create limit file' do + is_expected.to contain_systemd__service_limits('mariadb.service').with( + :limits => { "LimitNOFILE" => 16384 }) + end + end + + context 'with noha and do not raise mariadb limit' do + before do + params.merge!({ + :generate_dropin_file_limit => false + }) + end + it 'should not create limit file' do + is_expected.to_not contain_systemd__service_limits('mariadb.service') + end + end + + context 'with ha and raise mariadb limit' do + before do + params.merge!({ + :generate_dropin_file_limit => true, + :manage_resources => false, + }) + end + it 'should not create limit file in ha' do + is_expected.to_not contain_systemd__service_limits('mariadb.service') + end + end + end + + on_supported_os.each do |os, facts| + context "on #{os}" do + let(:facts) do + facts.merge({ :hostname => 'node.example.com' }) + end + + it_behaves_like 'tripleo::profile::base::database::mysql' + end + end +end -- cgit 1.2.3-korg