jenkins-bot has submitted this change and it was merged.
Change subject: [cirrus] Activate BM25 on top 10 wikis: Step 2 (take 2)
......................................................................
[cirrus] Activate BM25 on top 10 wikis: Step 2 (take 2)
Once codfw has been reindex we can switch all traffic there
with the new config.
Completion queries are still routed to eqiad.
NOTE: we think that If7452e0d12dd0cb3d3fed36106708e5a0f95c41d
will fix the errors that spammed the logs and caused the
patch to be reverted.
This reverts commit 07354ba8f4ac615e993b2fb184d62b98b9360e39.
Bug: T147508
Depends-On: If7452e0d12dd0cb3d3fed36106708e5a0f95c41d
Change-Id: Icf92d6785f9cc67d503faf822bfa3a6f16a45534
---
M wmf-config/InitialiseSettings.php
1 file changed, 46 insertions(+), 32 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 01e4b9d..7868e70 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16613,6 +16613,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' => [
@@ -16639,12 +16663,6 @@
'wmgCirrusSearchPreferRecentDefaultDecayPortion' => [
'default' => 0,
'wikinews' => .6,
-],
-
-// TODO: remove (handled by wmgCirrusSearchRescoreProfile)
-'wmgCirrusSearchBoostLinks' => [
- 'default' => true,
- 'commonswiki' => false,
],
'wmgCirrusSearchWeightsOverrides' => [
@@ -16675,40 +16693,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: merged
Gerrit-Change-Id: Icf92d6785f9cc67d503faf822bfa3a6f16a45534
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
