vdsm-patches September 2013

vdsm-patches@lists.fedorahosted.org

49 participants
443 discussions

Change in vdsm[master]: Related to BZ# - One shot prepare.
by ewarszaw＠redhat.com 09 Sep '13

09 Sep '13

Eduardo has uploaded a new change for review. Change subject: Related to BZ# - One shot prepare. ...................................................................... Related to BZ# - One shot prepare. The number of storage accesses is reduced to 1 or none instead of the recursive volume images produces. Change-Id: Id47db9c53199385dd5d08586e4782ea23885eb72 Signed-off-by: Eduardo <ewarszaw(a)redhat.com> --- M vdsm/storage/hsm.py 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/4220/1 -- To view, visit http://gerrit.ovirt.org/4220 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id47db9c53199385dd5d08586e4782ea23885eb72 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

7 47

Change in vdsm[master]: Use shared lock for setStorageDomainDescription command
by sgotliv＠redhat.com 09 Sep '13

09 Sep '13

Sergey Gotliv has uploaded a new change for review. Change subject: Use shared lock for setStorageDomainDescription command ...................................................................... Use shared lock for setStorageDomainDescription command The "setStorageDomainDescription" command can be executed during other long running tasks therefore it should hold shared lock instead of exclusive. Change-Id: Idca7b7b6642c222d88a6cd2a94d4033c0c3ef70b Bug-Url: https://bugzilla.redhat.com/819316 Signed-off-by: Sergey Gotliv <sgotliv(a)redhat.com> --- M vdsm/storage/hsm.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/17198/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index b49f419..432cc09 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -2684,7 +2684,7 @@ se.StorageDomainActionError( "sdUUID=%s, description=%s" % (sdUUID, description))) dom = sdCache.produce(sdUUID=sdUUID) - vars.task.getExclusiveLock(STORAGE, sdUUID) + vars.task.getSharedLock(STORAGE, sdUUID) dom.setDescription(descr=description) @public -- To view, visit http://gerrit.ovirt.org/17198 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idca7b7b6642c222d88a6cd2a94d4033c0c3ef70b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Sergey Gotliv <sgotliv(a)redhat.com>

7 21

Change in vdsm[master]: Require libvirt that allows vmUpdateDevice
by Dan Kenigsberg 08 Sep '13

08 Sep '13

Dan Kenigsberg has uploaded a new change for review. Change subject: Require libvirt that allows vmUpdateDevice ...................................................................... Require libvirt that allows vmUpdateDevice Change-Id: I50b9af97887c2e00e87d34620153a82e28c2a310 Bug-Url: https://bugzilla.redhat.com/1001001 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm.spec.in 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/18937/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 9654d5e..4613b13 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -118,7 +118,7 @@ Requires: libvirt-daemon-driver-qemu %else %if 0%{?rhel} -Requires: libvirt >= 0.10.2-18.el6_4.4 +Requires: libvirt >= 0.10.2-18.el6_4.10 %else Requires: libvirt >= 1.0.2-1 %endif -- To view, visit http://gerrit.ovirt.org/18937 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I50b9af97887c2e00e87d34620153a82e28c2a310 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

3 4

Change in vdsm[master]: Packaging: libvirt plugin of selinux and sanlock usage is co...
by zhshzhou＠linux.vnet.ibm.com 07 Sep '13

07 Sep '13

Zhou Zheng Sheng has uploaded a new change for review. Change subject: Packaging: libvirt plugin of selinux and sanlock usage is configurable at build time ...................................................................... Packaging: libvirt plugin of selinux and sanlock usage is configurable at build time VDSM makes use of these two plugins. However on platform such as Ubuntu, libvirt is compiled without selinux and sanlock plugin. In this patch we make these plugins configurable at build time by --enable-libvirt-selinux=no|yes --enable-libvirt-sanlock=no|yes By default they are both yes. Change-Id: I0953942999e5e77054c3c8f4f2b48e9cfd31fa61 Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- M configure.ac M lib/vdsm/tool/libvirt_configure.sh.in 2 files changed, 30 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/18921/1 diff --git a/configure.ac b/configure.ac index 4d8f4da..be7ddd9 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,24 @@ esac],[hooks=false]) AM_CONDITIONAL([HOOKS], [test x$hooks = xtrue]) +AC_ARG_ENABLE([libvirt-sanlock], +[ --enable-libvirt-sanlock enable libvirt sanlock plugin, default yes], +[case "${enableval}" in + yes) libvirt_sanlock=true ;; + no) libvirt_sanlock=false ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-libvirt-sanlock]) ;; +esac],[libvirt_sanlock=true]) +AC_SUBST([LIBVIRT_SANLOCK], [$libvirt_sanlock]) + +AC_ARG_ENABLE([libvirt-selinux], +[ --enable-libvirt-sanlock enable libvirt selinux plugin, default yes], +[case "${enableval}" in + yes) libvirt_selinux=true ;; + no) libvirt_selinux=false ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-libvirt-selinux]) ;; +esac],[libvirt_selinux=true]) +AC_SUBST([LIBVIRT_SELINUX], [$libvirt_selinux]) + # Users and groups AC_SUBST([VDSMUSER], [vdsm]) AC_SUBST([VDSMGROUP], [kvm]) diff --git a/lib/vdsm/tool/libvirt_configure.sh.in b/lib/vdsm/tool/libvirt_configure.sh.in index 3a4f4fa..cf74173 100755 --- a/lib/vdsm/tool/libvirt_configure.sh.in +++ b/lib/vdsm/tool/libvirt_configure.sh.in @@ -20,6 +20,9 @@ . @LIBEXECDIR@/ovirt_functions.sh +LIBVIRT_SANLOCK="@LIBVIRT_SANLOCK@" +LIBVIRT_SELINUX="@LIBVIRT_SELINUX@" + GETCONFITEM="@VDSMDIR@/get-conf-item" VDSM_CONF_FILE="@CONFDIR@/vdsm.conf" QEMU_DUMP_PATH="/var/log/core" @@ -27,6 +30,7 @@ QCONF="@sysconfdir@/libvirt/qemu.conf" LDCONF="@sysconfdir@/sysconfig/libvirtd" QLCONF="@sysconfdir@/libvirt/qemu-sanlock.conf" +[ "${LIBVIRT_SANLOCK}" = "false" ] && QLCONF="/dev/null" # trigger for reconfiguration FORCE_RECONFIGURE="@VDSMLIBDIR@/reconfigure" @@ -204,6 +208,9 @@ set_if_default "${lconf}" host_uuid "\"$(uuidgen)\"" set_if_default "${lconf}" keepalive_interval -1 set_if_default "${qconf}" dynamic_ownership 0 + if [ "${LIBVIRT_SELINUX}" = "false" ]; then + set_if_default "${qconf}" security_driver \"none\" + fi if [ "${ssl}" = "true" ]; then set_if_default "${qconf}" spice_tls 1 @@ -235,9 +242,11 @@ fi # Configuring sanlock - set_if_default "${qconf}" lock_manager \"sanlock\" - set_if_default "${qlconf}" auto_disk_leases 0 - set_if_default "${qlconf}" require_lease_for_disks 0 + if [ "${LIBVIRT_SANLOCK}" != "false" ]; then + set_if_default "${qconf}" lock_manager \"sanlock\" + set_if_default "${qlconf}" auto_disk_leases 0 + set_if_default "${qlconf}" require_lease_for_disks 0 + fi # Configuring auto dump path set_if_default "${qconf}" auto_dump_path \"${QEMU_DUMP_PATH}\" -- To view, visit http://gerrit.ovirt.org/18921 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0953942999e5e77054c3c8f4f2b48e9cfd31fa61 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>

4 10

Change in vdsm[master]: build: cleanup: reformat use of AC_ARG_ENABLE
by Alon Bar-Lev 07 Sep '13

07 Sep '13

Alon Bar-Lev has uploaded a new change for review. Change subject: build: cleanup: reformat use of AC_ARG_ENABLE ...................................................................... build: cleanup: reformat use of AC_ARG_ENABLE 1. Use AS_HELP_STRING to format help. 2. Use autoconf variable for statement. Change-Id: Iaf32239a946e299711a2f0de660f3ac8ec1fed59 Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com> --- M configure.ac 1 file changed, 7 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/18928/1 diff --git a/configure.ac b/configure.ac index 4d8f4da..3c789b9 100644 --- a/configure.ac +++ b/configure.ac @@ -44,15 +44,13 @@ AC_PROG_LN_S AM_PATH_PYTHON([2.6]) -# Checking if hooks enables -AC_ARG_ENABLE([hooks], -[ --enable-hooks build hooks RPMs], -[case "${enableval}" in - yes) hooks=true ;; - no) hooks=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-hooks]) ;; -esac],[hooks=false]) -AM_CONDITIONAL([HOOKS], [test x$hooks = xtrue]) +AC_ARG_ENABLE( + [hooks], + [AS_HELP_STRING([--enable-hooks], [build hooks packages @<:@default=no@:>@])], + , + [enable_hooks="no"] +) +AM_CONDITIONAL([HOOKS], [test "${enable_hooks}" = "yes"]) # Users and groups AC_SUBST([VDSMUSER], [vdsm]) -- To view, visit http://gerrit.ovirt.org/18928 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf32239a946e299711a2f0de660f3ac8ec1fed59 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>

3 5

Change in vdsm[master]: Adding more qemuImg commands
by Federico Simoncelli 07 Sep '13

07 Sep '13

Federico Simoncelli has uploaded a new change for review. Change subject: Adding more qemuImg commands ...................................................................... Adding more qemuImg commands Change-Id: I1fbe822da8544ece4fcce9cb5b15a39a9bb35a64 --- M vdsm/qemuImg.py 1 file changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/12/2612/1 -- To view, visit http://gerrit.ovirt.org/2612 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1fbe822da8544ece4fcce9cb5b15a39a9bb35a64 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>

3 6

Change in vdsm[master]: spec: remove shared glusterfs requirements
by Federico Simoncelli 04 Sep '13

04 Sep '13

Federico Simoncelli has uploaded a new change for review. Change subject: spec: remove shared glusterfs requirements ...................................................................... spec: remove shared glusterfs requirements Since we now require glusterfs in the main package we can now remove the same dependencies from the gluster rpm. Change-Id: I6cdbf9a0bc97ce0bf42b0b7647a2641717442d58 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm.spec.in 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/18408/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 74ad331..9666cc6 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -525,10 +525,7 @@ BuildArch: noarch Requires: %{name} = %{version}-%{release} -Requires: glusterfs >= 3.4.0 Requires: glusterfs-server -Requires: glusterfs-fuse -Requires: glusterfs-rdma Requires: python-magic %description gluster -- To view, visit http://gerrit.ovirt.org/18408 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6cdbf9a0bc97ce0bf42b0b7647a2641717442d58 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

6 8

Change in vdsm[master]: sdc.py: Remove domain before activating
by Allon Mureinik 04 Sep '13

04 Sep '13

Allon Mureinik has uploaded a new change for review. Change subject: sdc.py: Remove domain before activating ...................................................................... sdc.py: Remove domain before activating When a domain is activated, we should not rely on the cache as the domain's connection data may have been edited while it was deactivated. Change-Id: I458132878f2ae39f9efec6420dd582bfc2f888fc Bug-Url: https://bugzilla.redhat.com/950055 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/58/18458/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 3f3c1bf..5aafd9c 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1102,6 +1102,7 @@ """ self.log.info("sdUUID=%s spUUID=%s", sdUUID, self.spUUID) + sdCache.manuallyRemoveDomain(sdUUID) dom = sdCache.produce(sdUUID) # Avoid domain activation if not owned by pool self.validateAttachedDomain(dom) -- To view, visit http://gerrit.ovirt.org/18458 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I458132878f2ae39f9efec6420dd582bfc2f888fc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>

4 5

Re: [oVirt Jenkins] vdsm_create_rpms - Build # 637 - Still Failing!
by Dan Kenigsberg 04 Sep '13

04 Sep '13

On Tue, Sep 03, 2013 at 06:55:23PM +0100, Jenkins ci oVirt Server wrote: > Project: http://jenkins.ovirt.org/job/vdsm_create_rpms/ > Build: http://jenkins.ovirt.org/job/vdsm_create_rpms/637/ > Build Number: 637 > Build Status: Still Failing > Triggered By: Started by an SCM change > > ------------------------------------- > Changes Since Last Success: > ------------------------------------- > Changes for Build #636 > [Yaniv Bronhaim] Fixing start return the return value of vdsm execution > > > Changes for Build #637 > [Federico Simoncelli] storage: kill ongoing operations on exit Douglas, the fedora18 slave has RPM build errors: File must begin with "/": %{_tmpfilesdir}/vdsm.conf make: *** [rpm] Error 1 Build step 'Execute shell' marked build as failure Archiving artifacts Finished: FAILURE but AFAIR %{_tmpfilesdir} should have been well-defined in F18. Any idea? David, could you find out what is `rpm --version` on fedora18, and what is `rpm --eval '%{_tmpfilesdir}'`? Dan.

1 0

Change in vdsm[master]: storage: kill ongoing operations on exit
by Federico Simoncelli 04 Sep '13

04 Sep '13

Federico Simoncelli has uploaded a new change for review. Change subject: storage: kill ongoing operations on exit ...................................................................... storage: kill ongoing operations on exit Some storage operations must be forcibly interrupted when the vdsm (parent) process exits. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=713434 Change-Id: Ic6ff67cb687494099e332d2d7b1eb3a293d1b4e4 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M lib/vdsm/utils.py M vdsm/storage/blockSD.py M vdsm/storage/curlImgWrap.py M vdsm/storage/misc.py M vdsm/storage/sp.py M vdsm/storage/storage_mailbox.py M vdsm/storage/volume.py 7 files changed, 35 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/18074/1 diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py index 538498f..8890160 100644 --- a/lib/vdsm/utils.py +++ b/lib/vdsm/utils.py @@ -458,7 +458,8 @@ def execCmd(command, sudo=False, cwd=None, data=None, raw=False, logErr=True, printable=None, env=None, sync=True, nice=None, ioclass=None, - ioclassdata=None, setsid=False, execCmdLogger=logging.root): + ioclassdata=None, setsid=False, execCmdLogger=logging.root, + killOnExit=True): """ Executes an external command, optionally via sudo. """ @@ -485,7 +486,8 @@ cmdline = repr(subprocess.list2cmdline(printable)) execCmdLogger.debug("%s (cwd %s)", cmdline, cwd) - p = BetterPopen(command, close_fds=True, cwd=cwd, env=env) + p = BetterPopen(command, close_fds=True, cwd=cwd, env=env, + deathSignal=(signal.SIGKILL if killOnExit else 0)) p = AsyncProc(p) if not sync: if data is not None: @@ -516,12 +518,14 @@ def watchCmd(command, stop, cwd=None, data=None, recoveryCallback=None, - nice=None, ioclass=None, execCmdLogger=logging.root): + nice=None, ioclass=None, execCmdLogger=logging.root, + killOnExit=False): """ Executes an external command, optionally via sudo with stop abilities. """ proc = execCmd(command, sudo=False, cwd=cwd, data=data, sync=False, - nice=nice, ioclass=ioclass, execCmdLogger=execCmdLogger) + nice=nice, ioclass=ioclass, execCmdLogger=execCmdLogger, + killOnExit=killOnExit) if recoveryCallback: recoveryCallback(proc) diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index e8b2980..baca437 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -204,7 +204,8 @@ "of=%s" % lvm.lvPath(sdUUID, volUUID), "bs=%s" % BS, "count=%s" % count] p = misc.execCmd(cmd, sudo=False, sync=False, - nice=utils.NICENESS.HIGH, ioclass=utils.IOCLASS.IDLE) + nice=utils.NICENESS.HIGH, ioclass=utils.IOCLASS.IDLE, + killOnExit=True) return p @@ -1084,7 +1085,7 @@ # If there is a journal already tune2fs will do nothing, indicating # this condition only with exit code. However, we do not really care. cmd = [constants.EXT_TUNE2FS, "-j", masterfsdev] - misc.execCmd(cmd, sudo=True) + misc.execCmd(cmd, sudo=True, killOnExit=True) masterMount = mount.Mount(masterfsdev, masterDir) @@ -1274,7 +1275,7 @@ Create a special file system to store VM data """ cmd = [constants.EXT_MKFS, "-q", "-j", "-E", "nodiscard", dev] - rc = misc.execCmd(cmd, sudo=True)[0] + rc = misc.execCmd(cmd, sudo=True, killOnExit=True)[0] if rc != 0: raise se.MkfsError(dev) diff --git a/vdsm/storage/curlImgWrap.py b/vdsm/storage/curlImgWrap.py index 2f63311..e9b574e 100644 --- a/vdsm/storage/curlImgWrap.py +++ b/vdsm/storage/curlImgWrap.py @@ -63,7 +63,7 @@ cmd = [constants.EXT_CURL_IMG_WRAP, "--download"] cmd.extend(_headersToOptions(headers) + [path, url]) - rc, out, err = utils.execCmd(cmd) + rc, out, err = utils.execCmd(cmd, killOnExit=True) if rc != 0: raise CurlError(rc, out, err) @@ -73,7 +73,7 @@ cmd = [constants.EXT_CURL_IMG_WRAP, "--upload"] cmd.extend(_headersToOptions(headers) + [path, url]) - rc, out, err = utils.execCmd(cmd) + rc, out, err = utils.execCmd(cmd, killOnExit=True) if rc != 0: raise CurlError(rc, out, err) diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index fe3a870..013eded 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -367,12 +367,14 @@ if not stop: (rc, out, err) = execCmd(cmd, sudo=False, nice=utils.NICENESS.HIGH, - ioclass=utils.IOCLASS.IDLE) + ioclass=utils.IOCLASS.IDLE, + killOnExit=True) else: (rc, out, err) = watchCmd(cmd, stop=stop, recoveryCallback=recoveryCallback, nice=utils.NICENESS.HIGH, - ioclass=utils.IOCLASS.IDLE) + ioclass=utils.IOCLASS.IDLE, + killOnExit=True) if rc: raise se.MiscBlockWriteException(dst, offset, size) diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 3f3c1bf..90c6313 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -2077,7 +2077,7 @@ try: if method.lower() == "wget": cmd = [constants.EXT_WGET, "-O", targetPath, srcPath] - (rc, out, err) = misc.execCmd(cmd, sudo=False) + (rc, out, err) = misc.execCmd(cmd, sudo=False, killOnExit=True) if rc: self.log.error("uploadVolume - error while trying to " @@ -2086,7 +2086,7 @@ raise se.VolumeCopyError(vol, err) elif method.lower() == "rsync": cmd = [constants.EXT_RSYNC, "-aq", srcPath, targetPath] - (rc, out, err) = misc.execCmd(cmd, sudo=False) + (rc, out, err) = misc.execCmd(cmd, sudo=False, killOnExit=True) if rc: self.log.error("uploadVolume - error while trying to copy:" diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py index af3ccb8..38dff90 100644 --- a/vdsm/storage/storage_mailbox.py +++ b/vdsm/storage/storage_mailbox.py @@ -269,7 +269,8 @@ def _initMailbox(self): # Sync initial incoming mail state with storage view - (rc, out, err) = misc.execCmd(self._inCmd, sudo=False, raw=True) + (rc, out, err) = misc.execCmd(self._inCmd, sudo=False, raw=True, + killOnExit=True) if rc == 0: self._incomingMail = out self._init = True @@ -385,7 +386,8 @@ pChk = struct.pack('<l', chk) # Assumes CHECKSUM_BYTES equals 4!!! self._outgoingMail = \ self._outgoingMail[0:MAILBOX_SIZE - CHECKSUM_BYTES] + pChk - misc.execCmd(self._outCmd, data=self._outgoingMail, sudo=False) + misc.execCmd(self._outCmd, data=self._outgoingMail, sudo=False, + killOnExit=True) def _handleMessage(self, message): # TODO: add support for multiple mailboxes @@ -569,7 +571,8 @@ self.log.debug("SPM_MailMonitor - clearing outgoing mail, command is: " "%s", self._outCmd) cmd = self._outCmd + ['bs=' + str(self._outMailLen)] - (rc, out, err) = misc.execCmd(cmd, sudo=False, data=self._outgoingMail) + (rc, out, err) = misc.execCmd(cmd, sudo=False, data=self._outgoingMail, + killOnExit=True) if rc: self.log.warning("SPM_MailMonitor couldn't clear outgoing mail, " "dd failed") @@ -742,7 +745,8 @@ try: cmd = self._outCmd + ['bs=' + str(self._outMailLen)] (rc, out, err) = misc.execCmd(cmd, sudo=False, - data=self._outgoingMail) + data=self._outgoingMail, + killOnExit=True) if rc: self.log.warning("SPM_MailMonitor couldn't write " "outgoing mail, dd failed") @@ -767,7 +771,8 @@ 'seek=' + str(mailboxOffset / MAILBOX_SIZE)] #self.log.debug("Running command: %s, for message id: %s", # str(cmd), str(msgID)) - (rc, out, err) = misc.execCmd(cmd, sudo=False, data=mailbox) + (rc, out, err) = misc.execCmd(cmd, sudo=False, data=mailbox, + killOnExit=True) if rc: self.log.error("SPM_MailMonitor: sendReply - couldn't send " "reply, dd failed") diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index 10b3363..3c3b378 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -1057,7 +1057,7 @@ # +1 is so that odd numbers will round upwards. cmd += [volume, "%uK" % ((size + 1) / 2)] - (rc, out, err) = misc.execCmd(cmd, sudo=False, cwd=cwd) + (rc, out, err) = misc.execCmd(cmd, sudo=False, cwd=cwd, killOnExit=True) if rc: raise se.VolumeCreationError(out) return True @@ -1096,7 +1096,8 @@ (rc, out, err) = misc.watchCmd(cmd, stop=stop, cwd=cwd, recoveryCallback=recoveryCallback, ioclass=utils.IOCLASS.IDLE, - nice=utils.NICENESS.HIGH) + nice=utils.NICENESS.HIGH, + killOnExit=True) log.debug('(qemuRebase): REBASE %s DONE' % (src)) return (rc, out, err) @@ -1124,7 +1125,8 @@ (rc, out, err) = misc.watchCmd(cmd, stop=stop, recoveryCallback=baseAsyncTasksRollback, ioclass=utils.IOCLASS.IDLE, - nice=utils.NICENESS.HIGH) + nice=utils.NICENESS.HIGH, + killOnExit=True) log.debug('(qemuConvert): COPY %s to %s DONE' % (src, dst)) return (rc, out, err) -- To view, visit http://gerrit.ovirt.org/18074 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6ff67cb687494099e332d2d7b1eb3a293d1b4e4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

5 18

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches September 2013