jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/378850 )

Change subject: Switch elasticsearch active cluster to codfw
......................................................................


Switch elasticsearch active cluster to codfw

Needed to run a hard restart on eqiad once codfw is done.

Change-Id: I13a5e247d531f3c8e5a7df80c4ca7bf05d905ff0
---
M tests/cirrusTest.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  EBernhardson: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dereckson: Looks good to me, approved



diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 66820d4..d134a42 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( 'unittest', 
$config['wgCirrusSearchDefaultCluster'] );
+               $this->assertEquals( 'codfw', 
$config['wgCirrusSearchDefaultCluster'] );
                $this->assertCount( 2, $config['wgCirrusSearchClusters'] );
 
                // testwiki writes to eqiad and codfw
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e5c84ff..06c9773 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2523,7 +2523,7 @@
        if ( $wmgUseTranslationMemory ) {
                // Switch to 'eqiad' or 'codfw' if you plan to bring down
                // the elastic cluster equals to $wmfDatacenter
-               $wgTranslateTranslationDefaultService = $wmfDatacenter;
+               $wgTranslateTranslationDefaultService = 'codfw';
 
                // If the downtime is long (> 10mins) consider disabling
                // mirroring in this var to avoid logspam about ttm updates
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 0df27d7..b71b598 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18045,7 +18045,7 @@
 // $wgTranslateTranslationDefaultService in CommonSettings.php if you plan to
 // bring down a specific cluster.
 'wmgCirrusSearchDefaultCluster' => [
-       'default' => 'local',
+       'default' => 'codfw',
 ],
 
 'wmgCirrusSearchClusterOverrides' => [

-- 
To view, visit https://gerrit.wikimedia.org/r/378850
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I13a5e247d531f3c8e5a7df80c4ca7bf05d905ff0
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DCausse <[email protected]>
Gerrit-Reviewer: Dereckson <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Urbanecm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to