jenkins-bot has submitted this change and it was merged.
Change subject: Stop pushing ES updates to nobelium
......................................................................
Stop pushing ES updates to nobelium
We've completed our testing to measure the ability of elasticsearch
to keep up with indexing volume on spinning disks. The results are not
amazing, but it gave us the info we needed. Turn off writes to open
up nobelium's IO for use measuring querying indices which don't fit in
memory rather than write performance.
Change-Id: I38308fc68e58486b98ccc82361eadb57943552c0
---
M tests/cirrusTest.php
M wmf-config/InitialiseSettings.php
2 files changed, 3 insertions(+), 11 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 4253976..ae40f7c 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -13,8 +13,8 @@
$this->assertEquals( 'unittest',
$config['wgCirrusSearchDefaultCluster'] );
$this->assertCount( 3, $config['wgCirrusSearchClusters'] );
- // testwiki writes to eqiad, codfw and the lab replica
- $this->assertCount( 3, $config['wgCirrusSearchWriteClusters'] );
+ // testwiki writes to eqiad and codfw
+ $this->assertCount( 2, $config['wgCirrusSearchWriteClusters'] );
foreach ( $config['wgCirrusSearchWriteClusters'] as
$writeCluster ) {
$this->assertArrayHasKey(
@@ -40,7 +40,7 @@
$this->assertArrayHasKey( $cluster,
$config['wgCirrusSearchClientSideConnectTimeout'] );
}
- $this->assertCount( 3, $config['wgCirrusSearchWriteClusters'] );
+ $this->assertCount( 2, $config['wgCirrusSearchWriteClusters'] );
foreach ( $config['wgCirrusSearchWriteClusters'] as $cluster ) {
$this->assertArrayHasKey(
$cluster,
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 6ec2b40..95c7073 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15892,14 +15892,6 @@
'wmgCirrusSearchWriteClusters' => array(
'default' => array( 'eqiad', 'codfw' ),
- 'enwiki' => array( 'eqiad', 'codfw', 'labsearch' ),
- 'dewiki' => array( 'eqiad', 'codfw', 'labsearch' ),
- 'wikidatawiki' => array( 'eqiad', 'codfw', 'labsearch' ),
- 'commonswiki' => array( 'eqiad', 'codfw', 'labsearch' ),
- 'nlwiki' => array( 'eqiad', 'codfw', 'labsearch' ),
- 'frwiki' => array( 'eqiad', 'codfw', 'labsearch' ),
- 'eswiki' => array( 'eqiad', 'codfw', 'labsearch' ),
- 'testwiki' => array( 'eqiad', 'codfw', 'labsearch' )
),
'wmgCirrusPerUserPoolCounter' => array(
--
To view, visit https://gerrit.wikimedia.org/r/275858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I38308fc68e58486b98ccc82361eadb57943552c0
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
