[MediaWiki-commits] [Gerrit] Remove db and job queue pmtpa files - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove db and job queue pmtpa files
..
Remove db and job queue pmtpa files
PMTPA mysql and redis servers are gone according to ganglia!
Removing PoolCounter too. Not going to be used...
Removing datacentre twemproxy files, same as each other and same as
twemproxy.yaml
Change-Id: Ic56177a36bae555915b182e01ef0879dda8a26fd
---
D docroot/noc/conf/PoolCounterSettings-pmtpa.php.txt
D docroot/noc/conf/db-pmtpa.php.txt
D docroot/noc/conf/jobqueue-pmtpa.php.txt
M docroot/noc/createTxtFileSymlinks.sh
M multiversion/MWRealm.php
D wmf-config/PoolCounterSettings-pmtpa.php
D wmf-config/db-pmtpa.php
D wmf-config/jobqueue-pmtpa.php
D wmf-config/twemproxy-eqiad.yaml
D wmf-config/twemproxy-pmtpa.yaml
10 files changed, 4 insertions(+), 482 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docroot/noc/conf/PoolCounterSettings-pmtpa.php.txt
b/docroot/noc/conf/PoolCounterSettings-pmtpa.php.txt
deleted file mode 12
index 61c5c3f..000
--- a/docroot/noc/conf/PoolCounterSettings-pmtpa.php.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../../wmf-config/PoolCounterSettings-pmtpa.php
\ No newline at end of file
diff --git a/docroot/noc/conf/db-pmtpa.php.txt
b/docroot/noc/conf/db-pmtpa.php.txt
deleted file mode 12
index 585b920..000
--- a/docroot/noc/conf/db-pmtpa.php.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../../wmf-config/db-pmtpa.php
\ No newline at end of file
diff --git a/docroot/noc/conf/jobqueue-pmtpa.php.txt
b/docroot/noc/conf/jobqueue-pmtpa.php.txt
deleted file mode 12
index 21ec281..000
--- a/docroot/noc/conf/jobqueue-pmtpa.php.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../../wmf-config/jobqueue-pmtpa.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index 24345c4..99bfc97 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -8,14 +8,12 @@
wmf-config/InitialiseSettings-labs.php
wmf-config/InitialiseSettings.php
wmf-config/PoolCounterSettings-eqiad.php
- wmf-config/PoolCounterSettings-pmtpa.php
wmf-config/StartProfiler.php
wmf-config/abusefilter.php
wmf-config/CirrusSearch-common.php
wmf-config/CirrusSearch-labs.php
wmf-config/db-eqiad.php
wmf-config/db-labs.php
- wmf-config/db-pmtpa.php
wmf-config/db-secondary.php
wmf-config/ext-labs.php
wmf-config/ext-production.php
@@ -23,7 +21,6 @@
wmf-config/filebackend.php
wmf-config/flaggedrevs.php
wmf-config/jobqueue-eqiad.php
- wmf-config/jobqueue-pmtpa.php
wmf-config/liquidthreads.php
wmf-config/logging-labs.php
wmf-config/lucene-common.php
diff --git a/multiversion/MWRealm.php b/multiversion/MWRealm.php
index 1f2017b..90c5b4b 100644
--- a/multiversion/MWRealm.php
+++ b/multiversion/MWRealm.php
@@ -4,14 +4,13 @@
# location. Thet should be provisioned by puppet in /etc/wikimedia-site and
# /etc/wikimedia-realm.
#
-# The possible values of $wmfRealm and $wmfDatacenter as of October 2012 are:
+# The possible values of $wmfRealm and $wmfDatacenter as of February 2014 are:
# - labs + pmtpa
# - labs + eqiad
-# - production + pmtpa
# - production + eqiad
global $wmfDatacenter, $wmfRealm;
$wmfRealm = 'production';
-$wmfDatacenter = 'pmtpa';
+$wmfDatacenter = 'eqiad';
# Puppet provision the realm in /etc/wikimedia-realm
if( file_exists( '/etc/wikimedia-realm' ) ) {
@@ -26,14 +25,14 @@
case 'labs':
case 'production':
if ( ! in_array( $wmfDatacenter, array( 'pmtpa', 'eqiad' ) ) ) {
- $wmfDatacenter = 'pmtpa';
+ $wmfDatacenter = 'eqiad';
}
break;
default:
# Assume something vaguely resembling a default
$wmfRealm = 'production';
- $wmfDatacenter = 'pmtpa';
+ $wmfDatacenter = 'eqiad';
break;
}
@@ -41,7 +40,6 @@
# @returns array List of realm-datacenter pairs
function listAllRealmsAndDatacenters() {
return array(
- array( 'production', 'pmtpa' ),
array( 'production', 'eqiad' ),
array( 'labs', 'pmtpa' ),
array( 'labs', 'eqiad' ),
diff --git a/wmf-config/PoolCounterSettings-pmtpa.php
b/wmf-config/PoolCounterSettings-pmtpa.php
deleted file mode 100644
index b704abb..000
--- a/wmf-config/PoolCounterSettings-pmtpa.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-
-if ( !defined( 'MEDIAWIKI' ) ) exit( 1 );
-
-include( $IP/extensions/PoolCounter/PoolCounterClient.php );
-
-$wgPoolCountClientConf = array(
- 'servers' = array(
- '10.0.0.21',
- '10.0.0.22'
- ),
- 'timeout' = 0.5
-);
-
-$wgPoolCounterConf = array(
- 'ArticleView' = array(
- 'class' = 'PoolCounter_Client',
-
[MediaWiki-commits] [Gerrit] Remove db and job queue pmtpa files - change (operations/mediawiki-config)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116036
Change subject: Remove db and job queue pmtpa files
..
Remove db and job queue pmtpa files
PMTPA mysql and redis servers are gone according to ganglia
Change-Id: Ic56177a36bae555915b182e01ef0879dda8a26fd
---
D docroot/noc/conf/db-pmtpa.php.txt
D docroot/noc/conf/jobqueue-pmtpa.php.txt
M docroot/noc/createTxtFileSymlinks.sh
D wmf-config/db-pmtpa.php
D wmf-config/jobqueue-pmtpa.php
5 files changed, 0 insertions(+), 383 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/36/116036/1
diff --git a/docroot/noc/conf/db-pmtpa.php.txt
b/docroot/noc/conf/db-pmtpa.php.txt
deleted file mode 12
index 585b920..000
--- a/docroot/noc/conf/db-pmtpa.php.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../../wmf-config/db-pmtpa.php
\ No newline at end of file
diff --git a/docroot/noc/conf/jobqueue-pmtpa.php.txt
b/docroot/noc/conf/jobqueue-pmtpa.php.txt
deleted file mode 12
index 21ec281..000
--- a/docroot/noc/conf/jobqueue-pmtpa.php.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../../wmf-config/jobqueue-pmtpa.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index 24345c4..e2398a0 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -15,7 +15,6 @@
wmf-config/CirrusSearch-labs.php
wmf-config/db-eqiad.php
wmf-config/db-labs.php
- wmf-config/db-pmtpa.php
wmf-config/db-secondary.php
wmf-config/ext-labs.php
wmf-config/ext-production.php
@@ -23,7 +22,6 @@
wmf-config/filebackend.php
wmf-config/flaggedrevs.php
wmf-config/jobqueue-eqiad.php
- wmf-config/jobqueue-pmtpa.php
wmf-config/liquidthreads.php
wmf-config/logging-labs.php
wmf-config/lucene-common.php
diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php
deleted file mode 100644
index d8f9308..000
--- a/wmf-config/db-pmtpa.php
+++ /dev/null
@@ -1,334 +0,0 @@
-?php
-# WARNING: This file is publically viewable on the web. Do not put private
data here.
-#
-# $Id$
-
-if ( !defined( 'DBO_DEFAULT' ) ) {
- define( 'DBO_DEFAULT', 16 );
-}
-
-#$wgReadOnly = Wikimedia Sites are currently read-only during maintenance,
please try again soon.;
-
-$wmgParserCacheDBs = array(
- '10.0.0.221', # pc1
- '10.0.0.222', # pc2
- '10.0.0.223', # pc3
-);
-
-$wmgOldExtTemplate = array(
- '10.64.0.25' = 0, # es1001
- '10.0.0.228' = 1, # es4, pmtpa master
-);
-
-$wgLBFactoryConf = array(
-
-'class' = 'LBFactoryMulti',
-
-'sectionsByDB' = array(
- 'enwiki' = 's1',
-
- # New master
- 'bgwiki' = 's2',
- 'bgwiktionary' = 's2',
- 'cswiki' = 's2',
- 'enwikiquote' = 's2',
- 'enwiktionary' = 's2',
- 'eowiki' = 's2',
- 'fiwiki' = 's2',
- 'idwiki' = 's2',
- 'itwiki' = 's2',
- 'nlwiki' = 's2',
- 'nowiki' = 's2',
- 'plwiki' = 's2',
- 'ptwiki' = 's2',
- 'svwiki' = 's2',
- 'thwiki' = 's2',
- 'trwiki' = 's2',
- 'zhwiki' = 's2',
-
- 'commonswiki' = 's4',
-
- 'dewiki' = 's5',
- 'wikidatawiki' = 's5',
-
- 'frwiki' = 's6',
- 'jawiki' = 's6',
- 'ruwiki' = 's6',
-
- 'eswiki' = 's7',
- 'huwiki' = 's7',
- 'hewiki' = 's7',
- 'ukwiki' = 's7',
- 'frwiktionary' = 's7',
- 'metawiki' = 's7',
- 'arwiki' = 's7',
- 'centralauth' = 's7',
- 'cawiki' = 's7',
- 'viwiki' = 's7',
- 'fawiki' = 's7',
- 'rowiki' = 's7',
- 'kowiki' = 's7',
-),
-
-# Load lists
-#
-# All servers which replicate the given databases should be in the load
-# list, not commented out, because otherwise maintenance scripts such
-# as compressOld.php won't wait for those servers when they lag.
-#
-# Conversely, all servers which are down or do not replicate should be
-# removed, not set to load zero, because there are certain situations
-# when load zero servers will be used, such as if the others are lagged.
-# Servers which are down should be removed to avoid a timeout overhead
-# per invocation.
-#
-'sectionLoads' = array(
- 's1' = array(
- 'db1052' = 0,
- 'db63'= 100, # pmtpa master
- ),
- 's2' = array(
- 'db1024' = 0,
- 'db69'= 100, # pmtpa master
- ),
- /* s3 */ 'DEFAULT' = array(
- 'db1038' = 0,
- 'db71'= 100, # pmtpa master
- ),
- 's4' = array(
- 'db1040' = 0,
- 'db72' = 100, # pmtpa master
- ),
- 's5' = array(
- 'db1058' = 0,
- 'db73' = 100, # pmtpa master
- ),
- 's6' = array(
- 'db1023' = 0,
- 'db74' = 100, # pmtpa
