[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::cache::ssl::unified: move from role, refactor

2017-10-09 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383073 )

Change subject: profile::cache::ssl::unified: move from role, refactor
..

profile::cache::ssl::unified: move from role, refactor

role::cache::ssl::unified had a big if $realm guard; refactor it to be slightly 
more general
by making the if guards depending on the features we want to enable.

While this refactoring is far from complete, it lays the path to have SSL 
monitoring in beta as well.

Change-Id: Ib34c2373659d12b16753a142c2eb6265441d9be7
---
M hieradata/labs.yaml
M hieradata/role/common/cache/canary.yaml
M hieradata/role/common/cache/misc.yaml
M hieradata/role/common/cache/text.yaml
M hieradata/role/common/cache/upload.yaml
M modules/profile/manifests/cache/base.pp
R modules/profile/manifests/cache/ssl/unified.pp
M modules/role/manifests/cache/misc.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
10 files changed, 80 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/383073/1

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 423c9c2..99de41f 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -60,6 +60,12 @@
 profile::cache::base::zero_site: 'https://zero.wikimedia.beta.wmflabs.org'
 profile::cache::base::purge_host_only_upload_re: 
'^(upload|maps)\.beta\.wmflabs\.org$'
 profile::cache::base::purge_host_not_upload_re: 
'^(?!(upload|maps)\.beta\.wmflabs\.org)'
+# Profile::cache::ssl::unified
+profile::cache::ssl::unified::monitoring: false
+profile::cache::ssl::unified::letsencrypt: true
+profile::cache::ssl::unified::le_server_name: 'beta.wmflabs.org'
+profile::cache::ssl::unified::le_subjects: ['beta.wmflabs.org']
+
 role::cache::upload::upload_domain: 'upload.beta.wmflabs.org'
 role::cache::upload::maps_domain: 'maps.beta.wmflabs.org'
 role::cache::text::static_host: 'deployment.wikimedia.beta.wmflabs.org'
diff --git a/hieradata/role/common/cache/canary.yaml 
b/hieradata/role/common/cache/canary.yaml
index af9af16..3f38c01 100644
--- a/hieradata/role/common/cache/canary.yaml
+++ b/hieradata/role/common/cache/canary.yaml
@@ -81,3 +81,6 @@
 profile::cache::base::purge_host_only_upload_re: 
'^(upload|maps)\.wikimedia\.org$'
 profile::cache::base::purge_host_not_upload_re: 
'^(?!(upload|maps)\.wikimedia\.org)'
 profile::cache::base::storage_parts: ['sda3', 'sdb3']
+# Profile::cache::ssl::unified
+profile::cache::ssl::unified::monitoring: true
+profile::cache::ssl::unified::letsencrypt: false
diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index 46c4dd5..179b7f6 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -280,3 +280,6 @@
 profile::cache::base::purge_host_only_upload_re: 
'^(upload|maps)\.wikimedia\.org$'
 profile::cache::base::purge_host_not_upload_re: 
'^(?!(upload|maps)\.wikimedia\.org)'
 profile::cache::base::storage_parts: ['sda3', 'sdb3']
+# Profile::cache::ssl::unified
+profile::cache::ssl::unified::monitoring: true
+profile::cache::ssl::unified::letsencrypt: false
diff --git a/hieradata/role/common/cache/text.yaml 
b/hieradata/role/common/cache/text.yaml
index eb2c805..6fc0b46 100644
--- a/hieradata/role/common/cache/text.yaml
+++ b/hieradata/role/common/cache/text.yaml
@@ -88,3 +88,6 @@
 profile::cache::base::purge_host_only_upload_re: 
'^(upload|maps)\.wikimedia\.org$'
 profile::cache::base::purge_host_not_upload_re: 
'^(?!(upload|maps)\.wikimedia\.org)'
 profile::cache::base::storage_parts: ['sda3', 'sdb3']
+# Profile::cache::ssl::unified
+profile::cache::ssl::unified::monitoring: true
+profile::cache::ssl::unified::letsencrypt: false
diff --git a/hieradata/role/common/cache/upload.yaml 
b/hieradata/role/common/cache/upload.yaml
index d154fcb..8a42003 100644
--- a/hieradata/role/common/cache/upload.yaml
+++ b/hieradata/role/common/cache/upload.yaml
@@ -57,3 +57,6 @@
 profile::cache::base::purge_host_only_upload_re: 
'^(upload|maps)\.wikimedia\.org$'
 profile::cache::base::purge_host_not_upload_re: 
'^(?!(upload|maps)\.wikimedia\.org)'
 profile::cache::base::storage_parts: ['sda3', 'sdb3']
+# Profile::cache::ssl::unified
+profile::cache::ssl::unified::monitoring: true
+profile::cache::ssl::unified::letsencrypt: false
diff --git a/modules/profile/manifests/cache/base.pp 
b/modules/profile/manifests/cache/base.pp
index 1df5db5..5994e0e 100644
--- a/modules/profile/manifests/cache/base.pp
+++ b/modules/profile/manifests/cache/base.pp
@@ -27,6 +27,8 @@
 require ::profile::conftool::client
 require ::profile::cache::kafka::webrequest
 require ::profile::prometheus::varnish_exporter
+require ::profile::cache::ssl::unified
+
 include ::role::lvs::realserver
 require ::standard
 
@@ -34,10 +36,14 @@
 
 class { 'conftool::scripts': }
 
+# TLS termination
+
+
+
+# TODO: Spin off a

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Special:UserLogin: Align text to WikimediaUI color palette

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

Change subject: Special:UserLogin: Align text to WikimediaUI color palette
..


Special:UserLogin: Align text to WikimediaUI color palette

Also removing unnecessary CSS `top` property.

Bug: T152025
Change-Id: I8945b7c610691de63eaadc465036833d851d1953
---
M resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git 
a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css 
b/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css
index 19aee1e..29006b7 100644
--- a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css
+++ b/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css
@@ -41,10 +41,9 @@
  * Needs an ID so that it's more specific than Vector's div#content h3.
  */
 #bodyContent div.mw-number-text h3 {
-   top: 0;
+   color: #222;
margin: 0;
padding: 0;
-   color: #252525;
font-family: 'Linux Libertine', 'Georgia', 'Times', serif;
font-weight: normal;
font-size: 2.2em;
@@ -52,7 +51,7 @@
text-align: center;
 }
 
-/* Contains a number and explanatory text, with space for an icon */
+/* Contains a “headlined” number and explanatory text, with space for an icon 
*/
 div.mw-number-text {
display: block;
font-size: 1.2em;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8945b7c610691de63eaadc465036833d851d1953
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] analytics/wikistats2[master]: Use B instead of G to represent billion in the detail page

2017-10-09 Thread Fdans (Code Review) 
Fdans has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383071 )

Change subject: Use B instead of G to represent billion in the detail page
..

Use B instead of G to represent billion in the detail page

Until now the axes in the detail page were showing G as the
suffix for billion (giga). Replacing it with B makes is clearer to
non-techy folks. When we start working with internationalisation we'll have
to rethink this strategy, as billion doesn't mean the same in every country.

Bug: T170940
Change-Id: I745c2f0a4f38c5cb90e1b2fd2f345df13b3f91e0
---
M src/components/detail/chart/BarChart.vue
M src/components/detail/chart/LineChart.vue
M src/utils.js
3 files changed, 17 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikistats2 
refs/changes/71/383071/1

diff --git a/src/components/detail/chart/BarChart.vue 
b/src/components/detail/chart/BarChart.vue
index d07cd15..ba5f478 100644
--- a/src/components/detail/chart/BarChart.vue
+++ b/src/components/detail/chart/BarChart.vue
@@ -11,6 +11,7 @@
 import * as format from 'd3-format';
 import * as time from 'd3-time';
 import _ from 'lodash';
+import utils from '../../../utils';
 
 import config from '../../../config';
 
@@ -73,7 +74,7 @@
 let y = scales.scaleLinear().range([height, 0]);
 y.domain([0, max]);
 const yAxis = axes.axisLeft(y).ticks(7)
-.tickFormat(format.format('.2s'));
+.tickFormat(utils.modifiedSIFormat);
 const yAxisContainer = g.append('g')
 .call(yAxis)
 .style('font-size', '13px')
diff --git a/src/components/detail/chart/LineChart.vue 
b/src/components/detail/chart/LineChart.vue
index a2dcb39..c9f46cb 100644
--- a/src/components/detail/chart/LineChart.vue
+++ b/src/components/detail/chart/LineChart.vue
@@ -25,11 +25,11 @@
 import * as scales from 'd3-scale'
 import * as arr from 'd3-array'
 import * as axes from 'd3-axis'
-import * as format from 'd3-format'
 import * as time from 'd3-time'
 import * as shape from 'd3-shape'
 
 import dateformat from 'dateformat';
+import utils from '../../../utils';
 
 import _ from 'lodash';
 
@@ -202,7 +202,7 @@
 const height = y.range()[0];
 const xAxis = axes.axisBottom(x),
   yAxis = axes.axisLeft(y).ticks(7)
-.tickFormat(format.format('.2s'));
+.tickFormat(utils.modifiedSIFormat);
 g.append('g')
 .call(yAxis)
 .attr('class', 'yAxis')
diff --git a/src/utils.js b/src/utils.js
index cd7f695..a9106b1 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,3 +1,5 @@
+import * as format from 'd3-format'
+
 function labeledCrossProduct (obj) {
 let explodedKeys = Object.keys(obj).map(k => obj[k].map(o => {
 let keyed = {};
@@ -12,6 +14,17 @@
 }, [{}]);
 };
 
+const formatSi = format.format(".2s");
+
+function modifiedSI(x) {
+var s = formatSi(x);
+switch (s[s.length - 1]) {
+case "G": return s.slice(0, -1) + "B";
+}
+return s;
+}
+
 export default {
 labeledCrossProduct,
+modifiedSIFormat
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I745c2f0a4f38c5cb90e1b2fd2f345df13b3f91e0
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikistats2
Gerrit-Branch: master
Gerrit-Owner: Fdans 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Install python-dateutils via puppet

2017-10-09 Thread Muehlenhoff (Code Review) 
Muehlenhoff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382707 )

Change subject: Install python-dateutils via puppet
..


Install python-dateutils via puppet

apt-upgrade-activity already required python-dateutil, but it was
previously installed fleet-wide as a reverse dependency of salt-minion,
so it was missed to declare an explicit dependency.

This made apt-upgrade-activity fail on all recently installed hosts
and those where "apt-get autoremove" was used (like cp, lvs hosts).

Change-Id: I3032bd96ace5b3bf25785dad6a774f47c804ea41
---
M modules/base/manifests/debdeploy.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Muehlenhoff: Looks good to me, approved
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Volans: Looks good to me, but someone else must approve



diff --git a/modules/base/manifests/debdeploy.pp 
b/modules/base/manifests/debdeploy.pp
index 532716a..55022de 100644
--- a/modules/base/manifests/debdeploy.pp
+++ b/modules/base/manifests/debdeploy.pp
@@ -13,5 +13,5 @@
 mode   => '0555',
 }
 
-require_package('debdeploy-client')
+require_package('debdeploy-client', 'python-dateutil')
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3032bd96ace5b3bf25785dad6a774f47c804ea41
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad, db-codfw.php: Add db2079 the config

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

Change subject: db-eqiad,db-codfw.php: Add db2079 the config
..


db-eqiad,db-codfw.php: Add db2079 the config

db2079 is being cloned from db2075 and will serve in s5 and later in s8.
Add it depooled to the config for now.

Bug: T170662
Change-Id: I10df8ed96bb9f92ee33801b13c20c20fcce4346e
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 3 insertions(+), 0 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 280d5b9..8172e69 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -146,6 +146,7 @@
'db2059' => 100, # D6 3.3TB 160GB, api
'db2066' => 400, # D6 3.3TB 160GB
# 'db2075' => 400, # A1 3.3TB 512GB # Compressed InnoDB #T170662
+   # 'db2079' => 400, # A5 3.3TB 512GB # Compressed InnoDB #T170662
],
's6' => [
'db2028' => 0,   # B6  2.9TB  96GB, master
@@ -581,6 +582,7 @@
'db2075' => '10.192.0.5', # do not remove or comment out
'db2076' => '10.192.16.38', # do not remove or comment out
'db2077' => '10.192.32.168', # do not remove or comment out
+   'db2079' => '10.192.0.6', # do not remove or comment out
'virt1000' => '208.80.154.18', # do not remove or comment out
'silver' => '208.80.154.136', # do not remove or comment out
'labtestweb2001' => '208.80.153.14', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 91752c2..74c388d 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -592,6 +592,7 @@
'db2075' => '10.192.0.5', # do not remove or comment out
'db2076' => '10.192.16.38', # do not remove or comment out
'db2077' => '10.192.32.168', # do not remove or comment out
+   'db2079' => '10.192.0.6', # do not remove or comment out
'virt1000' => '208.80.154.18', # do not remove or comment out
'silver' => '208.80.154.136', # do not remove or comment out
'labtestweb2001' => '208.80.153.14', # do not remove or comment out

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I10df8ed96bb9f92ee33801b13c20c20fcce4346e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad, db-codfw.php: Add db2079 the config

2017-10-09 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383070 )

Change subject: db-eqiad,db-codfw.php: Add db2079 the config
..

db-eqiad,db-codfw.php: Add db2079 the config

db2079 is being cloned from db2075 and will serve in s5 and later in s8.
Add it depooled to the config for now.

Bug: T170662
Change-Id: I10df8ed96bb9f92ee33801b13c20c20fcce4346e
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 280d5b9..8172e69 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -146,6 +146,7 @@
'db2059' => 100, # D6 3.3TB 160GB, api
'db2066' => 400, # D6 3.3TB 160GB
# 'db2075' => 400, # A1 3.3TB 512GB # Compressed InnoDB #T170662
+   # 'db2079' => 400, # A5 3.3TB 512GB # Compressed InnoDB #T170662
],
's6' => [
'db2028' => 0,   # B6  2.9TB  96GB, master
@@ -581,6 +582,7 @@
'db2075' => '10.192.0.5', # do not remove or comment out
'db2076' => '10.192.16.38', # do not remove or comment out
'db2077' => '10.192.32.168', # do not remove or comment out
+   'db2079' => '10.192.0.6', # do not remove or comment out
'virt1000' => '208.80.154.18', # do not remove or comment out
'silver' => '208.80.154.136', # do not remove or comment out
'labtestweb2001' => '208.80.153.14', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 91752c2..74c388d 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -592,6 +592,7 @@
'db2075' => '10.192.0.5', # do not remove or comment out
'db2076' => '10.192.16.38', # do not remove or comment out
'db2077' => '10.192.32.168', # do not remove or comment out
+   'db2079' => '10.192.0.6', # do not remove or comment out
'virt1000' => '208.80.154.18', # do not remove or comment out
'silver' => '208.80.154.136', # do not remove or comment out
'labtestweb2001' => '208.80.153.14', # do not remove or comment out

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10df8ed96bb9f92ee33801b13c20c20fcce4346e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Add Sam0410 to the CI whitelist

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

Change subject: Add Sam0410 to the CI whitelist
..


Add Sam0410 to the CI whitelist

Change-Id: Ibd159a1453c8fd0cf05d05d814833754bb4807c2
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 78ee11a..8358415 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -210,6 +210,7 @@
 | sam@samwilson\.id\.au
 | sam@tntnet\.uk
 | samanthanguyen1116@gmail\.com
+| samikshya\.chand\.ece15@iitbhu\.ac\.in
 | santhosh\.thottingal@gmail\.com
 | saper@saper\.info
 | se4598@gmx\.de
@@ -542,6 +543,7 @@
- ^elaarad@gmail\.com$ # Foxy brown
- ^smarita\.sharma2015@vit\.ac\.in$
- ^gneha21@yahoo\.in$
+   - ^samikshya\.chand\.ece15@iitbhu\.ac\.in$
 
   # Bots
- ^tools\.libraryupgrader@tools\.wmflabs\.org$ # Run by Legoktm

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd159a1453c8fd0cf05d05d814833754bb4807c2
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Sam0410 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/software[master]: s5.hosts: Add db2079

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

Change subject: s5.hosts: Add db2079
..


s5.hosts: Add db2079

db2079 is going to be cloned from db2075 and will serve on s5 and later
on s8.

Bug: T170662
Change-Id: I84e611e4c2c68637b91d26e1a7492fd6ffd2a6a8
---
M dbtools/s5.hosts
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/dbtools/s5.hosts b/dbtools/s5.hosts
index 37b86bc..6f9da5c 100644
--- a/dbtools/s5.hosts
+++ b/dbtools/s5.hosts
@@ -1,4 +1,5 @@
 dbstore2001.codfw.wmnet3315
+db2079.codfw.wmnet 3306
 db2075.codfw.wmnet 3306
 db2038.codfw.wmnet 3306
 db2045.codfw.wmnet 3306

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84e611e4c2c68637b91d26e1a7492fd6ffd2a6a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Depool db2075

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

Change subject: db-codfw.php: Depool db2075
..


db-codfw.php: Depool db2075

db2075 is going to be used to clone db2079

Bug: T170662
Change-Id: Id5f7b35fcd75c33a9232ed4cff83833ee374590f
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)

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 4c333b1..280d5b9 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -145,7 +145,7 @@
'db2052' => 50,  # D6 2.9TB 160GB, dump (inactive), vslow
'db2059' => 100, # D6 3.3TB 160GB, api
'db2066' => 400, # D6 3.3TB 160GB
-   'db2075' => 400, # A1 3.3TB 512GB # Compressed InnoDB
+   # 'db2075' => 400, # A1 3.3TB 512GB # Compressed InnoDB #T170662
],
's6' => [
'db2028' => 0,   # B6  2.9TB  96GB, master

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5f7b35fcd75c33a9232ed4cff83833ee374590f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/software[master]: s5.hosts: Add db2079

2017-10-09 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383069 )

Change subject: s5.hosts: Add db2079
..

s5.hosts: Add db2079

db2079 is going to be cloned from db2075 and will serve on s5 and later
on s8.

Bug: T170662
Change-Id: I84e611e4c2c68637b91d26e1a7492fd6ffd2a6a8
---
M dbtools/s5.hosts
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/69/383069/1

diff --git a/dbtools/s5.hosts b/dbtools/s5.hosts
index 37b86bc..6f9da5c 100644
--- a/dbtools/s5.hosts
+++ b/dbtools/s5.hosts
@@ -1,4 +1,5 @@
 dbstore2001.codfw.wmnet3315
+db2079.codfw.wmnet 3306
 db2075.codfw.wmnet 3306
 db2038.codfw.wmnet 3306
 db2045.codfw.wmnet 3306

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84e611e4c2c68637b91d26e1a7492fd6ffd2a6a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Depool db2075

2017-10-09 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383068 )

Change subject: db-codfw.php: Depool db2075
..

db-codfw.php: Depool db2075

db2075 is going to be used to clone db2079

Bug: T170662
Change-Id: Id5f7b35fcd75c33a9232ed4cff83833ee374590f
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 4c333b1..280d5b9 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -145,7 +145,7 @@
'db2052' => 50,  # D6 2.9TB 160GB, dump (inactive), vslow
'db2059' => 100, # D6 3.3TB 160GB, api
'db2066' => 400, # D6 3.3TB 160GB
-   'db2075' => 400, # A1 3.3TB 512GB # Compressed InnoDB
+   # 'db2075' => 400, # A1 3.3TB 512GB # Compressed InnoDB #T170662
],
's6' => [
'db2028' => 0,   # B6  2.9TB  96GB, master

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5f7b35fcd75c33a9232ed4cff83833ee374590f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Provision db2079 into s5

2017-10-09 Thread Marostegui (Code Review) 
Marostegui has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383062 )

Change subject: mariadb: Provision db2079 into s5
..


mariadb: Provision db2079 into s5

db2079 will serve in s5 and later s8

Bug: T170662
Change-Id: Iea42b692d22956958e2a9e5243708f0f9847c1f4
---
A hieradata/hosts/db2079.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_codfw.yaml
3 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/db2079.yaml b/hieradata/hosts/db2079.yaml
new file mode 100644
index 000..0ea867a
--- /dev/null
+++ b/hieradata/hosts/db2079.yaml
@@ -0,0 +1,2 @@
+mariadb::shard: 's5'
+profile::base::notifications_enabled: '0'
diff --git a/manifests/site.pp b/manifests/site.pp
index 47df907..954b2ba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -467,7 +467,7 @@
 role(mariadb::core)
 }
 
-node /^db20(38|45|52|59|66|75)\.codfw\.wmnet/ {
+node /^db20(38|45|52|59|66|75|79)\.codfw\.wmnet/ {
 role(mariadb::core)
 }
 
diff --git a/modules/role/files/prometheus/mysql-core_codfw.yaml 
b/modules/role/files/prometheus/mysql-core_codfw.yaml
index 4c71560..3323cf5 100644
--- a/modules/role/files/prometheus/mysql-core_codfw.yaml
+++ b/modules/role/files/prometheus/mysql-core_codfw.yaml
@@ -74,6 +74,7 @@
   - db2059:9104
   - db2066:9104
   - db2075:9104
+  - db2079:9104
 - labels:
 shard: s5
 role: master

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea42b692d22956958e2a9e5243708f0f9847c1f4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Provision db2079 into s5

2017-10-09 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383062 )

Change subject: mariadb: Provision db2079 into s5
..

mariadb: Provision db2079 into s5

db2079 will serve in s5 and later s8

Bug: T170662
Change-Id: Iea42b692d22956958e2a9e5243708f0f9847c1f4
---
A hieradata/hosts/db2079.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_codfw.yaml
3 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/383062/1

diff --git a/hieradata/hosts/db2079.yaml b/hieradata/hosts/db2079.yaml
new file mode 100644
index 000..0d8bce2
--- /dev/null
+++ b/hieradata/hosts/db2079.yaml
@@ -0,0 +1 @@
+mariadb::shard: 's5'
diff --git a/manifests/site.pp b/manifests/site.pp
index 47df907..954b2ba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -467,7 +467,7 @@
 role(mariadb::core)
 }
 
-node /^db20(38|45|52|59|66|75)\.codfw\.wmnet/ {
+node /^db20(38|45|52|59|66|75|79)\.codfw\.wmnet/ {
 role(mariadb::core)
 }
 
diff --git a/modules/role/files/prometheus/mysql-core_codfw.yaml 
b/modules/role/files/prometheus/mysql-core_codfw.yaml
index 4c71560..3323cf5 100644
--- a/modules/role/files/prometheus/mysql-core_codfw.yaml
+++ b/modules/role/files/prometheus/mysql-core_codfw.yaml
@@ -74,6 +74,7 @@
   - db2059:9104
   - db2066:9104
   - db2075:9104
+  - db2079:9104
 - labels:
 shard: s5
 role: master

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea42b692d22956958e2a9e5243708f0f9847c1f4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Revert "Dont register simulate page when not enabled as a BF"

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

Change subject: Revert "Dont register simulate page when not enabled as a BF"
..


Revert "Dont register simulate page when not enabled as a BF"

Conditionally registering a special page based on a user preference
breaks the entire preferences system.

This reverts commit 4847d76b6601eb5cf231e82916aa4bdfd6e3abd7.

Bug: T177524
Change-Id: I51a4f90d266e773cf5057d2d0701187c317e32b5
---
M extension.json
M includes/TwoColConflictHooks.php
M 
tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
3 files changed, 4 insertions(+), 36 deletions(-)

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



diff --git a/extension.json b/extension.json
index 3ec4b51..6e465c7 100644
--- a/extension.json
+++ b/extension.json
@@ -40,9 +40,6 @@
"EditPage::attemptSave:after": [
"TwoColConflictHooks::onAttemptSaveAfter"
],
-   "SpecialPage_initList": [
-   "TwoColConflictHooks::onSpecialPage_initList"
-   ],
"ResourceLoaderTestModules": [
"TwoColConflictHooks::onResourceLoaderTestModules"
]
@@ -194,5 +191,8 @@
"ResourceFileModulePaths": {
"localBasePath": "",
"remoteExtPath": "TwoColConflict"
+   },
+   "SpecialPages": {
+   "SimulateTwoColEditConflict": "SpecialConflictTestPage"
}
 }
diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index c53460b..37fd439 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -103,36 +103,4 @@
 
return true;
}
-
-   /**
-* @param array &$aSpecialPages
-*
-* @return bool
-*/
-   public static function onSpecialPage_initList( &$aSpecialPages ) {
-   if ( defined( 'MW_NO_SESSION' ) ) {
-   return true;
-   }
-
-   $user = RequestContext::getMain()->getUser();
-   $config = MediaWikiServices::getInstance()->getMainConfig();
-
-   /**
-* If this extension is configured to be a beta feature, and 
the BetaFeatures extension
-* is loaded then require the current user to have the feature 
enabled.
-*/
-   if (
-   $config->get( 'TwoColConflictBetaFeature' ) &&
-   class_exists( BetaFeatures::class ) &&
-   $user instanceof User &&
-   !BetaFeatures::isFeatureEnabled( $user, 
'twocolconflict' )
-   ) {
-   return true;
-   }
-
-   $aSpecialPages['SimulateTwoColEditConflict'] = 
'SpecialConflictTestPage';
-
-   return true;
-   }
-
 }
diff --git 
a/tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
 
b/tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
index 1df4f36..b5370e8 100644
--- 
a/tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
+++ 
b/tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
@@ -219,7 +219,7 @@
$this->assertTrue( true );
}
 
-   public function testNoPageWhenBetaFeatureAndNoUser() {
+   public function testNoOutputWhenBetaFeatureAndNoUser() {
$this->setMwGlobals( 'wgTwoColConflictBetaFeature', true );
 
list( $html, $response ) = $this->executeSpecialPage();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I51a4f90d266e773cf5057d2d0701187c317e32b5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] translatewiki[master]: Switch osm website to GitHub per their request

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

Change subject: Switch osm website to GitHub per their request
..


Switch osm website to GitHub per their request

Change-Id: I2e7129324d9719507e7626b5954d1cabf5e99377
---
M repoconfig.commit.json
M repoconfig.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index 52b4dad..896b353 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -323,7 +323,7 @@
"repos": {
"osm": {
"type": "github",
-   "url": 
"ssh://translatew...@git.openstreetmap.org/var/lib/git/rails.git"
+   "url": 
"g...@github.com:openstreetmap/openstreetmap-website.git"
},
"potlatch2": {
"type": "github",
diff --git a/repoconfig.json b/repoconfig.json
index e8af3ea..3e34ddb 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -322,7 +322,7 @@
"repos": {
"osm": {
"type": "github",
-   "url": "git://git.openstreetmap.org/rails.git"
+   "url": 
"https://github.com/openstreetmap/openstreetmap-website.git;
},
"potlatch2": {
"type": "github",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e7129324d9719507e7626b5954d1cabf5e99377
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Improve board_text AbuseFilter variable description to match...

2017-10-09 Thread Mattflaschen (Code Review) 
Mattflaschen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383060 )

Change subject: Improve board_text AbuseFilter variable description to match 
std AF
..

Improve board_text AbuseFilter variable description to match std AF

The standard AF version ofthis is article_text, which is
"Page title (without namespace)"

Change-Id: I8bc1df29d3abff59cd4401b744670d31d135c779
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/60/383060/1

diff --git a/i18n/en.json b/i18n/en.json
index d50ab87..a26c21b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -46,7 +46,7 @@
"logentry-import-lqt-to-flow-topic": "[[$1|$2]] on [[$3]] was imported 
from LiquidThreads to Structured Discussions",
"abusefilter-edit-builder-vars-board-articleid": "Page ID of Structured 
Discussions board",
"abusefilter-edit-builder-vars-board-namespace": "Namespace of 
Structured Discussions board",
-   "abusefilter-edit-builder-vars-board-text": "Title of Structured 
Discussions board",
+   "abusefilter-edit-builder-vars-board-text": "Title (without namespace) 
of Structured Discussions board",
"abusefilter-edit-builder-vars-board-prefixedtext": "Full title of 
Structured Discussions board",
"flow-user-moderated": "Moderated user",
"flow-board-header-browse-topics-link": "Browse topics",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bc1df29d3abff59cd4401b744670d31d135c779
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1096

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

Change subject: db-eqiad.php: Depool db1096
..


db-eqiad.php: Depool db1096

Going to optimize pagelinks and templatelinks

Bug: T174509
Change-Id: Ic1868dab85deb09b4e9822fc48365c74e33d9375
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 54e55ea..91752c2 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -147,7 +147,7 @@
'db1082' => 300, # A2 3.6TB 512GB, api
'db1087' => 500, # C2 3.6TB 512GB
'db1092' => 500, # D2 3.6TB 512GB
-   'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
+   # 'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T174509
'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
# 'db1100' => 1,   # C2 3.6TB 512GB, old master, crashed
# 'db1104' => 100,  # B3 3.6TB 512GB # Cloning db1106
@@ -372,23 +372,23 @@
'db1082' => 1,
],
'watchlist' => [
-   'db1096' => 1,
+   # 'db1096' => 1,
'db1099' => 1,
],
'recentchanges' => [
-   'db1096' => 1,
+   # 'db1096' => 1,
'db1099' => 1,
],
'recentchangeslinked' => [
-   'db1096' => 1,
+   # 'db1096' => 1,
'db1099' => 1,
],
'contributions' => [
-   'db1096' => 1,
+   # 'db1096' => 1,
'db1099' => 1,
],
'logpager' => [
-   'db1096' => 1,
+   # 'db1096' => 1,
'db1099' => 1,
],
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1868dab85deb09b4e9822fc48365c74e33d9375
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1096

2017-10-09 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383059 )

Change subject: db-eqiad.php: Depool db1096
..

db-eqiad.php: Depool db1096

Going to optimize pagelinks and templatelinks

Bug: T174509
Change-Id: Ic1868dab85deb09b4e9822fc48365c74e33d9375
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 54e55ea..91752c2 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -147,7 +147,7 @@
'db1082' => 300, # A2 3.6TB 512GB, api
'db1087' => 500, # C2 3.6TB 512GB
'db1092' => 500, # D2 3.6TB 512GB
-   'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
+   # 'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T174509
'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
# 'db1100' => 1,   # C2 3.6TB 512GB, old master, crashed
# 'db1104' => 100,  # B3 3.6TB 512GB # Cloning db1106
@@ -372,23 +372,23 @@
'db1082' => 1,
],
'watchlist' => [
-   'db1096' => 1,
+   # 'db1096' => 1,
'db1099' => 1,
],
'recentchanges' => [
-   'db1096' => 1,
+   # 'db1096' => 1,
'db1099' => 1,
],
'recentchangeslinked' => [
-   'db1096' => 1,
+   # 'db1096' => 1,
'db1099' => 1,
],
'contributions' => [
-   'db1096' => 1,
+   # 'db1096' => 1,
'db1099' => 1,
],
'logpager' => [
-   'db1096' => 1,
+   # 'db1096' => 1,
'db1099' => 1,
],
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1868dab85deb09b4e9822fc48365c74e33d9375
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

<    1   2   3   4