DCausse has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315298
Change subject: [cirrus] Activate BM25 on top 10 wikis: Step 2
......................................................................
[cirrus] Activate BM25 on top 10 wikis: Step 2
Once codfw has been reindex we can switch all traffic there
with the new config.
Completion queries are still routed to eqiad.
Bug: T147508
Depends-On: Ib32d0478309b6b482c6c5cf497e721545247e7e7
Change-Id: I8c3c0d02b22d04ed01bbac1a9fa93c97c34aba9d
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
2 files changed, 47 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/98/315298/1
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index 7788159..4d9c40d 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -29,6 +29,7 @@
$wgCirrusSearchDefaultCluster = $wmgCirrusSearchDefaultCluster;
}
$wgCirrusSearchWriteClusters = $wmgCirrusSearchWriteClusters;
+$wgCirrusSearchClusterOverrides = $wmgCirrusSearchClusterOverrides;
# Enable user testing
$wgCirrusSearchUserTesting = $wmgCirrusSearchUserTesting;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 992ad00..def286b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16537,6 +16537,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'],
],
'wmgCirrusSearchWriteClusters' => [
@@ -16559,12 +16583,6 @@
'wmgCirrusSearchPreferRecentDefaultDecayPortion' => [
'default' => 0,
'wikinews' => .6,
-],
-
-// TODO: remove (handled by wmgCirrusSearchRescoreProfile)
-'wmgCirrusSearchBoostLinks' => [
- 'default' => true,
- 'commonswiki' => false,
],
'wmgCirrusSearchWeightsOverrides' => [
@@ -16595,40 +16613,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,
],
// Shard each wiki to be under 2gb per shard if possible. Changing this for a
wiki
--
To view, visit https://gerrit.wikimedia.org/r/315298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c3c0d02b22d04ed01bbac1a9fa93c97c34aba9d
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
