Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: hhvm: actually set the timeout on normal appserver, restore on
canaries
......................................................................
hhvm: actually set the timeout on normal appserver, restore on canaries
Bug: T98489
Change-Id: I0517f5a2a2881924e8daff4c225b8cd155916920
---
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
4 files changed, 12 insertions(+), 4 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/mediawiki/appserver.yaml
b/hieradata/role/common/mediawiki/appserver.yaml
index 9f9649c..468b709 100644
--- a/hieradata/role/common/mediawiki/appserver.yaml
+++ b/hieradata/role/common/mediawiki/appserver.yaml
@@ -5,11 +5,11 @@
mediawiki::users::web: www-data
apache::mpm::mpm: worker
mediawiki::web::mpm_config::mpm: worker
-hhvm::extra::fcgi_settings:
+hhvm::extra::fcgi:
hhvm:
mysql:
connect_timeout: 3000
-hhvm::extra::cli_settings:
+hhvm::extra::cli:
hhvm:
mysql:
connect_timeout: 3000
diff --git a/hieradata/role/common/mediawiki/appserver/api.yaml
b/hieradata/role/common/mediawiki/appserver/api.yaml
index 9b8b1e9..3a8afd5 100644
--- a/hieradata/role/common/mediawiki/appserver/api.yaml
+++ b/hieradata/role/common/mediawiki/appserver/api.yaml
@@ -5,11 +5,11 @@
mediawiki::users::web: www-data
apache::mpm::mpm: worker
mediawiki::web::mpm_config::mpm: worker
-hhvm::extra::fcgi_settings:
+hhvm::extra::fcgi:
hhvm:
mysql:
connect_timeout: 3000
-hhvm::extra::cli_settings:
+hhvm::extra::cli:
hhvm:
mysql:
connect_timeout: 3000
diff --git a/hieradata/role/common/mediawiki/appserver/canary_api.yaml
b/hieradata/role/common/mediawiki/appserver/canary_api.yaml
index 3218e6f..0c7f240 100644
--- a/hieradata/role/common/mediawiki/appserver/canary_api.yaml
+++ b/hieradata/role/common/mediawiki/appserver/canary_api.yaml
@@ -7,11 +7,15 @@
mediawiki::users::web: www-data
hhvm::extra::fcgi:
hhvm:
+ mysql:
+ connect_timeout: 3000
server:
light_process_count: 5
light_process_file_prefix: /tmp/hhvm
hhvm::extra::cli:
hhvm:
+ mysql:
+ connect_timeout: 3000
server:
light_process_count: 5
light_process_file_prefix: /tmp/hhvm
diff --git a/hieradata/role/common/mediawiki/canary_appserver.yaml
b/hieradata/role/common/mediawiki/canary_appserver.yaml
index 5f335be..1d345ee 100644
--- a/hieradata/role/common/mediawiki/canary_appserver.yaml
+++ b/hieradata/role/common/mediawiki/canary_appserver.yaml
@@ -7,11 +7,15 @@
- deployment
hhvm::extra::fcgi:
hhvm:
+ mysql:
+ connect_timeout: 3000
server:
light_process_count: 5
light_process_file_prefix: /tmp/hhvm
hhvm::extra::cli:
hhvm:
+ mysql:
+ connect_timeout: 3000
server:
light_process_count: 5
light_process_file_prefix: /tmp/hhvm
--
To view, visit https://gerrit.wikimedia.org/r/215931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0517f5a2a2881924e8daff4c225b8cd155916920
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
