EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/277919
Change subject: Define hhvm connection pools for cirrus
......................................................................
Define hhvm connection pools for cirrus
These connection pools are used in combination with
curl_init_pooled(). They have to be configured when
the service starts up. Not entirely convinced they
should be replicated in so many hiera config files,
but not seeing a better way.
Change-Id: I9390caa638e7b094cf05695f11d9e5a5000fa3b1
---
M hieradata/role/common/mediawiki/appserver.yaml
M hieradata/role/common/mediawiki/appserver/api.yaml
M hieradata/role/common/mediawiki/appserver/canary_api.yaml
M hieradata/role/common/mediawiki/canary_appserver.yaml
M hieradata/role/common/mediawiki/jobrunner.yaml
M hieradata/role/common/mediawiki/maintenance.yaml
6 files changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/277919/1
diff --git a/hieradata/role/common/mediawiki/appserver.yaml
b/hieradata/role/common/mediawiki/appserver.yaml
index 03552ea..4d25592 100644
--- a/hieradata/role/common/mediawiki/appserver.yaml
+++ b/hieradata/role/common/mediawiki/appserver.yaml
@@ -9,10 +9,14 @@
hhvm:
mysql:
connect_timeout: 3000
+ curl:
+ namedPools: cirrus
hhvm::extra::cli:
hhvm:
mysql:
connect_timeout: 3000
+ curl:
+ namedPools: cirrus
apache::logrotate::rotate: 12
nutcracker::verbosity: "4"
diff --git a/hieradata/role/common/mediawiki/appserver/api.yaml
b/hieradata/role/common/mediawiki/appserver/api.yaml
index 7be1eed..42039d1 100644
--- a/hieradata/role/common/mediawiki/appserver/api.yaml
+++ b/hieradata/role/common/mediawiki/appserver/api.yaml
@@ -9,10 +9,14 @@
hhvm:
mysql:
connect_timeout: 3000
+ curl:
+ namedPools: cirrus
hhvm::extra::cli:
hhvm:
mysql:
connect_timeout: 3000
+ curl:
+ namedPools: cirrus
apache::logrotate::rotate: 12
nutcracker::verbosity: "4"
diff --git a/hieradata/role/common/mediawiki/appserver/canary_api.yaml
b/hieradata/role/common/mediawiki/appserver/canary_api.yaml
index f9682b5..98e9756 100644
--- a/hieradata/role/common/mediawiki/appserver/canary_api.yaml
+++ b/hieradata/role/common/mediawiki/appserver/canary_api.yaml
@@ -14,10 +14,14 @@
sql: true
sql_table: true
web: true
+ curl:
+ namedPools: cirrus
hhvm::extra::cli:
hhvm:
mysql:
connect_timeout: 3000
+ curl:
+ namedPools: cirrus
apache::logrotate::rotate: 12
nutcracker::verbosity: "4"
diff --git a/hieradata/role/common/mediawiki/canary_appserver.yaml
b/hieradata/role/common/mediawiki/canary_appserver.yaml
index e33094b..7cac3f5 100644
--- a/hieradata/role/common/mediawiki/canary_appserver.yaml
+++ b/hieradata/role/common/mediawiki/canary_appserver.yaml
@@ -14,9 +14,13 @@
sql: true
sql_table: true
web: true
+ curl:
+ namedPools: cirrus
hhvm::extra::cli:
hhvm:
mysql:
connect_timeout: 3000
+ curl:
+ namedPools: cirrus
apache::logrotate::rotate: 12
nutcracker::verbosity: "4"
diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml
b/hieradata/role/common/mediawiki/jobrunner.yaml
index 93bd460..8306419 100644
--- a/hieradata/role/common/mediawiki/jobrunner.yaml
+++ b/hieradata/role/common/mediawiki/jobrunner.yaml
@@ -11,3 +11,5 @@
nutcracker::verbosity: "4"
hhvm::extra::fcgi:
max_execution_time: 1200
+ curl:
+ namedPools: cirrus
diff --git a/hieradata/role/common/mediawiki/maintenance.yaml
b/hieradata/role/common/mediawiki/maintenance.yaml
index 48ea335..59f298f 100644
--- a/hieradata/role/common/mediawiki/maintenance.yaml
+++ b/hieradata/role/common/mediawiki/maintenance.yaml
@@ -16,3 +16,5 @@
mysql:
# Kill queries only after 1 day
read_timeout: 86400000
+ curl:
+ namedPools: cirrus
--
To view, visit https://gerrit.wikimedia.org/r/277919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9390caa638e7b094cf05695f11d9e5a5000fa3b1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
