Chad has submitted this change and it was merged.
Change subject: Move Cirrus poolcounter settings to where they belong, update
values to reflect production more
......................................................................
Move Cirrus poolcounter settings to where they belong, update values to reflect
production more
Change-Id: I47230a033d700f22621a3c6058c448891d83edaa
---
M wmf-config/CirrusSearch-common.php
M wmf-config/PoolCounterSettings-eqiad.php
M wmf-config/PoolCounterSettings-pmtpa.php
3 files changed, 24 insertions(+), 15 deletions(-)
Approvals:
Chad: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index 0b93555..77f8097 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -24,21 +24,6 @@
$wgEnableLucenePrefixSearch = false;
}
-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
# - CirrusSearch-production.php
diff --git a/wmf-config/PoolCounterSettings-eqiad.php
b/wmf-config/PoolCounterSettings-eqiad.php
index bf0e273..0495ac6 100644
--- a/wmf-config/PoolCounterSettings-eqiad.php
+++ b/wmf-config/PoolCounterSettings-eqiad.php
@@ -25,5 +25,17 @@
'workers' => 78,
'maxqueue' => 600
),
+ 'CirrusSearch-Update' => array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 120,
+ 'workers' => 20,
+ 'maxqueue' => 200,
+ ),
+ 'CirrusSearch-Search' => array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 15,
+ 'workers' => 10,
+ 'maxqueue' => 100,
+ ),
);
diff --git a/wmf-config/PoolCounterSettings-pmtpa.php
b/wmf-config/PoolCounterSettings-pmtpa.php
index 876138d..6339772 100644
--- a/wmf-config/PoolCounterSettings-pmtpa.php
+++ b/wmf-config/PoolCounterSettings-pmtpa.php
@@ -25,5 +25,17 @@
'workers' => 78,
'maxqueue' => 600
),
+ 'CirrusSearch-Update' => array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 120,
+ 'workers' => 20,
+ 'maxqueue' => 200,
+ ),
+ 'CirrusSearch-Search' => array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 15,
+ 'workers' => 78,
+ 'maxqueue' => 400,
+ ),
);
--
To view, visit https://gerrit.wikimedia.org/r/92808
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47230a033d700f22621a3c6058c448891d83edaa
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
