DCausse has uploaded a new change for review.

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

Change subject: [cirrus] Activate BM25 on top 10 wikis: Step 2 (take 2)
......................................................................

[cirrus] Activate BM25 on top 10 wikis: Step 2 (take 2)

This reverts commit 07354ba8f4ac615e993b2fb184d62b98b9360e39.

Change-Id: Icf92d6785f9cc67d503faf822bfa3a6f16a45534
---
M wmf-config/InitialiseSettings.php
1 file changed, 46 insertions(+), 32 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9698c64..6f8cfe5 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16612,6 +16612,30 @@
 
 'wmgCirrusSearchDefaultCluster' => [
        'default' => 'local',
+       'enwiki' => 'codfw',
+       'arwiki' => 'codfw',
+       'dewiki' => 'codfw',
+       'eswiki' => 'codfw',
+       'frwiki' => 'codfw',
+       'itwiki' => 'codfw',
+       'nlwiki' => 'codfw',
+       'ruwiki' => 'codfw',
+       'plwiki' => 'codfw',
+       'ptwiki' => 'codfw',
+],
+
+'wmgCirrusSearchClusterOverrides' => [
+       'default' => [],
+       'enwiki' => ['completion' => 'eqiad'],
+       'arwiki' => ['completion' => 'eqiad'],
+       'dewiki' => ['completion' => 'eqiad'],
+       'eswiki' => ['completion' => 'eqiad'],
+       'frwiki' => ['completion' => 'eqiad'],
+       'itwiki' => ['completion' => 'eqiad'],
+       'nlwiki' => ['completion' => 'eqiad'],
+       'ruwiki' => ['completion' => 'eqiad'],
+       'plwiki' => ['completion' => 'eqiad'],
+       'ptwiki' => ['completion' => 'eqiad'],
 ],
 
 'wmgCirrusSearchClusterOverrides' => [
@@ -16638,12 +16662,6 @@
 'wmgCirrusSearchPreferRecentDefaultDecayPortion' => [
        'default' => 0,
        'wikinews' => .6,
-],
-
-// TODO: remove (handled by wmgCirrusSearchRescoreProfile)
-'wmgCirrusSearchBoostLinks' => [
-       'default' => true,
-       'commonswiki' => false,
 ],
 
 'wmgCirrusSearchWeightsOverrides' => [
@@ -16674,40 +16692,36 @@
 'wmgCirrusSearchRescoreProfile' => [
        'default' => 'classic',
        'commonswiki' => 'classic_noboostlinks',
-       // TODO: switch to wsum_inclinks_pv
-       'enwiki' => 'classic',
-       // TODO: switch to wsum_inclinks
-       'arwiki' => 'classic',
-       'dewiki' => 'classic',
-       'eswiki' => 'classic',
-       'frwiki' => 'classic',
-       'itwiki' => 'classic',
-       'nlwiki' => 'classic',
-       'ruwiki' => 'classic',
-       'plwiki' => 'classic',
-       'ptwiki' => 'classic',
+       'enwiki' => 'wsum_inclinks_pv',
+       'arwiki' => 'wsum_inclinks',
+       'dewiki' => 'wsum_inclinks',
+       'eswiki' => 'wsum_inclinks',
+       'frwiki' => 'wsum_inclinks',
+       'itwiki' => 'wsum_inclinks',
+       'nlwiki' => 'wsum_inclinks',
+       'ruwiki' => 'wsum_inclinks',
+       'plwiki' => 'wsum_inclinks',
+       'ptwiki' => 'wsum_inclinks',
 ],
 
 'wmgCirrusSearchFullTextQueryBuilderProfile' => [
        'default' => 'default',
-       // TODO: switch to perfield_builder
-       'enwiki' => 'default',
-       'arwiki' => 'default',
-       'dewiki' => 'default',
-       'eswiki' => 'default',
-       'frwiki' => 'default',
-       'itwiki' => 'default',
-       'nlwiki' => 'default',
-       'ruwiki' => 'default',
-       'plwiki' => 'default',
-       'ptwiki' => 'default',
+       'enwiki' => 'perfield_builder',
+       'arwiki' => 'perfield_builder',
+       'dewiki' => 'perfield_builder',
+       'eswiki' => 'perfield_builder',
+       'frwiki' => 'perfield_builder',
+       'itwiki' => 'perfield_builder',
+       'nlwiki' => 'perfield_builder',
+       'ruwiki' => 'perfield_builder',
+       'plwiki' => 'perfield_builder',
+       'ptwiki' => 'perfield_builder',
 ],
 
 'wmgCirrusSearchIgnoreOnWikiBoostTemplates' => [
        'default' => false,
-       // TODO: turn on (on wiki boost templates have to high boosts for
-       // enwiki)
-       'enwiki' => false,
+       // on wiki boost templates have to high boosts for enwiki
+       'enwiki' => true,
 ],
 
 'wmgCirrusSearchLanguageWeight' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf92d6785f9cc67d503faf822bfa3a6f16a45534
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DCausse <dcau...@wikimedia.org>

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

Reply via email to