Jcrespo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/277754
Change subject: Make codfw db masters as the masters of all datacenters
......................................................................
Make codfw db masters as the masters of all datacenters
T124699
Change-Id: Ie183a5a5bcbf6ee8bb15cc7ad4d6bbce0d8f611d
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 33 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/54/277754/1
diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index a767bdb..261b623 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -88,8 +88,7 @@
'sectionLoads' => array(
's1' => array(
-# 'db1052' => 0, # 2.8TB 96GB, master
- 'db2016' => 0, # 2.9TB 96GB, local master
+ 'db2016' => 0, # 2.9TB 96GB, master
'db2034' => 50, # 2.9TB 160GB, rc, log
'db2042' => 50, # 2.9TB 160GB, rc, log
'db2048' => 400, # 2.9TB 160GB
@@ -99,8 +98,7 @@
'db2070' => 500, # 3.3TB 160GB
),
's2' => array(
-# 'db1018' => 0, # 1.4TB 64GB, master
- 'db2017' => 0, # 2.9TB 96GB, local master
+ 'db2017' => 0, # 2.9TB 96GB, master
'db2035' => 50, # 2.9TB 160GB, rc, log
'db2041' => 50, # 2.9TB 160GB, api
'db2049' => 400, # 2.9TB 160GB,
@@ -109,16 +107,14 @@
'db2064' => 500, # 3.3TB 160GB
),
/* s3 */ 'DEFAULT' => array(
-# 'db1038' => 0, # 1.4TB 64GB, master
- 'db2018' => 0, # 2.9TB 96GB, local master
+ 'db2018' => 0, # 2.9TB 96GB, master
'db2036' => 50, # 2.9TB 160GB, rc, log
'db2043' => 100, # 2.9TB 160GB, dump (inactive), vslow
'db2050' => 100, # 2.9TB 160GB, api
'db2057' => 500, # 3.3TB 160GB
),
's4' => array(
-# 'db1040' => 0, # 1.4TB 64GB, master
- 'db2019' => 0, # 2.9TB 96GB, local master
+ 'db2019' => 0, # 2.9TB 96GB, master
'db2037' => 50, # 2.9TB 160GB, rc, log
'db2044' => 50, # 2.9TB 160GB, rc, log
'db2051' => 100, # 2.9TB 160GB, api
@@ -126,8 +122,7 @@
'db2065' => 500, # 3.3TB 160GB
),
's5' => array(
-# 'db1058' => 0, # 2.8TB 96GB, master
- 'db2023' => 0, # 2.9TB 96GB, local master
+ 'db2023' => 0, # 2.9TB 96GB, master
'db2038' => 50, # 2.9TB 160GB, rc, log
'db2045' => 400, # 2.9TB 160GB
'db2052' => 200, # 2.9TB 160GB, dump (inactive), vslow
@@ -135,8 +130,7 @@
'db2066' => 500, # 3.3TB 160GB
),
's6' => array(
-# 'db1023' => 0, # 1.4TB 64GB, master
- 'db2028' => 0, # 2.9TB 96GB, local master
+ 'db2028' => 0, # 2.9TB 96GB, master
'db2039' => 50, # 2.9TB 160GB, rc, log
'db2046' => 400, # 2.9TB 160GB
'db2053' => 200, # 2.9TB 160GB, dump (inactive), vslow
@@ -144,8 +138,7 @@
'db2067' => 500, # 3.3TB 160GB
),
's7' => array(
-# 'db1033' => 0, # 1.4TB 64GB, master
- 'db2029' => 0, # 2.9TB 96GB, local master
+ 'db2029' => 0, # 2.9TB 96GB, master
'db2040' => 100, # 2.9TB 160GB, rc, log
'db2047' => 400, # 2.9TB 160GB
'db2054' => 200, # 2.9TB 160GB, dump (inactive), vslow
@@ -530,22 +523,19 @@
# es2
'cluster24' => array(
-# '10.64.32.184' => 0, # es1015, master
- '10.192.32.130' => 1, # es2015, codfw local master
+ '10.192.32.130' => 1, # es2015, master
'10.192.0.141' => 2, # es2014 - compressed data
'10.192.48.41' => 3, # es2016
),
# es3
'cluster25' => array(
-# '10.64.48.116' => 0, # es1019, master
- '10.192.16.172' => 1, # es2018, codfw local master
+ '10.192.16.172' => 1, # es2018, master
'10.192.0.142' => 3, # es2017
'10.192.48.42' => 3, # es2019
),
# ExtensionStore shard1 - initially for AFTv5
'extension1' => array(
-# '10.64.16.18' => 10, # db1029, master
- '10.192.0.12' => 20, # db2009, local master
+ '10.192.0.12' => 1, # db2009, master
),
),
@@ -593,6 +583,3 @@
'DB://cluster25',
);
-# $wgLBFactoryConf['readOnlyBySection']['s2'] =
-# $wgLBFactoryConf['readOnlyBySection']['s2a'] =
-# 'Emergency maintenance, need more servers up, new estimate ~18:30 UTC';
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index ca0c92f..6b9ab6b 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -88,7 +88,8 @@
'sectionLoads' => array(
's1' => array(
- 'db1052' => 0, # 2.8TB 96GB
+# 'db2016' => 0, # 2.9TB 96GB, master
+ 'db1052' => 0, # 2.8TB 96GB, local master
'db1053' => 0, # 2.8TB 96GB, vslow, dump
'db1051' => 50, # 2.8TB 96GB, watchlist, recentchanges,
contributions, logpager
'db1055' => 50, # 2.8TB 96GB, watchlist, recentchanges,
contributions, logpager
@@ -99,7 +100,8 @@
'db1073' => 500, # 2.8TB 160GB
),
's2' => array(
- 'db1018' => 0, # 1.4TB 64GB, master
+# 'db2017' => 0, # 2.9TB 96GB, master
+ 'db1018' => 0, # 1.4TB 64GB, local master
'db1024' => 100, # 1.4TB 64GB
'db1021' => 0, # 1.4TB 64GB, vslow, dump
'db1036' => 0, # 1.4TB 64GB, watchlist, recentchanges,
contributions, logpager
@@ -109,14 +111,16 @@
'db1067' => 500, # 2.8TB 160GB
),
/* s3 */ 'DEFAULT' => array(
- 'db1038' => 0, # 1.4TB 64GB
+# 'db2018' => 0, # 2.9TB 96GB, master
+ 'db1038' => 0, # 1.4TB 64GB, local master
'db1027' => 0, # 1.4TB 64GB, vslow, dump
'db1015' => 100, # 1.4TB 64GB, watchlist, recentchanges,
contributions, logpager
'db1035' => 500, # 1.4TB 64GB
'db1044' => 500, # 1.4TB 64GB
),
's4' => array(
- 'db1040' => 0, # 1.4TB 64GB
+# 'db2019' => 0, # 2.9TB 96GB, master
+ 'db1040' => 0, # 1.4TB 64GB, local master
'db1042' => 0, # 1.4TB 64GB, vslow, dump
'db1019' => 0, # 1.4TB 64GB, watchlist, recentchanges,
contributions, logpager
'db1056' => 100, # 2.8TB 96GB, api
@@ -125,7 +129,8 @@
'db1068' => 500, # 2.8TB 160GB
),
's5' => array(
- 'db1058' => 0, # 2.8TB 96GB
+# 'db2023' => 0, # 2.9TB 96GB, master
+ 'db1058' => 0, # 2.8TB 96GB, local master
'db1049' => 0, # 2.8TB 64GB, vslow, dump
'db1026' => 0, # 1.4TB 64GB, watchlist, recentchanges,
contributions, logpager
'db1045' => 50, # 1.4TB 64GB, api
@@ -133,7 +138,8 @@
'db1071' => 500, # 2.8TB 160GB
),
's6' => array(
- 'db1023' => 0, # 1.4TB 64GB
+# 'db2028' => 0, # 2.9TB 96GB, master
+ 'db1023' => 0, # 1.4TB 64GB, local master
'db1022' => 100, # 1.4TB 64GB, api
'db1030' => 0, # 1.4TB 64GB, vslow, dump
'db1037' => 0, # 1.4TB 64GB, watchlist, recentchanges,
contributions, logpager
@@ -141,7 +147,8 @@
'db1061' => 500, # 2.8TB 128GB
),
's7' => array(
- 'db1033' => 0, # 1.4TB 64GB,
+# 'db2029' => 0, # 2.9TB 96GB, master
+ 'db1033' => 0, # 1.4TB 64GB, local master
'db1028' => 0, # 1.4TB 64GB, vslow, dump
'db1034' => 0, # 1.4TB 64GB, watchlist, recentchanges,
contributions, logpager
'db1041' => 200, # 1.4TB 64GB
@@ -517,19 +524,22 @@
# es2
'cluster24' => array(
- '10.64.32.184' => 1, # es1015, master
- '10.64.0.6' => 3, # es1011
- '10.64.16.186' => 3, # es1013
+# '10.192.32.130' => 1, # es2015, master
+ '10.64.32.184' => 1, # es1015, local master
+ '10.64.0.6' => 3, # es1011
+ '10.64.16.186' => 3, # es1013
),
# es3
'cluster25' => array(
- '10.64.48.116' => 1, # es1019, master
- '10.64.16.187' => 3, # es1014
+# '10.192.16.172' => 1, # es2018, master
+ '10.64.48.116' => 1, # es1019, local master
+ '10.64.16.187' => 3, # es1014
'10.64.48.114' => 3, # es1017
),
# ExtensionStore shard1 - initially for AFTv5
'extension1' => array(
- '10.64.16.18' => 10, # db1029
+# '10.192.0.12' => 1, # db2009, master
+ '10.64.16.18' => 10, # db1029, local master
'10.64.16.20' => 20, # db1031 snapshot host
),
),
--
To view, visit https://gerrit.wikimedia.org/r/277754
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie183a5a5bcbf6ee8bb15cc7ad4d6bbce0d8f611d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
