EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/359376 )
Change subject: Update cirrus server counts to match reality
......................................................................
Update cirrus server counts to match reality
Change-Id: I96f7519d37be18df9e8d31fd17b12f263a84adf4
---
M tests/cirrusTest.php
M wmf-config/InitialiseSettings.php
2 files changed, 4 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/76/359376/1
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 10f670a..bd5a9f5 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -160,7 +160,7 @@
}
$wikis = array_unique( $wikis );
$indexTypes = array( 'content', 'general', 'titlesuggest',
'file' );
- $clusters = array( 'eqiad' => 31, 'codfw' => 24 );
+ $clusters = array( 'eqiad' => 36, 'codfw' => 36 );
// restrict wgConf to only the settings we care about
$wgConf->settings = array(
@@ -235,7 +235,7 @@
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 );
+ $this->assertGreaterThanOrEqual( $numServers - 7,
$totalShards );
}
}
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 6c625e0..e48f546 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17903,14 +17903,8 @@
'wmgCirrusSearchReplicas' => [
'default' => [ 'content' => '0-2', 'general' => '0-2', 'titlesuggest'
=> '0-2' ],
'commonswiki' => [ 'content' => '0-2', 'general' => '0-2',
'titlesuggest' => '0-2', 'file' => '0-2' ],
- 'enwiki' => [
- 'eqiad' => [ 'content' => '0-3', 'general' => '0-2',
'titlesuggest' => '0-3' ],
- 'codfw' => [ 'content' => '0-2', 'general' => '0-2',
'titlesuggest' => '0-3' ],
- ],
- 'dewiki' => [
- 'eqiad' => [ 'content' => '0-3', 'general' => '0-2',
'titlesuggest' => '0-2' ],
- 'codfw' => [ 'content' => '0-2', 'general' => '0-2',
'titlesuggest' => '0-2' ],
- ],
+ 'enwiki' => [ 'content' => '0-3', 'general' => '0-2', 'titlesuggest' =>
'0-3' ],
+ 'dewiki' => [ 'content' => '0-3', 'general' => '0-2', 'titlesuggest' =>
'0-2' ],
],
'wmgCirrusSearchMaxShardsPerNode' => [
--
To view, visit https://gerrit.wikimedia.org/r/359376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96f7519d37be18df9e8d31fd17b12f263a84adf4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
