Gehel has submitted this change and it was merged.
Change subject: Switching CirrusSearch to codfw Elasticsearch cluster
......................................................................
Switching CirrusSearch to codfw Elasticsearch cluster
Change-Id: Idabacce3e6b7a003e0d17be3749bf2fcfbdc8dd8
---
M tests/cirrusTest.php
M wmf-config/InitialiseSettings.php
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Gehel: Looks good to me, approved
DCausse: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 87e3763..b13c3d9 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -10,7 +10,8 @@
$this->assertArrayNotHasKey( 'wgCirrusSearchServers', $config );
$this->assertArrayHasKey( 'wgCirrusSearchClusters', $config );
$this->assertArrayHasKey( 'wgCirrusSearchDefaultCluster',
$config );
- $this->assertEquals( 'unittest',
$config['wgCirrusSearchDefaultCluster'] );
+ # usually, we would expect the local cluster (unittest), but we
are at the moment testing the switch to codfw
+ $this->assertEquals( 'codfw',
$config['wgCirrusSearchDefaultCluster'] );
$this->assertCount( 3, $config['wgCirrusSearchClusters'] );
// testwiki writes to eqiad and codfw
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index b29213c..440b764 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16066,7 +16066,7 @@
),
'wmgCirrusSearchDefaultCluster' => array(
- 'default' => 'local',
+ 'default' => 'codfw',
),
'wmgCirrusSearchWriteClusters' => array(
--
To view, visit https://gerrit.wikimedia.org/r/282158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idabacce3e6b7a003e0d17be3749bf2fcfbdc8dd8
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
