[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad, db-codfw.php: Pool db1096:3315

2017-12-04 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394926 )

Change subject: db-eqiad,db-codfw.php: Pool db1096:3315
..


db-eqiad,db-codfw.php: Pool db1096:3315

db1095 is a multiinstance slave that serves in s5 and s6.
Both replication threads are ready, so start pooling db1096:3315 a bit,
and add db1096:3316 to the config depooled unti it catches up

Bug: T178359
Change-Id: I4554bceba677c95b7395bb0534a10718134d7903
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 12 insertions(+), 4 deletions(-)

Approvals:
  Marostegui: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index b4e11ca..cf0ae4b 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -593,7 +593,8 @@
'db1092' => '10.64.48.151', # do not remove or comment out
'db1093' => '10.64.48.152', # do not remove or comment out
'db1094' => '10.64.48.153', # do not remove or comment out
-   'db1096:3315' => '10.64.0.163', # do not remove or comment out
+   'db1096:3315' => '10.64.0.163:3315', # do not remove or comment out
+   'db1096:3316' => '10.64.0.163:3316', # do not remove or comment out
'db1097:3314' => '10.64.48.11:3314', # do not remove or comment out
'db1097:3315' => '10.64.48.11:3315', # do not remove or comment out
'db1098' => '10.64.16.83', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cc94a40..a953f3d 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -145,7 +145,7 @@
'db1070' => 0,   # D1 2.8TB 160GB, master
'db1051' => 0,   # B3 2.8TB  96GB, vslow, dump in s5
'db1082' => 300, # A2 3.6TB 512GB, api # db1095 master
-   # 'db1096:3315' => 1,   # A6 3.6TB 512GB, watchlist, 
recentchanges, contributions, logpager
+   'db1096:3315' => 1,   # A6 3.6TB 512GB, watchlist, 
recentchanges, contributions, logpager
'db1097:3315' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5
'db1099:3318' => 1,   # B2 3.6TB 512GB, watchlist, 
recentchanges, contributions, logpager #s8
'db1100' => 50,  # C2 3.6TB 512GB, old master #api
@@ -158,6 +158,7 @@
'db1085' => 300, # B3 3.6TB 512GB, api #master for db1102 
(sanitarium 3) - T153743
'db1088' => 500, # C2 3.6TB 512GB
'db1093' => 1, # D2 3.6TB 512GB #temporary recentchanges 
#T178359
+   # 'db1096:3316' => 1,   # A6 3.6TB 512GB, watchlist, 
recentchanges, contributions, logpager
# 'db1098' => 1,   # B5 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T178359
],
's7' => [
@@ -398,12 +399,12 @@
'db1100' => 3,
],
'watchlist' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
'db1099:3318' => 1,
],
'recentchanges' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
'db1099:3318' => 1,
],
@@ -435,18 +436,23 @@
],
'watchlist' => [
'db1093' => 1,
+   # 'db1096:3316' => 1,
],
'recentchanges' => [
'db1093' => 1,
+   # 'db1096:3316' => 1,
],
'recentchangeslinked' => [
'db1093' => 1,
+   # 'db1096:3316' => 1,
],
'contributions' => [
'db1093' => 1,
+   # 'db1096:3316' => 1,
],
'logpager' => [
'db1093' => 1,
+   # 'db1096:3316' => 1,
],
],
's7' => [
@@ -573,6 +579,7 @@
'db1093' => '10.64.48.152', # do not remove or comment out
'db1094' => '10.64.48.153', # do not remove or comment out
'db1096:3315' => '10.64.0.163:3315', # do not remove or comment out
+   'db1096:3316' => '10.64.0.163:3316', # do not remove or comment out
'db1097:3314' => '10.64.48.11:3314', # do not remove or comment out
'db1097:3315' => '10.64.48.11:3315', # do not remove or comment out
'db1098' => '10.64.16.83', # do not remove or comment out

-- 
To view, visit https://gerrit.wikimedia.org/r/394926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4554bceba677c95b7395bb0534a10718134d7903
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad, db-codfw.php: Pool db1096:3315

2017-12-03 Thread Marostegui (Code Review)
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394926 )

Change subject: db-eqiad,db-codfw.php: Pool db1096:3315
..

db-eqiad,db-codfw.php: Pool db1096:3315

db1095 is a multiinstance slave that serves in s5 and s6.
Both replication threads are ready, so start pooling db1096:3315 a bit,
and add db1096:3316 to the config depooled unti it catches up

Bug: T178359
Change-Id: I4554bceba677c95b7395bb0534a10718134d7903
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 12 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/26/394926/1

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index b4e11ca..cf0ae4b 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -593,7 +593,8 @@
'db1092' => '10.64.48.151', # do not remove or comment out
'db1093' => '10.64.48.152', # do not remove or comment out
'db1094' => '10.64.48.153', # do not remove or comment out
-   'db1096:3315' => '10.64.0.163', # do not remove or comment out
+   'db1096:3315' => '10.64.0.163:3315', # do not remove or comment out
+   'db1096:3316' => '10.64.0.163:3316', # do not remove or comment out
'db1097:3314' => '10.64.48.11:3314', # do not remove or comment out
'db1097:3315' => '10.64.48.11:3315', # do not remove or comment out
'db1098' => '10.64.16.83', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cc94a40..a953f3d 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -145,7 +145,7 @@
'db1070' => 0,   # D1 2.8TB 160GB, master
'db1051' => 0,   # B3 2.8TB  96GB, vslow, dump in s5
'db1082' => 300, # A2 3.6TB 512GB, api # db1095 master
-   # 'db1096:3315' => 1,   # A6 3.6TB 512GB, watchlist, 
recentchanges, contributions, logpager
+   'db1096:3315' => 1,   # A6 3.6TB 512GB, watchlist, 
recentchanges, contributions, logpager
'db1097:3315' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5
'db1099:3318' => 1,   # B2 3.6TB 512GB, watchlist, 
recentchanges, contributions, logpager #s8
'db1100' => 50,  # C2 3.6TB 512GB, old master #api
@@ -158,6 +158,7 @@
'db1085' => 300, # B3 3.6TB 512GB, api #master for db1102 
(sanitarium 3) - T153743
'db1088' => 500, # C2 3.6TB 512GB
'db1093' => 1, # D2 3.6TB 512GB #temporary recentchanges 
#T178359
+   # 'db1096:3316' => 1,   # A6 3.6TB 512GB, watchlist, 
recentchanges, contributions, logpager
# 'db1098' => 1,   # B5 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T178359
],
's7' => [
@@ -398,12 +399,12 @@
'db1100' => 3,
],
'watchlist' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
'db1099:3318' => 1,
],
'recentchanges' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
'db1099:3318' => 1,
],
@@ -435,18 +436,23 @@
],
'watchlist' => [
'db1093' => 1,
+   # 'db1096:3316' => 1,
],
'recentchanges' => [
'db1093' => 1,
+   # 'db1096:3316' => 1,
],
'recentchangeslinked' => [
'db1093' => 1,
+   # 'db1096:3316' => 1,
],
'contributions' => [
'db1093' => 1,
+   # 'db1096:3316' => 1,
],
'logpager' => [
'db1093' => 1,
+   # 'db1096:3316' => 1,
],
],
's7' => [
@@ -573,6 +579,7 @@
'db1093' => '10.64.48.152', # do not remove or comment out
'db1094' => '10.64.48.153', # do not remove or comment out
'db1096:3315' => '10.64.0.163:3315', # do not remove or comment out
+   'db1096:3316' => '10.64.0.163:3316', # do not remove or comment out
'db1097:3314' => '10.64.48.11:3314', # do not remove or comment out
'db1097:3315' => '10.64.48.11:3315', # do not remove or comment out
'db1098' => '10.64.16.83', # do not remove or comment out

-- 
To view, visit https://gerrit.wikimedia.org/r/394926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4554bceba677c95b7395bb0534a10718134d7903
Gerrit-PatchSet: 1
Gerrit-Project: