[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad, db-codfw.php: Pool db1105 as rc for s1, s2
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391161 ) Change subject: db-eqiad,db-codfw.php: Pool db1105 as rc for s1,s2 .. db-eqiad,db-codfw.php: Pool db1105 as rc for s1,s2 db1105 is a multi-instance slave that will serve recentchanges service on s1 and s2. Start only with watchlist service for s1 and s2 first to see how it goes and minimize risks. Starting with really low % of traffic for db1103 to minimize risks in case of failure. Bug: T178359 Change-Id: I0b28bee9cd4bc8a63c6c61e42623f0f11cb4fbc8 --- M wmf-config/db-codfw.php M wmf-config/db-eqiad.php 2 files changed, 20 insertions(+), 7 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified Jcrespo: Looks good to me, but someone else must approve diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index af0fa6f..5f67049 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -605,7 +605,8 @@ 'db1103:3312' => '10.64.0.164:3312', # do not remove or comment out 'db1103:3314' => '10.64.0.164:3314', # do not remove or comment out 'db1104' => '10.64.16.85', # do not remove or comment out - 'db1105' => '10.64.32.222', # do not remove or comment out + 'db1105:3311' => '10.64.32.222:3311', # do not remove or comment out + 'db1105:3312' => '10.64.32.222:3312', # do not remove or comment out 'db1106' => '10.64.48.13', # do not remove or comment out 'db2001' => '10.192.0.4', # do not remove or comment out 'db2002' => '10.192.0.5', # do not remove or comment out diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 6c2eaa3..de0a059 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -111,6 +111,7 @@ 'db1080' => 300, # A2 3.6TB 512GB, api 'db1083' => 500, # B1 3.6TB 512GB 'db1089' => 500, # C3 3.6TB 512GB + 'db1105:3311' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 ], 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master @@ -121,6 +122,7 @@ 'db1090' => 500, # C3 3.6TB 512GB 'db1101' => 1, # C2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager, old master 2 'db1103:3312' => 1, # A3 3.6TB 512GB # rc, log: s2 and s4 + 'db1105:3312' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 ], /* s3 */ 'DEFAULT' => [ 'db1075' => 0, # A2 3.6TB 512GB, master @@ -151,7 +153,6 @@ 'db1099' => 1, # B2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager 'db1100' => 1, # C2 3.6TB 512GB, old master # 'db1104' => 100, # B3 3.6TB 512GB - # 'db1105' => 1, # C3 3.6TB 512GB, #DO NOT POOL - going to be multi-instance host #T178359 'db1106' => 300, # D3 3.6TB 512GB ], 's6' => [ @@ -246,24 +247,29 @@ 'groupLoadsBySection' => [ 's1' => [ 'watchlist' => [ - 'db1051' => 1, - 'db1055' => 1, + 'db1051' => 2, + 'db1055' => 2, + 'db1105:3311' => 1, ], 'recentchanges' => [ 'db1051' => 1, 'db1055' => 1, + # 'db1105:3311' => 1, ], 'recentchangeslinked' => [ 'db1051' => 1, 'db1055' => 1, + # 'db1105:3311' => 1, ], 'contributions' => [ 'db1051' => 1, 'db1055' => 1, + # 'db1105:3311' => 1, ], 'logpager' => [ 'db1051' => 1, 'db1055' => 1, + # 'db1105:3311' => 1, ], 'dump' => [ 'db1065' => 1, @@ -289,24 +295,29 @@ 'db1074' => 1, ], 'watchlist' => [ - 'db1101' => 1, - 'db1103:3312' => 1, + 'db1101' => 2, + 'db1103:3312' => 2, + 'db1105:3312' => 1, ], 'recentchanges' => [ 'db1101' => 1, 'db1103:3312' => 1, + # 'db1105:3312' => 1, ], 'recentchangeslinked' => [ 'db1101' => 1, 'db1103:3312' => 1, + # 'db1105:3312' => 1, ], 'contributions' => [ 'db1101' => 1, 'db1103:3312' => 1, +
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad, db-codfw.php: Pool db1105 as rc for s1, s2
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391161 ) Change subject: db-eqiad,db-codfw.php: Pool db1105 as rc for s1,s2 .. db-eqiad,db-codfw.php: Pool db1105 as rc for s1,s2 db1105 is a multi-instance slave that will serve recentchanges service on s1 and s2. Start only with watchlist service for s1 and s2 first to see how it goes and minimize risks. Starting with really low % of traffic for db1103 to minimize risks in case of failure. Bug: T178359 Change-Id: I0b28bee9cd4bc8a63c6c61e42623f0f11cb4fbc8 --- M wmf-config/db-codfw.php M wmf-config/db-eqiad.php 2 files changed, 20 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/61/391161/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index af0fa6f..5f67049 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -605,7 +605,8 @@ 'db1103:3312' => '10.64.0.164:3312', # do not remove or comment out 'db1103:3314' => '10.64.0.164:3314', # do not remove or comment out 'db1104' => '10.64.16.85', # do not remove or comment out - 'db1105' => '10.64.32.222', # do not remove or comment out + 'db1105:3311' => '10.64.32.222:3311', # do not remove or comment out + 'db1105:3312' => '10.64.32.222:3312', # do not remove or comment out 'db1106' => '10.64.48.13', # do not remove or comment out 'db2001' => '10.192.0.4', # do not remove or comment out 'db2002' => '10.192.0.5', # do not remove or comment out diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 6c2eaa3..de0a059 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -111,6 +111,7 @@ 'db1080' => 300, # A2 3.6TB 512GB, api 'db1083' => 500, # B1 3.6TB 512GB 'db1089' => 500, # C3 3.6TB 512GB + 'db1105:3311' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 ], 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master @@ -121,6 +122,7 @@ 'db1090' => 500, # C3 3.6TB 512GB 'db1101' => 1, # C2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager, old master 2 'db1103:3312' => 1, # A3 3.6TB 512GB # rc, log: s2 and s4 + 'db1105:3312' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 ], /* s3 */ 'DEFAULT' => [ 'db1075' => 0, # A2 3.6TB 512GB, master @@ -151,7 +153,6 @@ 'db1099' => 1, # B2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager 'db1100' => 1, # C2 3.6TB 512GB, old master # 'db1104' => 100, # B3 3.6TB 512GB - # 'db1105' => 1, # C3 3.6TB 512GB, #DO NOT POOL - going to be multi-instance host #T178359 'db1106' => 300, # D3 3.6TB 512GB ], 's6' => [ @@ -246,24 +247,29 @@ 'groupLoadsBySection' => [ 's1' => [ 'watchlist' => [ - 'db1051' => 1, - 'db1055' => 1, + 'db1051' => 2, + 'db1055' => 2, + 'db1105:3311' => 1, ], 'recentchanges' => [ 'db1051' => 1, 'db1055' => 1, + # 'db1105:3311' => 1, ], 'recentchangeslinked' => [ 'db1051' => 1, 'db1055' => 1, + # 'db1105:3311' => 1, ], 'contributions' => [ 'db1051' => 1, 'db1055' => 1, + # 'db1105:3311' => 1, ], 'logpager' => [ 'db1051' => 1, 'db1055' => 1, + # 'db1105:3311' => 1, ], 'dump' => [ 'db1065' => 1, @@ -289,24 +295,29 @@ 'db1074' => 1, ], 'watchlist' => [ - 'db1101' => 1, - 'db1103:3312' => 1, + 'db1101' => 2, + 'db1103:3312' => 2, + 'db1105:3312' => 1, ], 'recentchanges' => [ 'db1101' => 1, 'db1103:3312' => 1, + # 'db1105:3312' => 1, ], 'recentchangeslinked' => [ 'db1101' => 1, 'db1103:3312' => 1, + # 'db1105:3312' => 1, ], 'contributions' => [ 'db1101' => 1, 'db1103:3312' => 1, + # 'db1105:3312' => 1, ],
