Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266511
Change subject: Reduce poolcounter configuration complexity
......................................................................
Reduce poolcounter configuration complexity
Bug: T114273
Change-Id: I6a4f49c7ebf0227d95c9fc00e1bf65687bb54ab0
---
D wmf-config/PoolCounterSettings-codfw.php
M wmf-config/PoolCounterSettings-common.php
D wmf-config/PoolCounterSettings-eqiad.php
A wmf-config/PoolCounterSettings-production.php
M wmf-config/ProductionServices.php
5 files changed, 22 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/11/266511/1
diff --git a/wmf-config/PoolCounterSettings-codfw.php
b/wmf-config/PoolCounterSettings-codfw.php
deleted file mode 100644
index 88704a6..0000000
--- a/wmf-config/PoolCounterSettings-codfw.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-# For now using eqiad PC servers
-$wgPoolCountClientConf = array(
- 'servers' => array(
- '10.192.16.124',
- '10.192.0.121'
- ),
- 'timeout' => 0.5,
- 'connect_timeout' => 0.01,
-);
diff --git a/wmf-config/PoolCounterSettings-common.php
b/wmf-config/PoolCounterSettings-common.php
index c7f4f7e..eeacdfe 100644
--- a/wmf-config/PoolCounterSettings-common.php
+++ b/wmf-config/PoolCounterSettings-common.php
@@ -71,6 +71,4 @@
);
}
-require $wmfRealm === 'labs'
- ? "{$wmfConfigDir}/PoolCounterSettings-labs.php"
- : "{$wmfConfigDir}/PoolCounterSettings-{$wmfDatacenter}.php";
+require "{$wmfConfigDir}/PoolCounterSettings-{$wmfRealm}.php";
diff --git a/wmf-config/PoolCounterSettings-eqiad.php
b/wmf-config/PoolCounterSettings-eqiad.php
deleted file mode 100644
index 2d698f2..0000000
--- a/wmf-config/PoolCounterSettings-eqiad.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-$wgPoolCountClientConf = array(
- 'servers' => array(
- '10.64.0.179',
- '10.64.16.152'
- ),
- 'timeout' => 0.5
-);
-
-# Enable connect_timeout for testwiki
-if ($wgDBname == 'testwiki' ) {
- $wgPoolCountClientConf['connect_timeout'] = 0.01;
-}
diff --git a/wmf-config/PoolCounterSettings-production.php
b/wmf-config/PoolCounterSettings-production.php
new file mode 100644
index 0000000..5aaf09f
--- /dev/null
+++ b/wmf-config/PoolCounterSettings-production.php
@@ -0,0 +1,11 @@
+<?php
+
+$wgPoolCountClientConf = array(
+ 'servers' => $wmfLocalServices['poolcounter'],
+ 'timeout' => 0.5
+);
+
+# Enable connect_timeout for testwiki
+if ( $wgDBname == 'testwiki' || $wmfRealm == 'codfw' ) {
+ $wgPoolCountClientConf['connect_timeout'] = 0.01;
+}
diff --git a/wmf-config/ProductionServices.php
b/wmf-config/ProductionServices.php
index f40e6a9..f317ef9 100644
--- a/wmf-config/ProductionServices.php
+++ b/wmf-config/ProductionServices.php
@@ -62,6 +62,16 @@
$wmfAllServices['eqiad']['restbase'] = "http://10.2.2.17:7231";;
$wmfAllServices['codfw']['restbase'] = "http://10.2.1.17:7231";;
+### Poolcounter
+$wmfAllServices['eqiad']['poolcounter'] = array(
+ '10.64.0.179',
+ '10.64.16.152',
+);
+$wmfAllServices['codfw']['poolcounter'] = array(
+ '10.192.16.124',
+ '10.192.0.121',
+);
+
# Shorthand when we have no master-slave situation to keep into account
$wmfLocalServices = $wmfAllServices[$wmfDatacenter];
--
To view, visit https://gerrit.wikimedia.org/r/266511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a4f49c7ebf0227d95c9fc00e1bf65687bb54ab0
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
