jenkins-bot has submitted this change and it was merged.
Change subject: Adjust cirrus titlesuggest index shard counts
......................................................................
Adjust cirrus titlesuggest index shard counts
Now that we've built the initial indices we have a better idea
of what size they are. Adjust down the number of shards to aim
for 150MB < x < 500MB per shard. This is still a pretty wide
range and a bit arbitrary, but seems reasonable. We can add
replicas at any time via the es rest api if the query load needs
to be better spread out.
Bug: T124332
Change-Id: I17193364274d55fc7c56c8772270e3de29ab9ec4
---
M wmf-config/InitialiseSettings.php
1 file changed, 25 insertions(+), 22 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 2ab01b0..39e61e7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15618,31 +15618,34 @@
'wmgCirrusSearchShardCount' => array(
// Most wikis are too small to be worth sharding
'default' => array( 'content' => 1, 'general' => 1, 'titlesuggest' => 1
),
- 'arwiki' => array( 'content' => 5, 'general' => 4, 'titlesuggest' => 3
),
+ 'arwiki' => array( 'content' => 5, 'general' => 4, 'titlesuggest' => 1
),
'arwikisource' => array( 'content' => 2, 'general' => 1, 'titlesuggest'
=> 1 ),
'bgwiki' => array( 'content' => 2, 'general' => 1, 'titlesuggest' => 1
),
- 'cawiki' => array( 'content' => 5, 'general' => 1, 'titlesuggest' => 2
),
+ 'cawiki' => array( 'content' => 5, 'general' => 1, 'titlesuggest' => 1
),
'cebwiki' => array( 'content' => 4, 'general' => 1, 'titlesuggest' => 2
),
- 'cswiki' => array( 'content' => 3, 'general' => 1, 'titlesuggest' => 2
),
// Commons is special and has a 'file' index in addition to the regular
ones.
// We're sharding 'file' like it is a content index because searching
it is
// very very common.
- 'commonswiki' => array( 'content' => 1, 'general' => 10, 'file' => 7,
'titlesuggest' => 2 ),
- 'dawiki' => array( 'content' => 2, 'general' => 1, 'titlesuggest' => 2
),
- 'dewiki' => array( 'content' => 7, 'general' => 10, 'titlesuggest' => 4
),
- 'dewikisource' => array( 'content' => 3, 'general' => 1, 'titlesuggest'
=> 2 ),
- 'elwiki' => array( 'content' => 2, 'general' => 1, 'titlesuggest' => 2
),
+ 'commonswiki' => array(
+ 'eqiad' => array('content' => 1, 'general' => 10, 'file' => 7,
'titlesuggest' => 1 ),
+ 'codfw' => array('content' => 1, 'general' => 8, 'file' => 7,
'titlesuggest' => 1 ),
+ ),
+ 'cswiki' => array( 'content' => 3, 'general' => 1, 'titlesuggest' => 1
),
+ 'dawiki' => array( 'content' => 2, 'general' => 1, 'titlesuggest' => 1
),
+ 'dewiki' => array( 'content' => 7, 'general' => 10, 'titlesuggest' => 3
),
+ 'dewikisource' => array( 'content' => 3, 'general' => 1, 'titlesuggest'
=> 1 ),
+ 'elwiki' => array( 'content' => 2, 'general' => 1, 'titlesuggest' => 1
),
// These shards are also significantly larger than the target 2GB.
'enwiki' => array( 'content' => 7, 'general' => 10, 'titlesuggest' => 4
),
'enwikinews' => array( 'content' => 1, 'general' => 4, 'titlesuggest'
=> 1 ),
- 'enwikisource' => array( 'content' => 7, 'general' => 1, 'titlesuggest'
=> 4 ),
+ 'enwikisource' => array( 'content' => 7, 'general' => 1, 'titlesuggest'
=> 1 ),
'enwiktionary' => array( 'content' => 5, 'general' => 2, 'titlesuggest'
=> 2 ),
- 'eswiki' => array( 'content' => 7, 'general' => 6, 'titlesuggest' => 4
),
+ 'eswiki' => array( 'content' => 7, 'general' => 6, 'titlesuggest' => 2
),
'eswikisource' => array( 'content' => 2, 'general' => 1, 'titlesuggest'
=> 1 ),
'fawiki' => array( 'content' => 5, 'general' => 2, 'titlesuggest' => 2
),
'fiwiki' => array( 'content' => 3, 'general' => 10, 'titlesuggest' => 1
),
- 'frwiki' => array( 'content' => 7, 'general' => 10, 'titlesuggest' => 4
),
- 'frwikisource' => array( 'content' => 7, 'general' => 1, 'titlesuggest'
=> 2 ),
+ 'frwiki' => array( 'content' => 7, 'general' => 10, 'titlesuggest' => 3
),
+ 'frwikisource' => array( 'content' => 7, 'general' => 1, 'titlesuggest'
=> 1 ),
'frwiktionary' => array( 'content' => 3, 'general' => 1, 'titlesuggest'
=> 1 ),
'hewiki' => array( 'content' => 3, 'general' => 2, 'titlesuggest' => 1
),
'hewikisource' => array( 'content' => 2, 'general' => 1, 'titlesuggest'
=> 1 ),
@@ -15650,22 +15653,22 @@
'hywiki' => array( 'content' => 2, 'general' => 1, 'titlesuggest' => 1
),
'idwiki' => array( 'content' => 2, 'general' => 2, 'titlesuggest' => 1
),
'incubatorwiki' => array( 'content' => 1, 'general' => 2,
'titlesuggest' => 1 ),
- 'itwiki' => array( 'content' => 7, 'general' => 9, 'titlesuggest' => 4
),
+ 'itwiki' => array( 'content' => 7, 'general' => 9, 'titlesuggest' => 2
),
'itwikisource' => array( 'content' => 2, 'general' => 1, 'titlesuggest'
=> 1 ),
- 'jawiki' => array( 'content' => 7, 'general' => 6, 'titlesuggest' => 4
),
+ 'jawiki' => array( 'content' => 7, 'general' => 6, 'titlesuggest' => 2
),
'kkwiki' => array( 'content' => 2, 'general' => 1, 'titlesuggest' => 1
),
'kowiki' => array( 'content' => 4, 'general' => 1, 'titlesuggest' => 1
),
'ltwiktionary' => array( 'content' => 2, 'general' => 1, 'titlesuggest'
=> 1 ),
'mswiki' => array( 'content' => 2, 'general' => 1, 'titlesuggest' => 1
),
'metawiki' => array( 'content' => 1, 'general' => 10, 'titlesuggest' =>
1 ),
- 'mgwiktionary' => array( 'content' => 4, 'general' => 1, 'titlesuggest'
=> 1 ),
+ 'mgwiktionary' => array( 'content' => 4, 'general' => 1, 'titlesuggest'
=> 2 ),
'nlwiki' => array( 'content' => 7, 'general' => 4, 'titlesuggest' => 2
),
'nowiki' => array( 'content' => 3, 'general' => 2, 'titlesuggest' => 1
),
'plwiki' => array( 'content' => 7, 'general' => 3, 'titlesuggest' => 2
),
- 'plwikisource' => array( 'content' => 2, 'general' => 1, 'titlesuggest'
=> 2 ),
- 'ptwiki' => array( 'content' => 7, 'general' => 5, 'titlesuggest' => 4
),
+ 'plwikisource' => array( 'content' => 2, 'general' => 1, 'titlesuggest'
=> 1 ),
+ 'ptwiki' => array( 'content' => 7, 'general' => 5, 'titlesuggest' => 2
),
'rowiki' => array( 'content' => 3, 'general' => 2, 'titlesuggest' => 1
),
- 'ruwiki' => array( 'content' => 7, 'general' => 10, 'titlesuggest' => 4
),
+ 'ruwiki' => array( 'content' => 7, 'general' => 10, 'titlesuggest' => 3
),
'ruwikisource' => array( 'content' => 4, 'general' => 1, 'titlesuggest'
=> 1 ),
'ruwiktionary' => array( 'content' => 3, 'general' => 1, 'titlesuggest'
=> 1 ),
'shwiki' => array( 'content' => 4, 'general' => 1, 'titlesuggest' => 1
),
@@ -15673,12 +15676,12 @@
'svwiki' => array( 'content' => 7, 'general' => 2, 'titlesuggest' => 4
),
'thwiki' => array( 'content' => 2, 'general' => 1, 'titlesuggest' => 1
),
'trwiki' => array( 'content' => 2, 'general' => 2, 'titlesuggest' => 1
),
- 'ukwiki' => array( 'content' => 7, 'general' => 2, 'titlesuggest' => 2
),
- 'viwiki' => array( 'content' => 6, 'general' => 2, 'titlesuggest' => 2
),
+ 'ukwiki' => array( 'content' => 7, 'general' => 2, 'titlesuggest' => 1
),
+ 'viwiki' => array( 'content' => 6, 'general' => 2, 'titlesuggest' => 1
),
'wikidatawiki' => array( 'content' => 7, 'general' => 1 ),
'warwiki' => array( 'content' => 2, 'general' => 1, 'titlesuggest' => 1
),
- 'zhwiki' => array( 'content' => 7, 'general' => 5, 'titlesuggest' => 4
),
- 'zhwikisource' => array( 'content' => 5, 'general' => 1, 'titlesuggest'
=> 2 ),
+ 'zhwiki' => array( 'content' => 7, 'general' => 5, 'titlesuggest' => 2
),
+ 'zhwikisource' => array( 'content' => 5, 'general' => 1, 'titlesuggest'
=> 1 ),
),
// Most wikis are fine with 0-2 replicas for all indexes
--
To view, visit https://gerrit.wikimedia.org/r/261287
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I17193364274d55fc7c56c8772270e3de29ab9ec4
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: Chad <[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
