Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/100357
Change subject: mysql_multi_instance : lint cleanup
......................................................................
mysql_multi_instance : lint cleanup
Change-Id: Id36f8ad8621124fa9751129a53c77c520ed22214
---
M modules/mysql_multi_instance/manifests/config.pp
M modules/mysql_multi_instance/manifests/init.pp
M modules/mysql_multi_instance/manifests/instance.pp
3 files changed, 137 insertions(+), 132 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/100357/1
diff --git a/modules/mysql_multi_instance/manifests/config.pp
b/modules/mysql_multi_instance/manifests/config.pp
index 42087e4..aac32ac 100644
--- a/modules/mysql_multi_instance/manifests/config.pp
+++ b/modules/mysql_multi_instance/manifests/config.pp
@@ -82,21 +82,21 @@
# port = 3300
#
define mysql_multi_instance::config (
- $settings,
+ $settings,
) {
- if is_hash($settings) {
- $content = template('mysql_multi_instance/my.conf.cnf.erb')
- } else {
- $content = $settings
- }
+ if is_hash($settings) {
+ $content = template('mysql_multi_instance/my.conf.cnf.erb')
+ } else {
+ $content = $settings
+ }
- file { "/etc/mysql/${name}":
- ensure => file,
- content => $content,
- owner => 'root',
- group => 'root',
- mode => '0644',
- require => Package['mysql-server'],
- }
+ file { "/etc/mysql/${name}":
+ ensure => file,
+ content => $content,
+ owner => 'root',
+ group => 'root',
+ mode => '0644',
+ require => Package['mysql-server'],
+ }
}
diff --git a/modules/mysql_multi_instance/manifests/init.pp
b/modules/mysql_multi_instance/manifests/init.pp
index 717ba33..08a4818 100644
--- a/modules/mysql_multi_instance/manifests/init.pp
+++ b/modules/mysql_multi_instance/manifests/init.pp
@@ -1,49 +1,55 @@
class mysql_multi_instance {
- file { "/etc/apt/sources.list.d/wikimedia-mariadb.list":
- owner => root,
- group => root,
- mode => 0444,
- source => "puppet:///modules/coredb_mysql/wikimedia-mariadb.list"
- }
- exec { "update_mysql_apt":
- subscribe => File['/etc/apt/sources.list.d/wikimedia-mariadb.list'],
- command => "/usr/bin/apt-get update",
- refreshonly => true;
- }
+ file { '/etc/apt/sources.list.d/wikimedia-mariadb.list':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/coredb_mysql/wikimedia-mariadb.list',
+ }
+ exec { 'update_mysql_apt':
+ subscribe => File['/etc/apt/sources.list.d/wikimedia-mariadb.list'],
+ command => '/usr/bin/apt-get update',
+ refreshonly => true,
+ }
- package { 'mysql-server':
- ensure => present,
- name => "mariadb-server-5.5",
- require => File["/etc/apt/sources.list.d/wikimedia-mariadb.list"];
- }
+ package { 'mysql-server':
+ ensure => present,
+ name => 'mariadb-server-5.5',
+ require => File['/etc/apt/sources.list.d/wikimedia-mariadb.list'],
+ }
- package { ["percona-xtrabackup", "percona-toolkit", "libaio1", "lvm2" ]:
- ensure => latest,
- }
+ package { ['percona-xtrabackup', 'percona-toolkit', 'libaio1', 'lvm2' ]:
+ ensure => latest,
+ }
- generic::systemuser {
- "mysql": name => "mysql", shell => "/bin/sh", home => "/home/mysql"
- }
+ generic::systemuser { 'mysql':
+ shell => '/bin/sh',
+ home => '/home/mysql',
+ }
- file {
- '/a/tmp/':
- owner => mysql,
- group => mysql,
- mode => 0755,
+ file { '/a/tmp/':
ensure => directory,
- require => User["mysql"];
- '/etc/mysql':
+ owner => 'mysql',
+ group => 'mysql',
+ mode => '0755',
+ require => User['mysql'],
+ }
+
+ file { '/etc/mysql':
ensure => directory,
- mode => '0755';
- '/etc/mysql/conf.d':
+ mode => '0755',
+ }
+
+ file { '/etc/mysql/conf.d':
ensure => directory,
- mode => '0755';
- '/root/.my.cnf':
- owner => root,
- group => root,
- mode => 0400,
- content => template("mysql_multi_instance/root.my.cnf.erb");
+ mode => '0755',
+ }
+
+ file { '/root/.my.cnf':
+ owner => 'root',
+ group => 'root',
+ mode => '0400',
+ content => template('mysql_multi_instance/root.my.cnf.erb'),
}
}
diff --git a/modules/mysql_multi_instance/manifests/instance.pp
b/modules/mysql_multi_instance/manifests/instance.pp
index b4a76ab..9e493fd 100644
--- a/modules/mysql_multi_instance/manifests/instance.pp
+++ b/modules/mysql_multi_instance/manifests/instance.pp
@@ -22,7 +22,7 @@
if has_key( $instances[$name], 'binlog_format') {
$binlog_format = $instances[$name]['binlog_format']
}else {
- $binlog_format = "statement"
+ $binlog_format = 'statement'
}
if has_key( $instances[$name], 'log_bin') {
$log_bin = $instances[$name]['log_bin']
@@ -40,47 +40,46 @@
$slave_transaction_retries = 10
}
- $serverid = inline_template("<%= ia = ipaddress.split('.'); server_id =
ia[0] + ia[2] + ia[3] + String($port); server_id %>")
+ $serverid = inline_template("<%= ia = ipaddress.split('.'); server_id =
ia[0] + ia[2] + ia[3] + String(${port}); server_id %>")
include passwords::nagios::mysql
$mysql_check_pass = $passwords::nagios::mysql::mysql_check_pass
include mysql_multi_instance
- file {
- "/a/sqldata.${port}/":
- owner => mysql,
- group => mysql,
- mode => 0755,
- ensure => directory,
- require => User["mysql"];
- "/etc/init.d/mysql-${port}":
- owner => root,
- group => root,
- mode => 0555,
- content => template('mysql_multi_instance/mysql.init.erb');
+ file { "/a/sqldata.${port}/":
+ ensure => directory,
+ owner => 'mysql',
+ group => 'mysql',
+ mode => '0755',
+ require => User['mysql'],
+ }
+ file { "/etc/init.d/mysql-${port}":
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ content => template('mysql_multi_instance/mysql.init.erb'),
}
- service {
- "mysql-${port}":
- enable => true,
+ service { "mysql-${port}":
+ enable => true,
require => File["/etc/init.d/mysql-${port}"],
}
## some per-instance monitoring here
nrpe::monitor_service { "mysql_recent_restart_${port}":
- description => "MySQL Recent Restart Port ${port}",
+ description => "MySQL Recent Restart Port ${port}",
nrpe_command =>
"/usr/lib/nagios/plugins/percona/check_mysql_recent_restart -H localhost -S
/tmp/mysql.${port}.sock -l nagios -p ${mysql_check_pass}"
}
nrpe::monitor_service { "mysql_idle_transaction_${port}":
- description => "MySQL Idle Transactions Port ${port}",
+ description => "MySQL Idle Transactions Port ${port}",
nrpe_command =>
"/usr/lib/nagios/plugins/percona/check_mysql_idle_transactions -H localhost -S
/tmp/mysql.${port}.sock -l nagios -p ${mysql_check_pass}"
}
nrpe::monitor_service { "mysql_slave_delay_${port}":
- description => "MySQL Slave Delay Port ${port}",
+ description => "MySQL Slave Delay Port ${port}",
nrpe_command => "/usr/lib/nagios/plugins/percona/check_mysql_slave_delay
-H localhost -S /tmp/mysql.${port}.sock -l nagios -p ${mysql_check_pass} -w 30
-c 180"
}
nrpe::monitor_service { "mysql_slave_running_${port}":
- description => "MySQL Slave Running Port ${port}",
+ description => "MySQL Slave Running Port ${port}",
nrpe_command =>
"/usr/lib/nagios/plugins/percona/check_mysql_slave_running -H localhost -S
/tmp/mysql.${port}.sock -l nagios -p ${mysql_check_pass} "
}
@@ -92,71 +91,71 @@
},
# FIXME - make threads and io-capacity dynamic
'mysqld' => {
- 'server_id' => $serverid,
- 'read_only' => $read_only,
- 'user' => "mysql",
- 'socket' => "/tmp/mysql.${port}.sock",
- 'port' => $port,
- 'datadir' => "/a/sqldata.${port}/",
- 'tmpdir' => "/a/tmp.${port}/",
- 'query_cache_type' => 0,
- 'log_slow_verbosity' => 'Query_plan',
- 'innodb-adaptive-flushing' => 1,
- 'innodb-buffer-pool-size' => $ram,
- 'innodb_use_native_aio' => 0,
- 'innodb-flush-method' => "O_DIRECT",
- 'innodb-io-capacity' => 1000,
- 'innodb-log-file-size' => $innodb_log_file_size,
- 'innodb-old-blocks-pct' => 80,
- 'innodb-old-blocks-time' => 1000,
- 'innodb-read-io-threads' => 16,
- 'innodb-thread-concurrency' => 0,
- 'innodb-use-sys-malloc' => true,
- 'innodb-write-io-threads' => 8,
- 'innodb-checksums' =>1,
- 'innodb_file_per_table' => true,
+ 'server_id' => $serverid,
+ 'read_only' => $read_only,
+ 'user' => 'mysql',
+ 'socket' => "/tmp/mysql.${port}.sock",
+ 'port' => $port,
+ 'datadir' => "/a/sqldata.${port}/",
+ 'tmpdir' => "/a/tmp.${port}/",
+ 'query_cache_type' => 0,
+ 'log_slow_verbosity' => 'Query_plan',
+ 'innodb-adaptive-flushing' => 1,
+ 'innodb-buffer-pool-size' => $ram,
+ 'innodb_use_native_aio' => 0,
+ 'innodb-flush-method' => 'O_DIRECT',
+ 'innodb-io-capacity' => 1000,
+ 'innodb-log-file-size' => $innodb_log_file_size,
+ 'innodb-old-blocks-pct' => 80,
+ 'innodb-old-blocks-time' => 1000,
+ 'innodb-read-io-threads' => 16,
+ 'innodb-thread-concurrency' => 0,
+ 'innodb-use-sys-malloc' => true,
+ 'innodb-write-io-threads' => 8,
+ 'innodb-checksums' =>1,
+ 'innodb_file_per_table' => true,
'innodb_locks_unsafe_for_binlog' => $innodb_locks_unsafe_for_binlog,
- 'innodb_kill_idle_transaction' => 900,
- 'skip-external-locking' => true,
- 'skip-name-resolve' => true,
- 'key_buffer' => "1024M",
- 'bulk_insert_buffer_size' => "256M",
- 'max_allowed_packet' => "16M",
- 'thread_stack' => "192K",
- 'thread_cache_size' => 300,
- 'max_connections' => 2000,
- 'max_user_connections' => 10,
- 'table_open_cache' => 50000,
- 'table_definition_cache' => 40000,
- 'query_cache_size' => 0,
- 'log_slow_queries' => true,
- 'long_query_time' => 0.45,
- 'log_bin' => $log_bin,
- 'log_slave_updates' => true,
- 'sync_binlog' => 1,
- 'binlog_cache_size' => "1M",
- 'max_binlog_size' => "1000M",
- 'binlog_format' => $binlog_format,
- 'expire_logs_days' => 30,
- 'connect_timeout' => 3,
- 'back_log' => 1000,
- 'max_connect_errors' => 1000000000,
- 'temp-pool' => true,
- 'query_cache_type' => 0,
- 'log_slow_verbosity' => "Query_plan",
- 'optimizer_switch' =>
'\'mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=off\'',
- 'replicate-ignore-db' => $repl_ignore_dbs,
- 'replicate-wild-ignore-table' => $repl_wild_ignore_tables,
- 'slave_transaction_retries' => $slave_transaction_retries,
+ 'innodb_kill_idle_transaction' => 900,
+ 'skip-external-locking' => true,
+ 'skip-name-resolve' => true,
+ 'key_buffer' => '1024M',
+ 'bulk_insert_buffer_size' => '256M',
+ 'max_allowed_packet' => '16M',
+ 'thread_stack' => '192K',
+ 'thread_cache_size' => 300,
+ 'max_connections' => 2000,
+ 'max_user_connections' => 10,
+ 'table_open_cache' => 50000,
+ 'table_definition_cache' => 40000,
+ 'query_cache_size' => 0,
+ 'log_slow_queries' => true,
+ 'long_query_time' => 0.45,
+ 'log_bin' => $log_bin,
+ 'log_slave_updates' => true,
+ 'sync_binlog' => 1,
+ 'binlog_cache_size' => '1M',
+ 'max_binlog_size' => '1000M',
+ 'binlog_format' => $binlog_format,
+ 'expire_logs_days' => 30,
+ 'connect_timeout' => 3,
+ 'back_log' => 1000,
+ 'max_connect_errors' => 1000000000,
+ 'temp-pool' => true,
+ 'query_cache_type' => 0,
+ 'log_slow_verbosity' => 'Query_plan',
+ 'optimizer_switch' =>
'\'mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=off\'',
+ 'replicate-ignore-db' => $repl_ignore_dbs,
+ 'replicate-wild-ignore-table' => $repl_wild_ignore_tables,
+ 'slave_transaction_retries' => $slave_transaction_retries,
},
'mysqldump' => {
- 'quick' => true,
- 'quote-names' => true,
- 'max_allowed_packet' => "16M",
+ 'quick' => true,
+ 'quote-names' => true,
+ 'max_allowed_packet'=> '16M',
},
'mysql' => {},
- 'isamchk' => {
- 'key_buffer' => "16M",
+ 'isamchk' => {
+ 'key_buffer' => '16M',
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/100357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id36f8ad8621124fa9751129a53c77c520ed22214
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
