jenkins-bot has submitted this change and it was merged.
Change subject: Send CirrusSearch writes to codfw
......................................................................
Send CirrusSearch writes to codfw
Change-Id: Ib3d30261b33369f8778002bd04d44e4e83c719c5
---
M tests/cirrusTest.php
M wmf-config/InitialiseSettings.php
2 files changed, 12 insertions(+), 15 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index c07c497..831cce3 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -12,8 +12,8 @@
$this->assertEquals( 'eqiad',
$config['wgCirrusSearchDefaultCluster'] );
$this->assertCount( 3, $config['wgCirrusSearchClusters'] );
- // testwiki writes to eqiad and the lab replica
- $this->assertCount( 2, $config['wgCirrusSearchWriteClusters'] );
+ // testwiki writes to eqiad, codfw and the lab replica
+ $this->assertCount( 3, $config['wgCirrusSearchWriteClusters'] );
$this->assertArrayHasKey(
$config['wgCirrusSearchDefaultCluster'],
@@ -44,17 +44,14 @@
$this->assertArrayHasKey( $cluster,
$config['wgCirrusSearchClientSideConnectTimeout'] );
}
- // Only eqiad for now
- $this->assertCount( 1, $config['wgCirrusSearchWriteClusters'] );
- $this->assertArrayHasKey(
- $config['wgCirrusSearchDefaultCluster'],
- $config['wgCirrusSearchClusters']
- );
-
- $this->assertArrayHasKey(
- reset( $config['wgCirrusSearchWriteClusters'] ),
- $config['wgCirrusSearchClusters']
- );
+ // Only eqiad and codfw for now
+ $this->assertCount( 2, $config['wgCirrusSearchWriteClusters'] );
+ foreach ( $config['wgCirrusSearchWriteClusters'] as $cluster ) {
+ $this->assertArrayHasKey(
+ $cluster,
+ $config['wgCirrusSearchClusters']
+ );
+ }
}
private function loadCirrusConfig( $wmfRealm, $wgDBname, $dbSuffix,
$lang, $site ) {
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index e28da64..c2b6359 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15321,8 +15321,8 @@
),
'wmgCirrusSearchWriteClusters' => array(
- 'default' => array( 'eqiad' ),
- 'testwiki' => array( 'eqiad', 'labsearch' )
+ 'default' => array( 'eqiad', 'codfw' ),
+ 'testwiki' => array( 'eqiad', 'codfw', 'labsearch' )
),
'wmgCirrusPerUserPoolCounter' => array(
--
To view, visit https://gerrit.wikimedia.org/r/248871
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3d30261b33369f8778002bd04d44e4e83c719c5
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
