Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188531
Change subject: mediawiki: use lru pcre cache for all mediawiki hhvm
installations
......................................................................
mediawiki: use lru pcre cache for all mediawiki hhvm installations
This will be done after the jobrunners have been upgraded as well
Change-Id: Ia8455cea452cb8ea6a9aecb172cc94292845ff2e
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
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 modules/mediawiki/manifests/hhvm.pp
5 files changed, 1 insertion(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/188531/1
diff --git a/hieradata/role/common/mediawiki/appserver.yaml
b/hieradata/role/common/mediawiki/appserver.yaml
index 5978b6c..9aff32e 100644
--- a/hieradata/role/common/mediawiki/appserver.yaml
+++ b/hieradata/role/common/mediawiki/appserver.yaml
@@ -2,6 +2,3 @@
role::mediawiki::webserver::pool: apaches
admin::groups:
- deployment
-hhvm::extra::fcgi:
- hhvm:
- pcre_cache_type: lru
diff --git a/hieradata/role/common/mediawiki/appserver/api.yaml
b/hieradata/role/common/mediawiki/appserver/api.yaml
index e842b30..149bb0f 100644
--- a/hieradata/role/common/mediawiki/appserver/api.yaml
+++ b/hieradata/role/common/mediawiki/appserver/api.yaml
@@ -2,6 +2,3 @@
role::mediawiki::webserver::pool: api
admin::groups:
- deployment
-hhvm::extra::fcgi:
- hhvm:
- pcre_cache_type: lru
diff --git a/hieradata/role/common/mediawiki/appserver/canary_api.yaml
b/hieradata/role/common/mediawiki/appserver/canary_api.yaml
index 76062d8..b91e288 100644
--- a/hieradata/role/common/mediawiki/appserver/canary_api.yaml
+++ b/hieradata/role/common/mediawiki/appserver/canary_api.yaml
@@ -4,6 +4,3 @@
mediawiki::web::mpm_config::mpm: worker
admin::groups:
- deployment
-hhvm::extra::fcgi:
- hhvm:
- pcre_cache_type: lru
diff --git a/hieradata/role/common/mediawiki/canary_appserver.yaml
b/hieradata/role/common/mediawiki/canary_appserver.yaml
index b384935..6c34536 100644
--- a/hieradata/role/common/mediawiki/canary_appserver.yaml
+++ b/hieradata/role/common/mediawiki/canary_appserver.yaml
@@ -4,6 +4,3 @@
mediawiki::web::mpm_config::mpm: worker
admin::groups:
- deployment
-hhvm::extra::fcgi:
- hhvm:
- pcre_cache_type: lru
diff --git a/modules/mediawiki/manifests/hhvm.pp
b/modules/mediawiki/manifests/hhvm.pp
index 6f1b344..22777ca 100644
--- a/modules/mediawiki/manifests/hhvm.pp
+++ b/modules/mediawiki/manifests/hhvm.pp
@@ -37,6 +37,7 @@
request_init_document =>
'/srv/mediawiki/wmf-config/HHVMRequestInit.php',
thread_count => $max_threads,
},
+ pcre_cache_type => 'lru',
},
},
}
--
To view, visit https://gerrit.wikimedia.org/r/188531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8455cea452cb8ea6a9aecb172cc94292845ff2e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
