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 120000
index 585b920..0000000
--- 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 120000
index 21ec281..0000000
--- 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..0000000
--- 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 master
- ),
- 's7' => array(
- 'db1033' => 0,
- 'db68' => 100, # pmtpa master
- ),
-),
-
-
-'serverTemplate' => array(
- 'dbname' => $wgDBname,
- 'user' => $wgDBuser,
- 'password' => $wgDBpassword,
- 'type' => 'mysql',
- 'flags' => DBO_DEFAULT,
- 'max lag' => 30,
- # 'max threads' => 350, -- disabled TS
-),
-
-'groupLoadsBySection' => array(
- /*
- 's2' => array(
- 'QueryPage::recache' => array(
- 'db8' => 100,
- )
- )*/
-),
-
-
-'groupLoadsByDB' => array(
-/*
- 'enwiki' => array(
- 'watchlist' => array(
- 'db59' => 1,
- ),
- 'recentchangeslinked' => array(
- 'db59' => 1,
- ),
- 'contributions' => array(
- 'db59' => 1,
- ),
- 'dump' => array(
- 'db59' => 1,
- ),
- ),
-*/
-),
-
-# Hosts settings
-# Do not remove servers from this list ever
-# Removing a server from this list does not remove the server from rotation,
-# it just breaks the site horribly.
-'hostsByName' => array(
- 'db30' => '10.0.6.40', # do not remove or comment out
- 'db31' => '10.0.6.41', # do not remove or comment out
- 'db32' => '10.0.6.42', # do not remove or comment out
- 'db33' => '10.0.6.43', # do not remove or comment out
- 'db34' => '10.0.6.44', # do not remove or comment out
- 'db35' => '10.0.6.45', # do not remove or comment out
- 'db36' => '10.0.6.46', # do not remove or comment out
- 'db37' => '10.0.6.47', # do not remove or comment out
- 'db38' => '10.0.6.48', # do not remove or comment out
- 'db39' => '10.0.6.49', # do not remove or comment out
- 'db40' => '10.0.6.50', # do not remove or comment out # Parser cache
- 'db42' => '10.0.6.52', # do not remove or comment out # Analytics -
NOT FOR PROD
- 'db43' => '10.0.6.53', # do not remove or comment out
- 'db44' => '10.0.6.54', # do not remove or comment out
- 'db45' => '10.0.6.55', # do not remove or comment out
- 'db46' => '10.0.6.56', # do not remove or comment out
- 'db47' => '10.0.6.57', # do not remove or comment out
- 'db50' => '10.0.6.60', # do not remove or comment out
- 'db51' => '10.0.6.61', # do not remove or comment out
- 'db52' => '10.0.6.62', # do not remove or comment out
- 'db53' => '10.0.6.63', # do not remove or comment out
- 'db54' => '10.0.6.64', # do not remove or comment out
- 'db55' => '10.0.6.65', # do not remove or comment out
- 'db56' => '10.0.6.66', # do not remove or comment out
- 'db57' => '10.0.6.67', # do not remove or comment out
- 'db58' => '10.0.6.68', # do not remove or comment out
- 'db59' => '10.0.6.69', # do not remove or comment out
- 'db60' => '10.0.6.70', # do not remove or comment out
- 'db63' => '10.0.6.73', # do not remove or comment out
- 'db64' => '10.0.6.74', # do not remove or comment out
- 'db65' => '10.0.6.75', # do not remove or comment out
- 'db66' => '10.0.6.76', # do not remove or comment out
- 'db68' => '10.0.6.78', # do not remove or comment out
- 'db69' => '10.0.6.79', # do not remove or comment out
- 'db71' => '10.0.6.81', # do not remove or comment out
- 'db72' => '10.0.6.82', # do not remove or comment out
- 'db73' => '10.0.6.83', # do not remove or comment out
- 'db74' => '10.0.6.84', # do not remove or comment out
- 'db1001' => '10.64.0.5', #do not remove or comment out
- 'db1002' => '10.64.0.6', #do not remove or comment out
- 'db1003' => '10.64.0.7', #do not remove or comment out
- 'db1004' => '10.64.0.8', #do not remove or comment out
- 'db1005' => '10.64.0.9', #do not remove or comment out
- 'db1006' => '10.64.0.10', #do not remove or comment out
- 'db1007' => '10.64.0.11', #do not remove or comment out
- 'db1009' => '10.64.0.13', #do not remove or comment out
- 'db1010' => '10.64.0.14', #do not remove or comment out
- 'db1011' => '10.64.0.15', #do not remove or comment out
- 'db1017' => '10.64.16.6', #do not remove or comment out
- 'db1018' => '10.64.16.7', #do not remove or comment out
- 'db1019' => '10.64.16.8', #do not remove or comment out
- 'db1020' => '10.64.16.9', #do not remove or comment out
- 'db1021' => '10.64.16.10', #do not remove or comment out
- 'db1022' => '10.64.16.11', #do not remove or comment out
- 'db1023' => '10.64.16.12', #do not remove or comment out
- 'db1024' => '10.64.16.13', #do not remove or comment out
- 'db1026' => '10.64.16.15', #do not remove or comment out
- 'db1027' => '10.64.16.16', #do not remove or comment out
- 'db1028' => '10.64.16.17', #do not remove or comment out
- 'db1033' => '10.64.16.22', #do not remove or comment out
- 'db1034' => '10.64.16.23', #do not remove or comment out
- 'db1035' => '10.64.16.24', #do not remove or comment out
- 'db1036' => '10.64.16.25', #do not remove or comment out
- 'db1037' => '10.64.16.26', #do not remove or comment out
- 'db1038' => '10.64.16.27', #do not remove or comment out
- 'db1039' => '10.64.16.28', #do not remove or comment out
- 'db1040' => '10.64.16.29', #do not remove or comment out
- 'db1041' => '10.64.16.30', #do not remove or comment out
- 'db1042' => '10.64.16.31', #do not remove or comment out
- 'db1043' => '10.64.16.32', #do not remove or comment out
- 'db1047' => '10.64.16.36', #do not remove or comment out
- 'db1049' => '10.64.16.144', #do not remove or comment out
- 'db1050' => '10.64.16.145', #do not remove or comment out
- 'db1052' => '10.64.32.22', #do not remove or comment out
- 'db1056' => '10.64.32.26', #do not remove or comment out
- 'db1058' => '10.64.32.28', #do not remove or comment out
- 'db1059' => '10.64.32.29', #do not remove or comment out
- 'pc1' => '10.0.0.221', # do not remove or comment out #
Parser Cache
-),
-
-'externalLoads' => array(
- # Recompressed stores
- 'rc1' => $wmgOldExtTemplate,
-
- # Former Ubuntu dual-purpose stores
- 'cluster3' => $wmgOldExtTemplate,
- 'cluster4' => $wmgOldExtTemplate,
- 'cluster5' => $wmgOldExtTemplate,
- 'cluster6' => $wmgOldExtTemplate,
- 'cluster7' => $wmgOldExtTemplate,
- 'cluster8' => $wmgOldExtTemplate,
- 'cluster9' => $wmgOldExtTemplate,
- 'cluster10' => $wmgOldExtTemplate,
- 'cluster20' => $wmgOldExtTemplate,
- 'cluster21' => $wmgOldExtTemplate,
-
- # Clusters required for bug 22624
- 'cluster1' => $wmgOldExtTemplate,
- 'cluster2' => $wmgOldExtTemplate,
-
- # Old dedicated clusters
- 'cluster22' => $wmgOldExtTemplate,
- 'cluster23' => $wmgOldExtTemplate,
-
- # Dedicated server stores
- # es2
- 'cluster24' => array(
- '10.64.16.153' => 0, # es1005
- '10.0.0.236' => 3, # es7, pmtpa master
- ),
- # es3
- 'cluster25' => array(
- '10.64.32.18' => 0, # es1008
- '10.0.0.237' => 1, # es8, pmtpa master
- ),
- # ExtensionStore shard1 - initially for AFTv5
- # TODO: pmtpa replica of the shard, currently only in eqiad
- 'extension1' => array(
- '10.64.16.18' => 0, # db1029
- '10.0.6.48' => 1, # db38
- ),
-),
-
-'masterTemplateOverrides' => array(
- # The master generally has more threads running than the others
- 'max threads' => 400,
-),
-
-'externalTemplateOverrides' => array(
- 'flags' => 0, // No transactions
-),
-
-'templateOverridesByCluster' => array(
- 'cluster1' => array( 'blobs table' => 'blobs_cluster1' ),
- 'cluster2' => array( 'blobs table' => 'blobs_cluster2' ),
- 'cluster3' => array( 'blobs table' => 'blobs_cluster3' ),
- 'cluster4' => array( 'blobs table' => 'blobs_cluster4' ),
- 'cluster5' => array( 'blobs table' => 'blobs_cluster5' ),
- 'cluster6' => array( 'blobs table' => 'blobs_cluster6' ),
- 'cluster7' => array( 'blobs table' => 'blobs_cluster7' ),
- 'cluster8' => array( 'blobs table' => 'blobs_cluster8' ),
- 'cluster9' => array( 'blobs table' => 'blobs_cluster9' ),
- 'cluster10' => array( 'blobs table' => 'blobs_cluster10' ),
- 'cluster20' => array( 'blobs table' => 'blobs_cluster20' ),
- 'cluster21' => array( 'blobs table' => 'blobs_cluster21' ),
- 'cluster22' => array( 'blobs table' => 'blobs_cluster22' ),
- 'cluster23' => array( 'blobs table' => 'blobs_cluster23' ),
- 'cluster24' => array( 'blobs table' => 'blobs_cluster24' ),
- 'cluster25' => array( 'blobs table' => 'blobs_cluster25' ),
-),
-
-# This key must exist for the master switch script to work
-'readOnlyBySection' => array(
-# 'DEFAULT' => 'Brief Database Maintenance in progress, please try again
in 3 minutes', #s3
-# 's1' => 'Brief Database Maintenance in progress, please try again
in 3 minutes',
-# 's5' => 'Brief Database Maintenance in progress, please try again
in 3 minutes',
-# 's3' => 'Brief Database Maintenance in progress, please try again
in 3 minutes',
-),
-
-);
-
-$wgDefaultExternalStore = array(
- 'DB://cluster24', 'DB://cluster25',
-);
-$wgMasterWaitTimeout = 2;
-$wgDBAvgStatusPoll = 30000;
-
-# $wgLBFactoryConf['readOnlyBySection']['s2'] =
-# $wgLBFactoryConf['readOnlyBySection']['s2a'] =
-# 'Emergency maintenance, need more servers up, new estimate ~18:30 UTC';
-
-if ( $wgDBname === 'testwiki' ) {
- $wgLBFactoryConf['serverTemplate']['max threads'] = 300;
-}
diff --git a/wmf-config/jobqueue-pmtpa.php b/wmf-config/jobqueue-pmtpa.php
deleted file mode 100644
index 9cbda9a..0000000
--- a/wmf-config/jobqueue-pmtpa.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-# WARNING: This file is publically viewable on the web. Do not put private
data here.
-// Note: on server failure, partition masters should be switched to the slave
-$wgJobTypeConf['default'] = array(
- 'class' => 'JobQueueFederated',
- 'configByPartition' => array(
- 'rdb1' => array(
- 'class' => 'JobQueueRedis',
- 'redisServer' => '10.64.32.76', # rdb1001 (master)
- #'redisServer' => '10.64.32.77', # rdb1002 (slave)
- 'redisConfig' => array(
- 'connectTimeout' => 2,
- 'password' => $wmgRedisPassword,
- 'compression' => 'gzip'
- )
- ),
- 'rdb2' => array(
- 'class' => 'JobQueueRedis',
- 'redisServer' => '10.64.0.201', # rdb1003 (master)
- #'redisServer' => '10.64.16.183', # rdb1004 (slave)
- 'redisConfig' => array(
- 'connectTimeout' => 2,
- 'password' => $wmgRedisPassword,
- 'compression' => 'gzip'
- )
- ),
- ),
- 'sectionsByWiki' => array(), // default
- 'partitionsBySection' => array(
- 'default' => array( 'rdb1' => 50, 'rdb2' => 50 ),
- )
-);
-// Note: on server failure, this should be changed to any other redis server
-$wgJobQueueAggregator = array(
- 'class' => 'JobQueueAggregatorRedis',
- 'redisServers' => array( // all after the first are fallbacks
- '10.64.32.76', # rdb1001
- '10.64.0.201', # rdb1003
- ),
- #'redisServer' => '10.0.12.1', # mc1
- 'redisConfig' => array(
- 'connectTimeout' => 1,
- 'password' => $wmgRedisPassword,
- )
-);
--
To view, visit https://gerrit.wikimedia.org/r/116036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic56177a36bae555915b182e01ef0879dda8a26fd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
