[MediaWiki-commits] [Gerrit] Revert "Send wmf.4 search and ttmserver traffic to codfw" - change (operations/mediawiki-config)

[Gehel (Code Review)]

Gehel has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/292938

Change subject: Revert "Send wmf.4 search and ttmserver traffic to codfw"
......................................................................

Revert "Send wmf.4 search and ttmserver traffic to codfw"

This reverts commit 869a7f9b278394a5d7146f0c03100dbe425dcc92.

Change-Id: Ic79b742359173d19998524795804a57b0f28d04e
---
M wmf-config/CirrusSearch-common.php
M wmf-config/CirrusSearch-production.php
M wmf-config/CommonSettings.php
3 files changed, 5 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/38/292938/1

diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index 41453db..7eb218c 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -23,10 +23,7 @@
 
 # Set up the the default cluster to send queries to,
 # and the list of clusters to write to.
-if ( substr($IP, -12 ) === '1.28.0-wmf.4' ) {
-       // temporary hack for the elasticsearch 2.3 rollout
-       $wgCirrusSearchDefaultCluster = 'codfw';
-} elseif ( $wmgCirrusSearchDefaultCluster === 'local' ) {
+if ( $wmgCirrusSearchDefaultCluster === 'local' ) {
        $wgCirrusSearchDefaultCluster = $wmfDatacenter;
 } else {
        $wgCirrusSearchDefaultCluster = $wmgCirrusSearchDefaultCluster;
diff --git a/wmf-config/CirrusSearch-production.php 
b/wmf-config/CirrusSearch-production.php
index a00392c..3f307d4 100644
--- a/wmf-config/CirrusSearch-production.php
+++ b/wmf-config/CirrusSearch-production.php
@@ -122,6 +122,9 @@
 
 $wgCirrusSearchRecycleCompletionSuggesterIndex = 
$wmgCirrusSearchRecycleCompletionSuggesterIndex;
 
+// repoint morelike queries to codfw
+$wgCirrusSearchMoreLikeThisCluster = 'eqiad';
+
 // cache morelike queries to ObjectCache for 24 hours
 $wgCirrusSearchMoreLikeThisTTL = 86400;
 
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index aebcaa1..7075d45 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2366,12 +2366,7 @@
        $wgExtraLanguageNames['qqq'] = 'Message documentation'; # No linguistic 
content. Used for documenting messages
 
        // TODO: proper integration with new CirrusSearch config
-       if ( substr( $IP, -12 ) === '1.28.0-wmf.4' ) {
-               // temporary hack for the elasticsearch 2.3 rollout
-               $wgTranslateExtensionDefaultCluster = 'codfw';
-       } else {
-               $wgTranslateExtensionDefaultCluster = 'eqiad';
-       }
+       $wgTranslateExtensionDefaultCluster = 'eqiad';
        $wgTranslateTranslationServices = [];
        if ( $wmgUseTranslationMemory ) {
                $servers = array_map(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic79b742359173d19998524795804a57b0f28d04e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gehel <gleder...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits