jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/359007 )
Change subject: Revert "Test elastic2020 does not fall out of cluster"
......................................................................
Revert "Test elastic2020 does not fall out of cluster"
Send search traffic back to eqiad now that we have validated the robustness
of elastic2020.
This reverts commit eedfec36b892ac8dd9120c9d1b58af8c9b089960.
Bug: T149006
Change-Id: I356dd20af3bc5dada81bf1a81b8ec2b698d1228a
---
M tests/cirrusTest.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 3 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 638b555..042ac91 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -10,7 +10,7 @@
$this->assertArrayNotHasKey( 'wgCirrusSearchServers', $config );
$this->assertArrayHasKey( 'wgCirrusSearchClusters', $config );
$this->assertArrayHasKey( 'wgCirrusSearchDefaultCluster',
$config );
- $this->assertEquals( 'codfw',
$config['wgCirrusSearchDefaultCluster'] );
+ $this->assertEquals( 'unittest',
$config['wgCirrusSearchDefaultCluster'] );
$this->assertCount( 2, $config['wgCirrusSearchClusters'] );
// testwiki writes to eqiad and codfw
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index f05d8d7..e66922c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17680,8 +17680,7 @@
// $wgTranslateTranslationDefaultService in CommonSettings.php if you plan to
// bring down a specific cluster.
'wmgCirrusSearchDefaultCluster' => [
- // T149006: Test elastic2020 does not fall out of cluster
- 'default' => 'codfw',
+ 'default' => 'local',
],
'wmgCirrusSearchClusterOverrides' => [
--
To view, visit https://gerrit.wikimedia.org/r/359007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I356dd20af3bc5dada81bf1a81b8ec2b698d1228a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Catrope <r...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
