Springle has submitted this change and it was merged.
Change subject: Role for miscellaneous services DBs m[123], but currently only
m3. Reassign db1043 to m3 since it no longer suits s1.
......................................................................
Role for miscellaneous services DBs m[123], but currently only m3.
Reassign db1043 to m3 since it no longer suits s1.
Change-Id: Idacbfb80cb5b69522ddd697d1e541f5403dbf79c
---
M manifests/role/mariadb.pp
M manifests/site.pp
A templates/mariadb/misc.my.cnf.erb
3 files changed, 83 insertions(+), 1 deletion(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index a7c3aa0..3995871 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -9,6 +9,29 @@
include mariadb
}
+# miscellaneous services clusters m[123], but currently only m3
+class role::mariadb::misc {
+
+ system::role { 'role::mariadb::misc':
+ description => 'miscellaneous services database',
+ }
+
+ include standard
+ include mariadb::packages_wmf
+ include passwords::misc::scripts
+
+ class { 'mariadb::config':
+ prompt => 'MISC',
+ config => 'mariadb/misc.my.cnf.erb',
+ password => $passwords::misc::scripts::mysql_root_pass,
+ datadir => '/a/sqldata',
+ tmpdir => '/a/tmp',
+ }
+
+ include mariadb::monitor_disk
+ include mariadb::monitor_process
+}
+
# Beta Cluster Master
# Should add separate role for slaves
class role::mariadb::beta {
diff --git a/manifests/site.pp b/manifests/site.pp
index ff11ca6..1f22f86 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -645,7 +645,7 @@
}
# eqiad dbs
-node /^db10(43|50|51|52|55|56|61|62|65|66)\.eqiad\.wmnet/ {
+node /^db10(50|51|52|55|56|61|62|65|66)\.eqiad\.wmnet/ {
$cluster = 'mysql'
class { 'role::coredb::s1':
innodb_file_per_table => true,
@@ -735,6 +735,12 @@
}
}
+## m3 shard
+node 'db1043.eqiad.wmnet' {
+ $cluster = 'mysql'
+ include role::mariadb::misc
+}
+
## researchdb s1
node 'db1047.eqiad.wmnet' {
$cluster = 'mysql'
diff --git a/templates/mariadb/misc.my.cnf.erb
b/templates/mariadb/misc.my.cnf.erb
new file mode 100644
index 0000000..55522b1
--- /dev/null
+++ b/templates/mariadb/misc.my.cnf.erb
@@ -0,0 +1,53 @@
+# Misc cluster (shards m1, m2, m3)
+
+[client]
+port = 3306
+socket = /tmp/mysql.sock
+
+[mysqld]
+
+log_bin
+log_slave_updates
+skip-external-locking
+skip-name-resolve
+temp-pool
+
+user = mysql
+socket = /tmp/mysql.sock
+port = 3306
+datadir = <%= @datadir %>
+tmpdir = <%= @tmpdir %>
+server_id = <%= @server_id %>
+read_only = 0
+
+max_connections = 500
+max_allowed_packet = 16M
+sync_binlog = 1
+binlog_format = mixed
+expire_logs_days = 14
+connect_timeout = 3
+query_cache_size = 0
+query_cache_type = 0
+event_scheduler = 1
+
+wait_timeout = 3600
+interactive_timeout = 28800
+
+table_open_cache = 5000
+table_definition_cache = 5000
+
+character_set_server = binary
+character_set_filesystem = binary
+collation_server = binary
+
+innodb_file_per_table
+innodb_buffer_pool_size = <%= (Float(@memorysize.split[0]) * 0.75).round %>G
+innodb_log_file_size = 1G
+innodb_flush_method = O_DIRECT
+
+[mysqldump]
+
+quick
+max_allowed_packet = 16M
+
+#!includedir /etc/mysql/conf.d/
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/133202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idacbfb80cb5b69522ddd697d1e541f5403dbf79c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle <sprin...@wikimedia.org>
Gerrit-Reviewer: Springle <sprin...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
