Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105228
Change subject: Cirrus config updates
......................................................................
Cirrus config updates
New wikis: dewiki and wikibooks
BetaFeatures wikis: eswiki, frwiki, ruwiki, and ptwiki
Start using Cirrus for TitleKey on all wikis that are fully cirrus.
Change-Id: Icf18f62ba1191fd823f1d88eafb2e711593100bf
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 18 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/28/105228/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 4380d4d..04782a3 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -886,12 +886,10 @@
// Load this _after_ Lucene so Lucene's prefix search can be used
// when available (for OpenSearch suggestions and AJAX search mode)
// But note we still need TitleKey for "go" exact matches and similar.
-if ( $wmgUseTitleKey ) {
+// CirrusSearch, on the other hand, has absorbed its functionality so
+// for CirrusSearch wikis it is no longer required.
+if ( $wmgUseTitleKey && !$wmgUseCirrus ) {
include "$IP/extensions/TitleKey/TitleKey.php";
- if ( $wmgUseCirrus ) {
- array_pop( $wgExtensionFunctions );
- $wgHooks['SearchGetNearMatch'][] =
'TitleKey::searchGetNearMatch';
- }
}
wfProfileIn( "$fname-misc3" );
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 3c16c84..75dc2c0 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12634,6 +12634,7 @@
'astwiki' => true,
'bnwiki' => true,
'commonswiki' => true,
+ 'dewiki' => true,
'elwiki' => true,
'eswiki' => true,
'frwiki' => true,
@@ -12644,6 +12645,7 @@
'ptwiki' => true,
'ruwiki' => true,
'specieswiki' => true,
+ 'wikibooks' => true,
'wikidatawiki' => true,
'wikinews' => true,
'wikimania' => true,
@@ -12655,10 +12657,10 @@
'wmgCirrusIsBuilding' => array(
'default' => false,
- 'eswiki' => true,
- 'frwiki' => true,
- 'ptwiki' => true,
- 'ruwiki' => true,
+ 'dewiki' => true,
+ // It is safe to put wikibooks here because the wikibooks that are on
+ // cirrus.dblist override this.
+ 'wikibooks' => true,
),
'wmgCirrusSearchPreferRecentDefaultDecayPortion' => array(
@@ -12674,31 +12676,33 @@
),
// Shard each wiki to be about 2gb of index per shard. Changing this for a
wiki
-// requires an in place reindex. Last sized 2013-12-13. See
+// requires an in place reindex. Last full review 2013-12-13. See
//
https://wikitech.wikimedia.org/wiki/Search/New#Estimating_the_number_of_shards_required
// for estimation methodology. At this point I'm declaring we should have no
more than
-// 20 shards per index. We might go higher.
+// 20 shards per index. We might go higher but that is a tradeoff for easier
maintenance
+// at the cost of search performance.
'wmgCirrusSearchShardCount' => array(
// Most wikis are too small to be worth sharding
'default' => array( 'content' => 1, 'general' => 1 ),
'cawiki' => array( 'content' => 6, 'general' => 1 ),
// Commons is special and has a 'file' index in addition to the regular
ones.
- // File has shards at ~6GB each even with 20 of them
+ // File has shards at ~6GB each even with 20 of them.
'commonswiki' => array( 'content' => 1, 'general' => 20, 'file' => 20 ),
+ 'dewiki' => array( 'content' => 9, 'general' => 6 ), //
Estimated before deployment
'dewikisource' => array( 'content' => 2, 'general' => 1 ),
'elwiki' => array( 'content' => 2, 'general' => 1 ),
'enwikinews' => array( 'content' => 1, 'general' => 3 ),
'enwikisource' => array( 'content' => 12, 'general' => 1 ),
'enwiktionary' => array( 'content' => 4, 'general' => 1 ),
- 'eswiki' => array( 'content' => 12, 'general' => 6 ), // Estimated
before deployment
- 'frwiki' => array( 'content' => 16, 'general' => 8 ), // Estimated
before deployment
+ 'eswiki' => array( 'content' => 9, 'general' => 6 ),
+ 'frwiki' => array( 'content' => 14, 'general' => 13 ),
'frwikisource' => array( 'content' => 12, 'general' => 1 ),
'frwikitionary' => array( 'content' => 2, 'general' => 1 ),
'itwiki' => array( 'content' => 13, 'general' => 9 ),
'mgwiktionary' => array( 'content' => 2, 'general' => 1 ),
'nlwiki' => array( 'content' => 8, 'general' => 4 ),
- 'ptwiki' => array( 'content' => 8, 'general' => 4 ), // Estimated
before deployment
- 'ruwiki' => array( 'content' => 8, 'general' => 4 ), // Estimated
before deployment
+ 'ptwiki' => array( 'content' => 6, 'general' => 5 ),
+ 'ruwiki' => array( 'content' => 13, 'general' => 9 ),
'ruwiktionary' => array( 'content' => 3, 'general' => 1 ),
'wikidatawiki' => array( 'content' => 7, 'general' => 1 ),
),
--
To view, visit https://gerrit.wikimedia.org/r/105228
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf18f62ba1191fd823f1d88eafb2e711593100bf
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
