Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364681 )
Change subject: mariadb: Transform dbstore2002 into multi-instance, drop db1096
......................................................................
mariadb: Transform dbstore2002 into multi-instance, drop db1096
Stop using db1096 and return it to the list of available db hosts
to soon put it into production as core/misc.
Set dbstore2002 as a new multi-instance dbstore with 3 instances.
More instances will be added later.
Bug: T169510
Bug: T169514
Change-Id: Ia3f556e8a78ab0d083a92014101903719080ced2
---
M manifests/site.pp
M modules/role/manifests/mariadb/dbstore_multiinstance.pp
2 files changed, 24 insertions(+), 27 deletions(-)
Approvals:
Marostegui: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 7a6c05b..412b263 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -679,12 +679,6 @@
}
node 'dbstore2002.codfw.wmnet' {
- role(mariadb::dbstore)
- include ::base::firewall
-}
-
-# Temporary test multiinstance role host
-node 'db1096.eqiad.wmnet' {
role(mariadb::dbstore_multiinstance)
}
diff --git a/modules/role/manifests/mariadb/dbstore_multiinstance.pp
b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
index 242b0e7..e51bbf1 100644
--- a/modules/role/manifests/mariadb/dbstore_multiinstance.pp
+++ b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
@@ -8,16 +8,16 @@
#FIXME:
ferm::service { 'dbstore_multiinstance':
proto => 'tcp',
- port => '3311:3317',
+ port => '3311:3320',
srange => '$PRODUCTION_NETWORKS',
}
#TODO: define one group per shard
class {'mariadb::groups':
mysql_group => 'dbstore',
- mysql_shard => 's1',
+ mysql_shard => 's2',
mysql_role => 'slave',
- socket => '/run/mysqld/mysqld.s1.sock',
+ socket => '/run/mysqld/mysqld.s2.sock',
}
class {'mariadb::packages_wmf': }
@@ -47,26 +47,29 @@
group => root,
mode => '0755',
}
- mariadb::instance {'s1':
- port => 3311,
- }
+ #mariadb::instance {'s1':
+ # port => 3311,
+ #}
mariadb::instance {'s2':
port => 3312,
}
- mariadb::instance {'s3':
- port => 3313,
- }
- mariadb::instance {'s4':
- port => 3314,
- }
- mariadb::instance {'s5':
- port => 3315,
- }
- mariadb::instance {'s6':
- port => 3316,
- }
- mariadb::instance {'s7':
- port => 3317,
+ #mariadb::instance {'s3':
+ # port => 3313,
+ #}
+ #mariadb::instance {'s4':
+ # port => 3314,
+ #}
+ #mariadb::instance {'s5':
+ # port => 3315,
+ #}
+ #mariadb::instance {'s6':
+ # port => 3316,
+ #}
+ #mariadb::instance {'s7':
+ # port => 3317,
+ #}
+ mariadb::instance {'x1':
+ port => 3320,
}
class { 'mariadb::monitor_disk':
@@ -75,7 +78,7 @@
}
class { 'mariadb::monitor_process':
- process_count => 7,
+ process_count => 3,
is_critical => false,
contact_group => 'admins',
}
--
To view, visit https://gerrit.wikimedia.org/r/364681
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3f556e8a78ab0d083a92014101903719080ced2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Marostegui <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
