jenkins-bot has submitted this change and it was merged.

Change subject: Adjust shard & replica count for enwiki and dewiki
......................................................................


Adjust shard & replica count for enwiki and dewiki

These settings were not effective on eqiad but it would result in 6*5
=> 30 nodes required for enwiki_content which does not give enough
room to elastic for moving shards with all the allocation constraints.

The idea is to lower the number of replicas with 7 shards:
- eqiad: 7*4 (28) total shards: 3 nodes free
- codfw: 7*3 (21) total shards: 3 nodes free

I removed the constraint on general indices for enwiki and dewiki in
the tests. I think we can handle the load with default settings.

It's still a very conservative approach.
This is just (I hope) transitional, other ideas that have been
expressed are still valid but they are hard to put in place (e.g. 20
enwiki shards)

Change-Id: Ifc495984411108e3f442595410da5efa72b35158
---
M tests/cirrusTest.php
M wmf-config/InitialiseSettings.php
2 files changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 3dbe60d..dcf048e 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -233,7 +233,7 @@
                //   select wikiid, count(1) as count from 
wmf_raw.cirrussearchrequestset where year = 2016
                //   and month = 1 and day >= 2 and day < 9 group by wikiid 
order by count desc limit 10;
                $busyWikis = array( 'enwiki', 'dewiki' );
-               if ( in_array( $wiki, $busyWikis ) && $indexType !== 
'titlesuggest' ) {
+               if ( in_array( $wiki, $busyWikis ) && $indexType == 'content' ) 
{
 
                        // For busy indices ensure we are using most of the 
cluster to serve them
                        $this->assertGreaterThanOrEqual( $numServers - 3, 
$totalShards );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1f74042..e174ebe 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16656,11 +16656,11 @@
        'commonswiki' => [ 'content' => 1, 'general' => 8, 'file' => 7, 
'titlesuggest' => 1 ],
        'cswiki' => [ 'content' => 3, 'general' => 1, 'titlesuggest' => 1 ],
        'dawiki' => [ 'content' => 2, 'general' => 1, 'titlesuggest' => 1 ],
-       'dewiki' => [ 'content' => 6, 'general' => 7, 'titlesuggest' => 3 ],
+       'dewiki' => [ 'content' => 7, 'general' => 8, 'titlesuggest' => 3 ],
        'dewikisource' => [ 'content' => 3, 'general' => 1, 'titlesuggest' => 1 
],
        'elwiki' => [ 'content' => 2, 'general' => 1, 'titlesuggest' => 1 ],
        // These shards are also significantly larger than the target 2GB.
-       'enwiki' => [ 'content' => 6, 'general' => 7, 'titlesuggest' => 4 ],
+       'enwiki' => [ 'content' => 7, 'general' => 8, 'titlesuggest' => 4 ],
        'enwikinews' => [ 'content' => 1, 'general' => 4, 'titlesuggest' => 1 ],
        'enwikisource' => [ 'content' => 7, 'general' => 1, 'titlesuggest' => 1 
],
        'enwiktionary' => [ 'content' => 5, 'general' => 2, 'titlesuggest' => 2 
],
@@ -16717,12 +16717,12 @@
                'codfw' => [ 'content' => '0-2', 'general' => '0-2', 
'titlesuggest' => '0-2', 'file' => '0-2' ],
        ],
        'enwiki' => [
-               'eqiad' => [ 'content' => '0-4', 'general' => '0-3', 
'titlesuggest' => '0-3' ],
-               'codfw' => [ 'content' => '0-3', 'general' => '0-2', 
'titlesuggest' => '0-3' ],
+               'eqiad' => [ 'content' => '0-3', 'general' => '0-2', 
'titlesuggest' => '0-3' ],
+               'codfw' => [ 'content' => '0-2', 'general' => '0-2', 
'titlesuggest' => '0-3' ],
        ],
        'dewiki' => [
-               'eqiad' => [ 'content' => '0-4', 'general' => '0-3', 
'titlesuggest' => '0-2' ],
-               'codfw' => [ 'content' => '0-3', 'general' => '0-2', 
'titlesuggest' => '0-2' ],
+               'eqiad' => [ 'content' => '0-3', 'general' => '0-2', 
'titlesuggest' => '0-2' ],
+               'codfw' => [ 'content' => '0-2', 'general' => '0-2', 
'titlesuggest' => '0-2' ],
        ],
 ],
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc495984411108e3f442595410da5efa72b35158
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to