jenkins-bot has submitted this change and it was merged.
Change subject: beta: configure db1 on eqiad
......................................................................
beta: configure db1 on eqiad
Sean has created the db1 instance in eqiad and got MariaDB installed and
loaded with some database copies.
Change-Id: I40cc4e8445500cb1db091b7eb325ac39c8d3a12f
---
M wmf-config/db-labs.php
1 file changed, 63 insertions(+), 28 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/db-labs.php b/wmf-config/db-labs.php
index a15c6ce..50638c4 100644
--- a/wmf-config/db-labs.php
+++ b/wmf-config/db-labs.php
@@ -5,41 +5,76 @@
if( $wmfRealm == 'labs' ) { # safe guard
# Database configuration files for the beta labs
- $wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=binary";
+ $wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=binary";
- $wgLBFactoryConf = array(
+ if ( $wmfDatacenter === 'pmtpa' ) {
+ $wgLBFactoryConf = array(
- #Requires 'sectionsByDB', 'sectionLoads', 'serverTemplate'
+ #Requires 'sectionsByDB', 'sectionLoads',
'serverTemplate'
- 'class' => 'LBFactoryMulti',
+ 'class' => 'LBFactoryMulti',
- 'sectionsByDB' => array(
- 'wikidatawiki' => 's2',
- ),
-
- 'sectionLoads' => array(
- 'DEFAULT' => array(
- 'db1' => 0,
+ 'sectionsByDB' => array(
+ 'wikidatawiki' => 's2',
),
- 's2' => array(
- 'db2' => 0,
- )
- ),
- 'serverTemplate' => array(
- 'dbname' => $wgDBname,
- 'user' => $wgDBuser,
- 'password' => $wgDBpassword,
- 'type' => 'mysql',
- 'flags' => DBO_DEFAULT,
- 'max lag' => 30,
- ),
+ 'sectionLoads' => array(
+ 'DEFAULT' => array(
+ 'db1' => 0,
+ ),
+ 's2' => array(
+ 'db2' => 0,
+ )
+ ),
- 'hostsByName' => array(
- 'db1' => '10.4.0.53', # deployment-sql
- 'db2' => '10.4.0.248', # deployment-sql02
- ),
- );
+ 'serverTemplate' => array(
+ 'dbname' => $wgDBname,
+ 'user' => $wgDBuser,
+ 'password' => $wgDBpassword,
+ 'type' => 'mysql',
+ 'flags' => DBO_DEFAULT,
+ 'max lag' => 30,
+ ),
+
+ 'hostsByName' => array(
+ 'db1' => '10.4.0.53', # deployment-sql
+ 'db2' => '10.4.0.248', # deployment-sql02
+ ),
+ );
+
+ } elseif ( $wmfDatacenter === 'eqiad' ) {
+
+ $wgLBFactoryConf = array(
+
+ #Requires 'sectionsByDB', 'sectionLoads',
'serverTemplate'
+
+ 'class' => 'LBFactoryMulti',
+
+ # Everyone to DEFAULT
+ 'sectionsByDB' => array(),
+
+ # eqiad has a single server
+ 'sectionLoads' => array(
+ 'DEFAULT' => array(
+ 'db1' => 0,
+ ),
+ ),
+
+ 'serverTemplate' => array(
+ 'dbname' => $wgDBname,
+ 'user' => $wgDBuser,
+ 'password' => $wgDBpassword,
+ 'type' => 'mysql',
+ 'flags' => DBO_DEFAULT,
+ 'max lag' => 30,
+ ),
+
+ 'hostsByName' => array(
+ 'db1' => '10.68.16.193', #
deployment-db1.eqiad.wmflabs
+ ),
+ );
+
+ }
# No parser cache in beta yet
$wmgParserCacheDBs = array();
--
To view, visit https://gerrit.wikimedia.org/r/121051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40cc4e8445500cb1db091b7eb325ac39c8d3a12f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
