Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: jobrunner/hhvm: disable perf maps, turn off jit
......................................................................


jobrunner/hhvm: disable perf maps, turn off jit

* Move Eval.PerfPidMap = false back to HDF file / syntax
  Upstream bug: https://github.com/facebook/hhvm/issues/2761
* Set jit = false; not beneficial for short-lived CLI scripts.

Change-Id: I14371adef60572c0fe19d30a55fd15fd1cb45f99
---
M modules/mediawiki/files/hhvm/jobrunner.hhvm.hdf
M modules/mediawiki/templates/hhvm/hhvm.ini.erb
2 files changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/mediawiki/files/hhvm/jobrunner.hhvm.hdf 
b/modules/mediawiki/files/hhvm/jobrunner.hhvm.hdf
index b59fed1..d934199 100644
--- a/modules/mediawiki/files/hhvm/jobrunner.hhvm.hdf
+++ b/modules/mediawiki/files/hhvm/jobrunner.hhvm.hdf
@@ -1,3 +1,7 @@
+Eval {
+  PerfPidMap = false
+}
+
 DynamicExtensions {
   * = fss.so
   * = luasandbox.so
diff --git a/modules/mediawiki/templates/hhvm/hhvm.ini.erb 
b/modules/mediawiki/templates/hhvm/hhvm.ini.erb
index 4a256b5..9598252 100644
--- a/modules/mediawiki/templates/hhvm/hhvm.ini.erb
+++ b/modules/mediawiki/templates/hhvm/hhvm.ini.erb
@@ -12,11 +12,10 @@
 hhvm.enable_obj_destruct_call = true
 
 ; JIT
-hhvm.jit = true
+hhvm.jit = false
 hhvm.jit_afrozen_size = 100000000
 
 ; Logging
-hhvm.eval.perf_pid_map = false
 hhvm.log.always_log_unhandled_exceptions = true
 hhvm.log.level = Error
 hhvm.log.runtime_error_reporting_level = 8191

-- 
To view, visit https://gerrit.wikimedia.org/r/149900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I14371adef60572c0fe19d30a55fd15fd1cb45f99
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[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

Reply via email to