Ori.livneh has submitted this change and it was merged.

Change subject: Revert "hhvm: remove jemalloc profiling config due to a bug in 
HHVM"
......................................................................


Revert "hhvm: remove jemalloc profiling config due to a bug in HHVM"

I confirmed that there is no bug. I simply had a spurious /etc/malloc.conf on 
mw1114.

This reverts commit af0def74bb63f3389e5ff1c83e185e0becafa512.

Change-Id: I9897819edc6b55d959af5f35a70cb83333498389
---
M modules/hhvm/files/hhvm.conf
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/hhvm/files/hhvm.conf b/modules/hhvm/files/hhvm.conf
index 565e6a2..0e7378c 100644
--- a/modules/hhvm/files/hhvm.conf
+++ b/modules/hhvm/files/hhvm.conf
@@ -27,9 +27,7 @@
 # endpoints of the admin server. See the jemalloc(3) man page for details.
 # You can override these options by assigning MALLOC_CONF a different value
 # in /etc/default/hhvm.
-# BUG: apparently, heap profiling is on even with prof_active is
-# false, although it's not intended to be. 
-#env MALLOC_CONF="prof:true,prof_active:false"
+env MALLOC_CONF="prof:true,prof_active:false"
 
 script
   . /etc/default/hhvm

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9897819edc6b55d959af5f35a70cb83333498389
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to