Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/272896
Change subject: Use different my.cnf in labs for analytics-meta instance
......................................................................
Use different my.cnf in labs for analytics-meta instance
Change-Id: Ia1525020e068f95b4baf2d01924c0b4164429da3
---
M modules/role/manifests/analytics_cluster/database/meta.pp
M templates/mariadb/analytics-meta.my.cnf.erb
A templates/mariadb/analytics-meta.my.cnf.production.erb
3 files changed, 57 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/272896/1
diff --git a/modules/role/manifests/analytics_cluster/database/meta.pp
b/modules/role/manifests/analytics_cluster/database/meta.pp
index b991a40..0664c64 100644
--- a/modules/role/manifests/analytics_cluster/database/meta.pp
+++ b/modules/role/manifests/analytics_cluster/database/meta.pp
@@ -12,8 +12,16 @@
# - otto 2015-09-15
#include role::mariadb::monitor
+ $config_template = $::realm ? {
+ # Production instance has large innodb_buffer_pool_size.
+ # Unfortunetly this is not configurable via parameters or
+ # hiera with the mariadb::config class.
+ 'production' => 'mariadb/analytics-meta.my.cnf.production.erb',
+ default => 'mariadb/analytics-meta.my.cnf.erb',
+ }
+
class { 'mariadb::config':
- config => 'mariadb/analytics-meta.my.cnf.erb',
+ config => $config_template,
datadir => '/var/lib/mysql',
require => Class['mariadb::packages_wmf'],
}
diff --git a/templates/mariadb/analytics-meta.my.cnf.erb
b/templates/mariadb/analytics-meta.my.cnf.erb
index c4bccb2..5232d91 100644
--- a/templates/mariadb/analytics-meta.my.cnf.erb
+++ b/templates/mariadb/analytics-meta.my.cnf.erb
@@ -34,8 +34,6 @@
innodb_log_file_size = 50M
innodb_flush_method = O_DIRECT
innodb_flush_log_at_trx_commit = 1
-innodb_buffer_pool_size = 4G
-innodb_buffer_pool_instances = 4
query_cache_type = 1
query_cache_size = 16M
diff --git a/templates/mariadb/analytics-meta.my.cnf.production.erb
b/templates/mariadb/analytics-meta.my.cnf.production.erb
new file mode 100644
index 0000000..c4bccb2
--- /dev/null
+++ b/templates/mariadb/analytics-meta.my.cnf.production.erb
@@ -0,0 +1,48 @@
+# Use for Analytics Cluster misc meta stores (Hive, Oozie, etc.)
+
+[client]
+port = 3306
+socket = /tmp/mysql.sock
+
+[mysqld]
+
+log_error=/var/log/mysql.err
+
+log_bin
+# Hive doesn't work with STATEMENT based binlog.
+# http://stackoverflow.com/questions/19205318/cannot-create-database-with-hive
+binlog_format = ROW
+log_slave_updates
+skip-external-locking
+skip-name-resolve
+temp-pool
+log_basename=analytics-meta
+
+user = mysql
+socket = /tmp/mysql.sock
+port = 3306
+datadir = <%= @datadir %>
+tmpdir = <%= @tmpdir %>
+server_id = <%= @server_id %>
+read_only = <%= (@read_only == 'off' or not @read_only) ? 0 : 1 %>
+
+max_allowed_packet = 64M
+sync_binlog = 0
+expire_logs_days = 7
+
+innodb_file_per_table = 1
+innodb_log_file_size = 50M
+innodb_flush_method = O_DIRECT
+innodb_flush_log_at_trx_commit = 1
+innodb_buffer_pool_size = 4G
+innodb_buffer_pool_instances = 4
+
+query_cache_type = 1
+query_cache_size = 16M
+
+[mysqldump]
+
+quick
+max_allowed_packet = 16M
+
+#!includedir /etc/mysql/conf.d/
--
To view, visit https://gerrit.wikimedia.org/r/272896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1525020e068f95b4baf2d01924c0b4164429da3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
