Gehel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/282164
Change subject: Revert "Switching CirrusSearch to codfw Elasticsearch cluster"
......................................................................
Revert "Switching CirrusSearch to codfw Elasticsearch cluster"
This reverts commit 13f51abe30a3f8647ebf24af8927e116a40fcc01.
Change-Id: Ifcf418915481fda91cf4caf3fcdd5efb5371466f
---
M tests/cirrusTest.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/64/282164/1
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index b13c3d9..87e3763 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -10,8 +10,7 @@
$this->assertArrayNotHasKey( 'wgCirrusSearchServers', $config );
$this->assertArrayHasKey( 'wgCirrusSearchClusters', $config );
$this->assertArrayHasKey( 'wgCirrusSearchDefaultCluster',
$config );
- # 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->assertEquals( 'unittest',
$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 440b764..b29213c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16066,7 +16066,7 @@
),
'wmgCirrusSearchDefaultCluster' => array(
- 'default' => 'codfw',
+ 'default' => 'local',
),
'wmgCirrusSearchWriteClusters' => array(
--
To view, visit https://gerrit.wikimedia.org/r/282164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcf418915481fda91cf4caf3fcdd5efb5371466f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gehel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
