jenkins-bot has submitted this change and it was merged.
Change subject: CirrusSearch will only use poolcounter if enabled.
......................................................................
CirrusSearch will only use poolcounter if enabled.
Change-Id: I2a9a116d7da3b78e4191514ec6405c3b56e5be34
---
M wmf-config/CirrusSearch-common.php
1 file changed, 14 insertions(+), 13 deletions(-)
Approvals:
Demon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index 4b1c50b..2778212 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -14,19 +14,20 @@
require_once( "$IP/extensions/CirrusSearch/CirrusSearch.php" );
$wgSearchType = 'CirrusSearch';
-$wgPoolCounterConf['CirrusSearch-Update'] = array(
- 'class' => 'PoolCounter_Client',
- 'timeout' => 120, // wait timeout in seconds
- 'workers' => 20, // maximum number of active threads in each pool
- 'maxqueue' => 200, // maximum number of total threads in each pool
-);
-$wgPoolCounterConf['CirrusSearch-Search'] = array(
- 'class' => 'PoolCounter_Client',
- 'timeout' => 30, // wait timeout in seconds
- 'workers' => 50, // maximum number of active threads in each pool
- 'maxqueue' => 10, // maximum number of total threads in each pool
-);
-
+if ( $wmgUsePoolCounter ) {
+ $wgPoolCounterConf['CirrusSearch-Update'] = array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 120, // wait timeout in seconds
+ 'workers' => 20, // maximum number of active threads in each
pool
+ 'maxqueue' => 200, // maximum number of total threads in each
pool
+ );
+ $wgPoolCounterConf['CirrusSearch-Search'] = array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 30, // wait timeout in seconds
+ 'workers' => 50, // maximum number of active threads in each
pool
+ 'maxqueue' => 10, // maximum number of total threads in each
pool
+ );
+}
# Load per realm specific configuration, either:
# - CirrusSearch-labs.php
--
To view, visit https://gerrit.wikimedia.org/r/76620
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a9a116d7da3b78e4191514ec6405c3b56e5be34
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
