jenkins-bot has submitted this change and it was merged.
Change subject: Reduce replica count for commonswiki_file in codfw
......................................................................
Reduce replica count for commonswiki_file in codfw
Missed this one when writing the unit test to verify shard counts.
Should be ok reducing to 2 replicas and save having to reindex.
Change-Id: I57104b666aa5fb697a40c9a7864223b59cbe19a2
---
M tests/cirrusTest.php
M wmf-config/InitialiseSettings.php
2 files changed, 13 insertions(+), 6 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 4253976..3c61719 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -146,7 +146,7 @@
}
}
$wikis = array_unique( $wikis );
- $indexTypes = array( 'content', 'general', 'titlesuggest' );
+ $indexTypes = array( 'content', 'general', 'titlesuggest',
'file' );
$clusters = array( 'eqiad' => 31, 'codfw' => 24 );
// restrict wgConf to only the settings we care about
@@ -169,11 +169,15 @@
'stdlogo' => 'file://dev/null',
) );
foreach ( $indexTypes as $indexType ) {
+ // only commonswiki has the file index
+ if ( $indexType === 'file' && $wiki !==
'commonswiki' ) {
+ continue;
+ }
+ // wikidata doesn't have completion suggester
+ if ( $wiki === 'wikidatawiki' && $indexType ===
'titlesuggest' ) {
+ continue;
+ }
foreach ( $clusters as $clusterName =>
$numServers ) {
- // wikidata doesn't have completion
suggester
- if ( $wiki === 'wikidatawiki' &&
$indexType === 'titlesuggest' ) {
- continue;
- }
$tests["$clusterName
{$wiki}_{$indexType}"] = array(
$wiki,
$indexType,
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 6ec2b40..0f77e39 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16014,7 +16014,10 @@
// some of the larger ones will want more replicas for content indexes
'wmgCirrusSearchReplicas' => array(
'default' => array( 'content' => '0-2', 'general' => '0-2',
'titlesuggest' => '0-2' ),
- '+commonswiki' => array( 'file' => '0-3' ),
+ 'commonswiki' => array(
+ 'eqiad' => array( 'content' => '0-2', 'general' => '0-2',
'titlesuggest' => '0-2', 'file' => '0-3' ),
+ 'codfw' => array( 'content' => '0-2', 'general' => '0-2',
'titlesuggest' => '0-2', 'file' => '0-2' ),
+ ),
'+eswiki' => array( 'titlesuggest' => '0-5' ),
'+jawiki' => array( 'titlesuggest' => '0-5' ),
'+ruwiki' => array( 'titlesuggest' => '0-5' ),
--
To view, visit https://gerrit.wikimedia.org/r/266658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I57104b666aa5fb697a40c9a7864223b59cbe19a2
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
