jenkins-bot has submitted this change and it was merged.
Change subject: poolcounter: add support for codfw
......................................................................
poolcounter: add support for codfw
Bug: T91754
Change-Id: Ic1a0d2c3133843055290067fbfbae76a39dc60f5
---
M wmf-config/CommonSettings.php
A wmf-config/PoolCounterSettings-codfw.php
A wmf-config/PoolCounterSettings-common.php
M wmf-config/PoolCounterSettings-eqiad.php
4 files changed, 69 insertions(+), 55 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, but someone else must approve
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 84f1231..393edb3 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -856,7 +856,8 @@
// PoolCounter
if ( $wmgUsePoolCounter ) {
- include( getRealmSpecificFilename(
"$wmfConfigDir/PoolCounterSettings.php" ) );
+ # Cluster-dependent files for poolcounter are included from the common
file
+ include( "$wmfConfigDir/PoolCounterSettings-common.php" );
}
if ( $wmgUseScore ) {
diff --git a/wmf-config/PoolCounterSettings-codfw.php
b/wmf-config/PoolCounterSettings-codfw.php
new file mode 100644
index 0000000..09ee0c8
--- /dev/null
+++ b/wmf-config/PoolCounterSettings-codfw.php
@@ -0,0 +1,10 @@
+<?php
+
+# For now using eqiad PC servers
+$wgPoolCountClientConf = array(
+ 'servers' => array(
+ '10.64.0.179',
+ '10.64.16.152'
+ ),
+ 'timeout' => 0.5
+);
diff --git a/wmf-config/PoolCounterSettings-common.php
b/wmf-config/PoolCounterSettings-common.php
new file mode 100644
index 0000000..ae8beee
--- /dev/null
+++ b/wmf-config/PoolCounterSettings-common.php
@@ -0,0 +1,57 @@
+<?php
+
+if ( !defined( 'MEDIAWIKI' ) ) exit( 1 );
+
+include( "$IP/extensions/PoolCounter/PoolCounterClient.php" );
+
+$wgPoolCounterConf = array(
+ 'ArticleView' => array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 15,
+ 'workers' => 2,
+ 'maxqueue' => 100
+ ),
+ 'CirrusSearch-Search' => array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 15,
+ 'workers' => 432,
+ 'maxqueue' => 600,
+ ),
+ // Super common and mostly fast
+ 'CirrusSearch-Prefix' => array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 15,
+ 'workers' => 432,
+ 'maxqueue' => 600,
+ ),
+ // Regex searches are much heavier then regular searches so we limit the
+ // concurrent number.
+ 'CirrusSearch-Regex' => array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 60,
+ 'workers' => 10,
+ 'maxqueue' => 20,
+ ),
+ // These should be very very fast and reasonably rare
+ 'CirrusSearch-NamespaceLookup' => array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 5,
+ 'workers' => 50,
+ 'maxqueue' => 200,
+ ),
+ 'FileRender' => array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 8,
+ 'workers' => 2,
+ 'maxqueue' => 100
+ ),
+ 'FileRenderExpensive' => array(
+ 'class' => 'PoolCounter_Client',
+ 'timeout' => 8,
+ 'workers' => 2,
+ 'slots' => 8,
+ 'maxqueue' => 100
+ ),
+);
+
+require( getRealmSpecificFilename( "$wmfConfigDir/PoolCounterSettings.php" ) );
diff --git a/wmf-config/PoolCounterSettings-eqiad.php
b/wmf-config/PoolCounterSettings-eqiad.php
index be05f43..8aaebe5 100644
--- a/wmf-config/PoolCounterSettings-eqiad.php
+++ b/wmf-config/PoolCounterSettings-eqiad.php
@@ -1,63 +1,9 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) exit( 1 );
-
-include( "$IP/extensions/PoolCounter/PoolCounterClient.php" );
-
$wgPoolCountClientConf = array(
'servers' => array(
'10.64.0.179',
'10.64.16.152'
),
'timeout' => 0.5
-);
-
-$wgPoolCounterConf = array(
- 'ArticleView' => array(
- 'class' => 'PoolCounter_Client',
- 'timeout' => 15,
- 'workers' => 2,
- 'maxqueue' => 100
- ),
- 'CirrusSearch-Search' => array(
- 'class' => 'PoolCounter_Client',
- 'timeout' => 15,
- 'workers' => 432,
- 'maxqueue' => 600,
- ),
- // Super common and mostly fast
- 'CirrusSearch-Prefix' => array(
- 'class' => 'PoolCounter_Client',
- 'timeout' => 15,
- 'workers' => 432,
- 'maxqueue' => 600,
- ),
- // Regex searches are much heavier then regular searches so we limit the
- // concurrent number.
- 'CirrusSearch-Regex' => array(
- 'class' => 'PoolCounter_Client',
- 'timeout' => 60,
- 'workers' => 10,
- 'maxqueue' => 20,
- ),
- // These should be very very fast and reasonably rare
- 'CirrusSearch-NamespaceLookup' => array(
- 'class' => 'PoolCounter_Client',
- 'timeout' => 5,
- 'workers' => 50,
- 'maxqueue' => 200,
- ),
- 'FileRender' => array(
- 'class' => 'PoolCounter_Client',
- 'timeout' => 8,
- 'workers' => 2,
- 'maxqueue' => 100
- ),
- 'FileRenderExpensive' => array(
- 'class' => 'PoolCounter_Client',
- 'timeout' => 8,
- 'workers' => 2,
- 'slots' => 8,
- 'maxqueue' => 100
- ),
);
--
To view, visit https://gerrit.wikimedia.org/r/197495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1a0d2c3133843055290067fbfbae76a39dc60f5
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
