Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/169355
Change subject: Enable faster regex searching and fix pool counter
......................................................................
Enable faster regex searching and fix pool counter
Now that we've built the ngram index for regexes we can use it!
We fix the pool counter two ways:
1. Raise the number of concurrent regex searches. They are lower overhead
when using trigrams so we can support more of them.
2. Add pool counter for namespaces lookups. Cirrus now supports this so
we ought to have a pool counter for it.
Change-Id: Ia82c8113534879a27ed0fea83a667dc625bd459b
---
M wmf-config/CirrusSearch-common.php
M wmf-config/CirrusSearch-labs.php
M wmf-config/PoolCounterSettings-eqiad.php
3 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/55/169355/1
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index 287c5a9..dee4884 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -49,14 +49,13 @@
# Ban the hebrew plugin, it is unstable
$wgCirrusSearchBannedPlugins[] = 'elasticsearch-analysis-hebrew';
-# Build the ngram index to support fast regex matching
+# Build and use an ngram index for faster regex matching
$wgCirrusSearchWikimediaExtraPlugin = array(
'regex' => array(
'build',
- // 'use', Turn this on once it is built everywhere and remove
this from CirrusSearch-labs.php
+ 'use',
),
);
-
# Enable the "experimental" highlighter on all wikis
$wgCirrusSearchUseExperimentalHighlighter = true;
diff --git a/wmf-config/CirrusSearch-labs.php b/wmf-config/CirrusSearch-labs.php
index e43e6d7..38f0a3d 100644
--- a/wmf-config/CirrusSearch-labs.php
+++ b/wmf-config/CirrusSearch-labs.php
@@ -34,12 +34,6 @@
$wgSearchTypeAlternatives = array();
$wgCirrusSearchAllFields = array( 'build' => true, 'use' => true );
-$wgCirrusSearchWikimediaExtraPlugin = array(
- 'regex' => array(
- 'build',
- 'use',
- ),
-);
# We don't have enough nodes to support these settings in beta so just turn
# them off.
diff --git a/wmf-config/PoolCounterSettings-eqiad.php
b/wmf-config/PoolCounterSettings-eqiad.php
index 0d4acfe..3cd853f 100644
--- a/wmf-config/PoolCounterSettings-eqiad.php
+++ b/wmf-config/PoolCounterSettings-eqiad.php
@@ -36,8 +36,15 @@
'CirrusSearch-Regex' => array(
'class' => 'PoolCounter_Client',
'timeout' => 60,
- 'workers' => 2,
- 'maxqueue' => 20,
+ 'workers' => 10,
+ 'maxqueue' => 10,
+ ),
+ // These should be very very fast and reasonably rare
+ 'CirrusSearch-NamespaceLookup' => array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 5,
+ 'workers' => 50,
+ 'maxqueue' => 100,
),
'FileRender' => array(
'class' => 'PoolCounter_Client',
--
To view, visit https://gerrit.wikimedia.org/r/169355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia82c8113534879a27ed0fea83a667dc625bd459b
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
