Ori.livneh has submitted this change and it was merged.
Change subject: HHVM: keep DSO path up-to-date; rename script
......................................................................
HHVM: keep DSO path up-to-date; rename script
* Rename hhvm-debug-dump => hhvm-dump-debug (makes the purpose clearer.)
* Avoid hard-coding path to HHVM binary; gdb will find it.
* Make upstart job refresh DSO symlink.
Change-Id: I109f92543b5e4ff8d8a265e90092098ff6d99341
---
R modules/hhvm/files/hhvm-dump-debug
M modules/hhvm/files/hhvm.conf
M modules/hhvm/manifests/init.pp
3 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
Bsimmers: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/hhvm/files/hhvm-debug-dump
b/modules/hhvm/files/hhvm-dump-debug
similarity index 91%
rename from modules/hhvm/files/hhvm-debug-dump
rename to modules/hhvm/files/hhvm-dump-debug
index 4ca4a26..7a2a618 100755
--- a/modules/hhvm/files/hhvm-debug-dump
+++ b/modules/hhvm/files/hhvm-dump-debug
@@ -11,7 +11,6 @@
esac
gdb -batch -p "$PID" \
- -ex "symbol-file /usr/bin/hhvm" \
-ex "thread apply all backtrace full" \
-ex "generate-core-file /tmp/hhvm.${PID}.core" \
>"/tmp/hhvm.${PID}.bt" 2>/dev/null
diff --git a/modules/hhvm/files/hhvm.conf b/modules/hhvm/files/hhvm.conf
index 077d27b..c571c7c 100644
--- a/modules/hhvm/files/hhvm.conf
+++ b/modules/hhvm/files/hhvm.conf
@@ -5,8 +5,6 @@
start on (local-filesystems and net-device-up IFACE!=lo)
-limit core unlimited unlimited # Don't limit core dump size
-
pre-start script
[ ! -r /etc/default/hhvm ] && { stop; exit 0; }
. /etc/default/hhvm
@@ -15,6 +13,8 @@
mkdir -p -m0755 "${HHVM_LOG_DIR:=/var/log/hhvm}"
chown -R "${HHVM_USER:=www-data}:${HHVM_GROUP:=www-data}" "$HHVM_RUN_DIR"
chown -R "${HHVM_USER}:${HHVM_GROUP}" "$HHVM_LOG_DIR"
+ EXT_API_VERSION="$(/usr/bin/hhvm --version | grep -Po '(?<=Extension API:
)\d+')"
+ ( cd /usr/lib/hphp/extensions; /bin/ln -Trsf "$EXT_API_VERSION" current; )
end script
script
@@ -44,6 +44,9 @@
fi
end script
+# Impose no limit on core dump size.
+limit core unlimited unlimited
+
# HHVM performs a graceful stop on SIGHUP
# <https://github.com/facebook/hhvm/commit/91e8609>
kill signal HUP
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index dc88c7b..d273f57 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -69,7 +69,7 @@
$common_defaults = {
date => { timezone => 'UTC' },
hhvm => {
- dynamic_extension_path => '/usr/lib/hphp/extensions/20140727',
+ dynamic_extension_path => '/usr/lib/hphp/extensions/current',
enable_obj_destruct_call => true,
enable_zend_compat => true,
include_path => '.:/usr/share/php:/usr/share/pear',
@@ -192,8 +192,8 @@
before => Service['hhvm'],
}
- file { '/usr/local/sbin/hhvm-debug-dump':
- source => 'puppet:///modules/hhvm/hhvm-debug-dump',
+ file { '/usr/local/sbin/hhvm-dump-debug':
+ source => 'puppet:///modules/hhvm/hhvm-dump-debug',
owner => 'root',
group => 'root',
mode => '0555',
--
To view, visit https://gerrit.wikimedia.org/r/151980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I109f92543b5e4ff8d8a265e90092098ff6d99341
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Bsimmers <[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
