Skip to content

Implement character_set and other options #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jul 2, 2013
Merged

Implement character_set and other options #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e3b6de2
Implement character_set. You can change the default server and
abraham1901 Apr 4, 2013
2a1b1e7
* Adding `key_buffer` parameter to `mysql::config`
abraham1901 Apr 7, 2013
5ea8e5f
* Adding `server_idparameter to `mysql::config`
abraham1901 Apr 8, 2013
a171c52
* Puppet 2.6 fix
abraham1901 May 20, 2013
1a13580
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql
abraham1901 May 21, 2013
b07c67e
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql
abraham1901 Jun 10, 2013
6c81ea0
* Trying fix unit tests for Travis
abraham1901 Jun 16, 2013
fad4f06
* Fixing lint warnings
abraham1901 Jun 17, 2013
4d9e9a5
* Fixing lint warnings
abraham1901 Jun 17, 2013
a42d5be
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql
abraham1901 Jun 26, 2013
ead86b5
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql
abraham1901 Jul 2, 2013
6cef2e8
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql
abraham1901 Jul 2, 2013
9d69afc
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql
abraham1901 Jul 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 111 additions & 45 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,73 @@
# Class: mysql::config
#
# Parameters:
# [*bind_address*] - address to bind service.
# [*config_file*] - my.cnf configuration file path.
# [*datadir*] - path to datadir.
# [*tmpdir*] - path to tmpdir.
# [*default_engine] - configure a default table engine
# [*etc_root_password*] - whether to save /etc/my.cnf.
# [*log_error] - path to mysql error log
# [*manage_config_file*] - if the config file should be managed (default: true)
# [*max_allowed_packet*] - Maximum network packet size mysqld will accept
# [*old_root_password*] - previous root user password,
# [*port*] - port to bind service.
# [*restart] - whether to restart mysqld (true/false)
# [*root_group] - use specified group for root-owned files
# [*root_password*] - root user password.
# [*service_name*] - mysql service name.
# [*socket*] - mysql socket.
# [*ssl] - enable ssl
# [*ssl_ca] - path to ssl-ca
# [*ssl_cert] - path to ssl-cert
# [*ssl_key] - path to ssl-key
#
# [*root_password*] - root user password.
# [*old_root_password*] - previous root user password,
# [*bind_address*] - address to bind service.
# [*port*] - port to bind service.
# [*etc_root_password*] - whether to save /etc/my.cnf.
# [*service_name*] - mysql service name.
# [*config_file*] - my.cnf configuration file path.
# [*socket*] - mysql socket.
# [*datadir*] - path to datadir.
# [*ssl] - enable ssl
# [*ssl_ca] - path to ssl-ca
# [*ssl_cert] - path to ssl-cert
# [*ssl_key] - path to ssl-key
# [*log_error] - path to mysql error log
# [*default_engine] - configure a default table engine
# [*root_group] - use specified group for root-owned files
# [*restart] - whether to restart mysqld (true/false)
# [*character_set] - You can change the default server and
# client character set
# [*key_buffer] - Index blocks for MyISAM tables are buffered and
# are shared by all threads. key_buffer_size is the size of the buffer used
# for index blocks.
# [*max_allowed_packet] - The maximum size of one packet or any
# generated/intermediate string, or any parameter sent by the
# mysql_stmt_send_long_data() C API function.
# [*thread_stack] - The stack size for each thread.
# [*thread_cache_size] - How many threads server should cache for reuse.
# [*myisam-recover] - Set the MyISAM storage engine recovery mode.
# [*query_cache_limit] - Do not cache results that are larger than this
# number of bytes.
# [*query_cache_size] - The amount of memory allocated for caching query
# results.
# [*max_connections] - The maximum permitted number of simultaneous
# client connections.
# [*tmp_table_size] - The maximum size of internal in-memory temporary
# tables.
# [*max_heap_table_size] - This variable sets the maximum size to which
# user-created MEMORY tables are permitted to grow.
# [*table_open_cache] - The number of open tables for all threads.
# [*long_query_time] - If a query takes longer than this many seconds,
# the server increments the Slow_queries status variable.
# [*server_id] - The server ID, used in replication to give each
# master and slave a unique identity.
# [*sql_log_bin] - This variable controls whether logging to the
# binary log is done. The default value is 1.
# [*log_bin] - Enable binary logging. The server logs all
# statements that change data to the binary log, which is used for backup
# and replication.
# [*max_binlog_size] - If a write to the binary log causes the current
# log file size to exceed the value of this variable, the server rotates
# the binary logs (closes the current file and opens the next one).
# [*binlog_do_db] - This option affects binary logging in a manner
# similar to the way that --replicate-do-db affects replication.
# [*expire_logs_days] - The number of days for automatic binary log file
# removal.
# [*log_bin_trust_function_creators] - It controls whether stored function
# creators can be trusted not to create stored functions that will cause
# unsafe events to be written to the binary log.
# [*replicate_ignore_table] - Tells the slave SQL thread not to
# replicate any statement that updates the specified table, even if any
# other tables might be updated by the same statement.
# [*replicate_wild_do_table] - Tells the slave thread to restrict
# replication to statements where any of the updated tables match the
# specified database and table name patterns.
# [*replicate_wild_ignore_table] - Tells the slave thread not to
# replicate a statement where any table matches the given wildcard pattern.
#
# Actions:
#
Expand All @@ -37,37 +83,57 @@
# }
#
class mysql::config(
$bind_address = $mysql::bind_address,
$config_file = $mysql::config_file,
$datadir = $mysql::datadir,
$tmpdir = $mysql::tmpdir,
$default_engine = $mysql::default_engine,
$etc_root_password = $mysql::etc_root_password,
$manage_config_file = $mysql::manage_config_file,
$max_allowed_packet = $mysql::max_allowed_packet,
$log_error = $mysql::log_error,
$pidfile = $mysql::pidfile,
$port = $mysql::port,
$purge_conf_dir = $mysql::purge_conf_dir,
$max_connections = $mysql::max_connections,
$restart = $mysql::restart,
$root_group = $mysql::root_group,
$root_password = $mysql::root_password,
$old_root_password = $mysql::old_root_password,
$service_name = $mysql::service_name,
$socket = $mysql::socket,
$ssl = $mysql::ssl,
$ssl_ca = $mysql::ssl_ca,
$ssl_cert = $mysql::ssl_cert,
$ssl_key = $mysql::ssl_key
$root_password = $mysql::root_password,
$old_root_password = $mysql::old_root_password,
$bind_address = $mysql::bind_address,
$port = $mysql::port,
$etc_root_password = $mysql::etc_root_password,
$manage_config_file = $mysql::manage_config_file,
$service_name = $mysql::service_name,
$config_file = $mysql::config_file,
$socket = $mysql::socket,
$pidfile = $mysql::pidfile,
$datadir = $mysql::datadir,
$ssl = $mysql::ssl,
$ssl_ca = $mysql::ssl_ca,
$ssl_cert = $mysql::ssl_cert,
$ssl_key = $mysql::ssl_key,
$log_error = $mysql::log_error,
$default_engine = $mysql::default_engine,
$root_group = $mysql::root_group,
$restart = $mysql::restart,
$purge_conf_dir = $mysql::purge_conf_dir,
$key_buffer = $mysql::key_buffer,
$max_allowed_packet = $mysql::max_allowed_packet,
$thread_stack = $mysql::thread_stack,
$thread_cache_size = $mysql::thread_cache_size,
$myisam_recover = $mysql::myisam_recover,
$query_cache_limit = $mysql::query_cache_limit,
$query_cache_size = $mysql::query_cache_size,
$max_binlog_size = $mysql::max_binlog_size,
$expire_logs_days = $mysql::expire_logs_days,
$max_connections = $mysql::max_connections,
$tmp_table_size = 'UNSET',
$max_heap_table_size = 'UNSET',
$table_open_cache = 'UNSET',
$long_query_time = 'UNSET',
$character_set = 'UNSET',
$server_id = 'UNSET',
$sql_log_bin = 'UNSET',
$log_bin = 'UNSET',
$binlog_do_db = 'UNSET',
$log_bin_trust_function_creators = 'UNSET',
$replicate_ignore_table = 'UNSET',
$replicate_wild_do_table = 'UNSET',
$replicate_wild_ignore_table = 'UNSET'
) inherits mysql {

File {
owner => 'root',
group => $root_group,
mode => '0400',
notify => $restart ? {
true => Exec['mysqld-restart'],
notify => $restart ? {
true => Exec['mysqld-restart'],
false => undef,
},
}
Expand Down
8 changes: 8 additions & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
$root_password = 'UNSET'
$restart = true
$ssl = false
$key_buffer = '16M'
$thread_stack = '256K'
$thread_cache_size = 8
$myisam_recover = 'BACKUP'
$query_cache_limit = '1M'
$query_cache_size = '16M'
$expire_logs_days = 10
$max_binlog_size = 100M

case $::operatingsystem {
'Ubuntu': {
Expand Down
128 changes: 101 additions & 27 deletions spec/classes/mysql_config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,37 @@

let :constant_parameter_defaults do
{
:root_password => 'UNSET',
:old_root_password => '',
:max_connections => '151',
:bind_address => '127.0.0.1',
:port => '3306',
:max_allowed_packet => '16M',
:etc_root_password => false,
:datadir => '/var/lib/mysql',
:default_engine => 'UNSET',
:ssl => false,
:root_password => 'UNSET',
:old_root_password => '',
:max_connections => '151',
:bind_address => '127.0.0.1',
:port => '3306',
:etc_root_password => false,
:datadir => '/var/lib/mysql',
:default_engine => 'UNSET',
:ssl => false,
:key_buffer => '16M',
:max_allowed_packet => '16M',
:thread_stack => '256K',
:thread_cache_size => 8,
:myisam_recover => 'BACKUP',
:query_cache_limit => '1M',
:query_cache_size => '16M',
:max_binlog_size => '100M',
:expire_logs_days => 10,
:character_set => 'UNSET',
:tmp_table_size => 'UNSET',
:max_heap_table_size => 'UNSET',
:table_open_cache => 'UNSET',
:long_query_time => 'UNSET',
:server_id => 'UNSET',
:sql_log_bin => 'UNSET',
:log_bin => 'UNSET',
:binlog_do_db => 'UNSET',
:log_bin_trust_function_creators => 'UNSET',
:replicate_ignore_table => 'UNSET',
:replicate_wild_do_table => 'UNSET',
:replicate_wild_ignore_table => 'UNSET'
}
end

Expand Down Expand Up @@ -110,20 +131,29 @@
[
{},
{
:service_name => 'dans_service',
:config_file => '/home/dan/mysql.conf',
:service_name => 'dans_mysql',
:pidfile => '/home/dan/mysql.pid',
:socket => '/home/dan/mysql.sock',
:bind_address => '0.0.0.0',
:port => '3306',
:max_allowed_packet => '32M',
:datadir => '/path/to/datadir',
:default_engine => 'InnoDB',
:ssl => true,
:ssl_ca => '/path/to/cacert.pem',
:ssl_cert => '/path/to/server-cert.pem',
:ssl_key => '/path/to/server-key.pem'
:service_name => 'dans_service',
:config_file => '/home/dan/mysql.conf',
:service_name => 'dans_mysql',
:pidfile => '/home/dan/mysql.pid',
:socket => '/home/dan/mysql.sock',
:bind_address => '0.0.0.0',
:port => '3306',
:datadir => '/path/to/datadir',
:default_engine => 'InnoDB',
:ssl => true,
:ssl_ca => '/path/to/cacert.pem',
:ssl_cert => '/path/to/server-cert.pem',
:ssl_key => '/path/to/server-key.pem',
:key_buffer => '16M',
:max_allowed_packet => '32M',
:thread_stack => '256K',
:query_cache_size => '16M',
:character_set => 'utf8',
:max_connections => 1000,
:tmp_table_size => '4096M',
:max_heap_table_size => '4096M',
:table_open_cache => 2048,
:long_query_time => 0.5
}
].each do |passed_params|

Expand Down Expand Up @@ -174,19 +204,63 @@
it 'should have a template with the correct contents' do
content = param_value(subject, 'file', param_values[:config_file], 'content')
expected_lines = [
"port = #{param_values[:port]}",
"port = #{param_values[:port]}",
"socket = #{param_values[:socket]}",
"pid-file = #{param_values[:pidfile]}",
"datadir = #{param_values[:datadir]}",
"max_connections = #{param_values[:max_connections]}",
"bind-address = #{param_values[:bind_address]}",
"max_allowed_packet = #{param_values[:max_allowed_packet]}"
"bind-address = #{param_values[:bind_address]}",
"key_buffer = #{param_values[:key_buffer]}",
"max_allowed_packet = #{param_values[:max_allowed_packet]}",
"thread_stack = #{param_values[:thread_stack]}",
"thread_cache_size = #{param_values[:thread_cache_size]}",
"myisam-recover = #{param_values[:myisam_recover]}",
"query_cache_limit = #{param_values[:query_cache_limit]}",
"query_cache_size = #{param_values[:query_cache_size]}",
"expire_logs_days = #{param_values[:expire_logs_days]}",
"max_binlog_size = #{param_values[:max_binlog_size]}"
]
if param_values[:tmp_table_size] != 'UNSET'
expected_lines = expected_lines | [ "tmp_table_size = #{param_values[:tmp_table_size]}" ]
end
if param_values[:max_heap_table_size] != 'UNSET'
expected_lines = expected_lines | [ "max_heap_table_size = #{param_values[:max_heap_table_size]}" ]
end
if param_values[:table_open_cache] != 'UNSET'
expected_lines = expected_lines | [ "table_open_cache = #{param_values[:table_open_cache]}" ]
end
if param_values[:long_query_time] != 'UNSET'
expected_lines = expected_lines | [ "long_query_time = #{param_values[:long_query_time]}" ]
end
if param_values[:default_engine] != 'UNSET'
expected_lines = expected_lines | [ "default-storage-engine = #{param_values[:default_engine]}" ]
else
content.should_not match(/^default-storage-engine = /)
end
if param_values[:character_set] != 'UNSET'
expected_lines = expected_lines | [ "character-set-server = #{param_values[:character_set]}" ]
end
if param_values[:sql_log_bin] != 'UNSET'
expected_lines = expected_lines | [ "sql_log_bin = #{param_values[:sql_log_bin]}" ]
end
if param_values[:log_bin] != 'UNSET'
expected_lines = expected_lines | [ "log-bin = #{param_values[:log_bin]}" ]
end
if param_values[:binlog_do_db] != 'UNSET'
expected_lines = expected_lines | [ "binlog-do-db = #{param_values[:binlog_do_db]}" ]
end
if param_values[:log_bin_trust_function_creators] != 'UNSET'
expected_lines = expected_lines | [ "log_bin_trust_function_creators = #{param_values[:log_bin_trust_function_creators]}" ]
end
if param_values[:replicate_ignore_table] != 'UNSET'
expected_lines = expected_lines | [ "replicate-ignore-table = #{param_values[:replicate_ignore_table]}" ]
end
if param_values[:replicate_wild_do_table] != 'UNSET'
expected_lines = expected_lines | [ "replicate-wild-do-table = #{param_values[:replicate_wild_do_table]}" ]
end
if param_values[:replicate_wild_ignore_table] != 'UNSET'
expected_lines = expected_lines | [ "replicate-wild-ignore-table = #{param_values[:replicate_wild_ignore_table]}" ]
end
if param_values[:ssl]
expected_lines = expected_lines |
[
Expand Down
Loading