Ori.livneh has submitted this change and it was merged.
Change subject: Revert "hhvm: make cache files management explicit in puppet"
......................................................................
Revert "hhvm: make cache files management explicit in puppet"
This reverts commit 2e763c163. No longer needed.
Change-Id: I8b0e475d8b3daae41ddfa6d462c9fe24ce37d728
---
M modules/hhvm/manifests/init.pp
M modules/mediawiki/manifests/hhvm.pp
2 files changed, 4 insertions(+), 18 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 5463681..dfb52e1 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -44,9 +44,6 @@
# [*fcgi_settings*]
# Ditto, except for FastCGI mode.
#
-# [*cache_dir*]
-# Directory where the bytecode cache is stored
-#
# === Examples
#
# class { 'hhvm':
@@ -62,7 +59,6 @@
$group = 'www-data',
$fcgi_settings = {},
$cli_settings = {},
- $cache_dir = '/run/hhvm/cache',
$base_jit_size = to_bytes('400 Mb'),
) {
requires_os('ubuntu >= trusty')
@@ -141,8 +137,6 @@
},
}
- $fcgi_cache = "${cache_dir}/fcgi.hhbc.sq3"
- $cli_cache = "${cache_dir}/cli.hhbc.sq3"
# Specify a maximum execution time of 290 wall-clock seconds.
# This is scandalously high, but we must wean ourselves from
@@ -158,7 +152,7 @@
jit_a_cold_size => $a_cold_size,
jit_a_frozen_size => $a_frozen_size,
perf_pid_map => true, # See
<http://www.brendangregg.com/perf.html#JIT%20Symbols>
- repo => { central => { path => $fcgi_cache } },
+ repo => { central => { path =>
'/var/cache/hhvm/fcgi.hhbc.sq3' } },
admin_server => { port => 9001 },
server => {
port => 9000,
@@ -178,7 +172,7 @@
jit => false,
perf_pid_map => false,
repo => {
- central => { path => $cli_cache },
+ central => { path => '/var/cache/hhvm/cli.hhbc.sq3' },
local => { mode => '--' },
}
}
@@ -204,6 +198,7 @@
mode => '0444',
notify => Service['hhvm'],
}
+
## Service
@@ -263,7 +258,7 @@
before => Service['hhvm'],
}
- file { [ '/run/hhvm', $cache_dir ]:
+ file { [ '/run/hhvm', '/var/cache/hhvm' ]:
ensure => directory,
owner => $user,
group => $group,
@@ -271,14 +266,6 @@
before => Service['hhvm'],
}
- ## Cache files
- file { [$cli_cache, $fcgi_cache]:
- ensure => present,
- owner => $user,
- group => $group,
- mode => '0644',
- before => Service['hhvm']
- }
# Prune stale symbol translation maps from /tmp. These files are
# generated by HHVM to supply `perf` with language-level context.
diff --git a/modules/mediawiki/manifests/hhvm.pp
b/modules/mediawiki/manifests/hhvm.pp
index c3fdd5f..8d78fa5 100644
--- a/modules/mediawiki/manifests/hhvm.pp
+++ b/modules/mediawiki/manifests/hhvm.pp
@@ -22,7 +22,6 @@
class { '::hhvm':
user => $::mediawiki::users::web,
group => $::mediawiki::users::web,
- cache_dir => '/var/cache/hhvm',
fcgi_settings => {
hhvm => {
xenon => {
--
To view, visit https://gerrit.wikimedia.org/r/225209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b0e475d8b3daae41ddfa6d462c9fe24ce37d728
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
