Yaniv Bronhaim has uploaded a new change for review. Change subject: Moving coredump configuration to common script ......................................................................
Moving coredump configuration to common script Change-Id: I763889c9b91676582a58aa238d47ccc8dac9375e Signed-off-by: Yaniv Bronhaim <[email protected]> --- M init/systemd/vdsmd.service.in M init/sysvinit/vdsmd.init.in M init/vdsmd_init_common.sh.in 3 files changed, 15 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/19889/1 diff --git a/init/systemd/vdsmd.service.in b/init/systemd/vdsmd.service.in index f14ec17..94be97a 100644 --- a/init/systemd/vdsmd.service.in +++ b/init/systemd/vdsmd.service.in @@ -6,6 +6,7 @@ [Service] Type=simple +LimitCORE=infinity EnvironmentFile=-/etc/sysconfig/vdsm ExecStartPre=@LIBEXECDIR@/vdsmd_init_common.sh --pre-start ExecStart=@VDSMDIR@/daemonAdapter -0 /dev/null -1 /dev/null -2 /dev/null "@VDSMDIR@/vdsm" diff --git a/init/sysvinit/vdsmd.init.in b/init/sysvinit/vdsmd.init.in index 5ccdc3d..2fb4d0d 100755 --- a/init/sysvinit/vdsmd.init.in +++ b/init/sysvinit/vdsmd.init.in @@ -22,13 +22,9 @@ ### END INIT INFO VDSM_BIN="@VDSMDIR@/vdsm" -CONF_FILE="@CONFDIR@/vdsm.conf" -GETCONFITEM="@VDSMDIR@/get-conf-item" prog=vdsm PIDFILE=@VDSMRUNDIR@/vdsmd.pid RESPAWNPIDFILE=@VDSMRUNDIR@/respawn.pid -CORE_DUMP_PATH="/var/log/core/core.%p.%t.dump" -CORE_PATTERN="/proc/sys/kernel/core_pattern" NEEDED_SERVICES="iscsid multipathd rpcbind ntpd wdmd sanlock network libvirtd supervdsmd" CONFLICTING_SERVICES="libvirt-guests ksmtuned" @@ -37,9 +33,6 @@ NICE_LOWEST=-20 VDSMD_INIT_COMMON="@LIBEXECDIR@/vdsmd_init_common.sh" RETVAL=0 - -is_coredump="$("${GETCONFITEM}" "${CONF_FILE}" vars core_dump_enable false | tr A-Z a-z)" -[ "${is_coredump}" != "true" ] && is_coredump=false SYSTEMCTL_SKIP_REDIRECT=true @@ -122,10 +115,6 @@ start() { test_already_running && return 0 - if [ "${is_coredump}" = "true" ]; then - export DAEMON_COREFILE_LIMIT=unlimited - echo "${CORE_DUMP_PATH}" > "${CORE_PATTERN}" - fi shutdown_conflicting_srv "${CONFLICTING_SERVICES}" || return 1 start_needed_srv "${NEEDED_SERVICES}" || return 1 "${VDSMD_INIT_COMMON}" --pre-start || return 1 diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in index f81589c..33094a0 100644 --- a/init/vdsmd_init_common.sh.in +++ b/init/vdsmd_init_common.sh.in @@ -20,9 +20,22 @@ VDSM_TOOL="@BINDIR@/vdsm-tool" prog=vdsm +CONF_FILE="@CONFDIR@/vdsm.conf" +GETCONFITEM="@VDSMDIR@/get-conf-item" +CORE_DUMP_PATH="/var/log/core/core.%p.%t.dump" +CORE_PATTERN="/proc/sys/kernel/core_pattern" +is_coredump="$("${GETCONFITEM}" "${CONF_FILE}" vars core_dump_enable false | tr A-Z a-z)" +[ "${is_coredump}" != "true" ] && is_coredump=false #### pre-start tasks #### +task_configure_coredump() { + if [ "${is_coredump}" = "true" ]; then + export DAEMON_COREFILE_LIMIT=unlimited + echo "${CORE_DUMP_PATH}" > "${CORE_PATTERN}" + fi +} + task_run_init_hooks(){ "@PYTHON@" "@VDSMDIR@/hooks.pyc" before_vdsm_start } @@ -206,6 +219,7 @@ case "$1" in --pre-start) run_tasks " \ + configure_coredump \ run_init_hooks \ gencerts \ check_libvirt_configure \ -- To view, visit http://gerrit.ovirt.org/19889 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I763889c9b91676582a58aa238d47ccc8dac9375e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
