vdsm-patches December 2013

vdsm-patches@lists.fedorahosted.org

48 participants
493 discussions

Change in vdsm[master]: vm: pre-validate disks for snapshot
by Federico Simoncelli 25 Feb '14

25 Feb '14

Federico Simoncelli has uploaded a new change for review. Change subject: vm: pre-validate disks for snapshot ...................................................................... vm: pre-validate disks for snapshot This patch divides the snapshot disks validation from the path preparation in order to limit the rollback scenarios. Change-Id: I4fb507c2f7268bb688af5fd187dcd033d0a068a2 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/vm.py 1 file changed, 15 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/20029/1 diff --git a/vdsm/vm.py b/vdsm/vm.py index c85dc10..7945d5d 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -3618,11 +3618,11 @@ vmDrive = self._findDriveByUUIDs(baseDrv) except LookupError: # The volume we want to snapshot doesn't exist - _rollbackDrives(newDrives) self.log.error("The base volume doesn't exist: %s", baseDrv) return errCode['snapshotErr'] if vmDrive.hasVolumeLeases: + self.log.error("Disk %s has volume leases", vmDrive.name) return errCode['noimpl'] vmDevName = vmDrive.name @@ -3632,23 +3632,25 @@ newDrives[vmDevName]["name"] = vmDevName newDrives[vmDevName]["format"] = "cow" - try: - newDrives[vmDevName]["path"] = \ - self.cif.prepareVolumePath(newDrives[vmDevName]) - except Exception: - _rollbackDrives(newDrives) - self.log.error("Unable to prepare the volume path " - "for the disk: %s", vmDevName, exc_info=True) - return errCode['snapshotErr'] - - snapelem = _diskSnapshot(vmDevName, newDrives[vmDevName]["path"]) - disks.appendChild(snapelem) - # If all the drives are the current ones, return success if len(newDrives) == 0: self.log.debug("All the drives are already in use, success") return {'status': doneCode} + for vmDevName in newDrives.keys(): + try: + newDrives[vmDevName]["path"] = \ + self.cif.prepareVolumePath(newDrives[vmDevName]) + except Exception: + self.log.error("Unable to prepare the volume path " + "for the disk: %s", vmDevName, exc_info=True) + # Trying to rollback (teardown) all drives + _rollbackDrives(newDrives) + return errCode['snapshotErr'] + + snapelem = _diskSnapshot(vmDevName, newDrives[vmDevName]["path"]) + disks.appendChild(snapelem) + snap.appendChild(disks) snapFlags = (libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT | -- To view, visit http://gerrit.ovirt.org/20029 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4fb507c2f7268bb688af5fd187dcd033d0a068a2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

5 16

Change in vdsm[master]: confNet: ifcfg's VLAN should be set only on vlan cfg
by Dan Kenigsberg 20 Feb '14

20 Feb '14

Dan Kenigsberg has uploaded a new change for review. Change subject: confNet: ifcfg's VLAN should be set only on vlan cfg ...................................................................... confNet: ifcfg's VLAN should be set only on vlan cfg If a misguided script calls addNetwork with explicit VLAN option, it sohuld not be blindly copied to the top-most device. We set VLAN=yes on the ifcfg script for the vlan device, and that's that. Change-Id: Ia2c9d6c86e73104424ca8ac901bf09e4b98a47ab Bug-Id: BZ#847733 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/configNetwork.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/11/7411/1 diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 3f99a66..2ef0a8a 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -384,7 +384,7 @@ if mtu: cfg = cfg + 'MTU=%d\n' % mtu cfg += 'NM_CONTROLLED=no\n' - BLACKLIST = ['TYPE', 'NAME', 'DEVICE', 'bondingOptions', + BLACKLIST = ['TYPE', 'NAME', 'DEVICE', 'VLAN', 'bondingOptions', 'force', 'blockingdhcp', 'connectivityCheck', 'connectivityTimeout', 'implicitBonding'] -- To view, visit http://gerrit.ovirt.org/7411 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2c9d6c86e73104424ca8ac901bf09e4b98a47ab Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

6 14

Change in vdsm[master]: lvm: ignore skipped clustered vgs
by Federico Simoncelli 20 Feb '14

20 Feb '14

Federico Simoncelli has uploaded a new change for review. Change subject: lvm: ignore skipped clustered vgs ...................................................................... lvm: ignore skipped clustered vgs Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=820982 Change-Id: Idcabb5c1c19106f0db1385787251d951e12ab0cf Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm.spec.in M vdsm/storage/lvm.py 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/20248/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 0aec5fa..49e652d 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -159,7 +159,7 @@ Requires: policycoreutils-python >= 2.0.83-19.30 Requires: python-pthreading Requires: selinux-policy-targeted >= 3.7.19-195.el6.13 -Requires: lvm2 >= 2.02.95-10.el6_3.2 +Requires: lvm2 >= 2.02.100-5 Requires: logrotate < 3.8.0 %endif %else @@ -187,7 +187,7 @@ Requires: policycoreutils-python Requires: sed >= 4.2.1-10 Requires: ed -Requires: lvm2 >= 2.02.95 +Requires: lvm2 >= 2.02.103 %if 0%{?fedora} >= 18 %if 0%{?fedora} >= 19 diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py index 0c2964e..39a0b3f 100644 --- a/vdsm/storage/lvm.py +++ b/vdsm/storage/lvm.py @@ -81,7 +81,7 @@ SEPARATOR = "|" LVM_NOBACKUP = ("--autobackup", "n") LVM_FLAGS = ("--noheadings", "--units", "b", "--nosuffix", "--separator", - SEPARATOR) + SEPARATOR, "--ignoreskippedcluster") PV_PREFIX = "/dev/mapper" # Assuming there are no spaces in the PV name -- To view, visit http://gerrit.ovirt.org/20248 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idcabb5c1c19106f0db1385787251d951e12ab0cf Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

6 18

Change in vdsm[master]: avoid redundant domain produce() in createStoragePool
by lvroyce＠linux.vnet.ibm.com 18 Feb '14

18 Feb '14

Royce Lv has uploaded a new change for review. Change subject: avoid redundant domain produce() in createStoragePool ...................................................................... avoid redundant domain produce() in createStoragePool Change-Id: If1c236aa3043068ca8f3f376cb340e986cd484bb Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm/storage/hsm.py M vdsm/storage/sp.py 2 files changed, 4 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/7347/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 2227c03..b2c20c0 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -765,19 +765,6 @@ if msdType in sd.BLOCK_DOMAIN_TYPES and msdVersion in blockSD.VERS_METADATA_LV and len(domList) > sp.MAX_DOMAINS: raise se.TooManyDomainsInStoragePoolError() - for sdUUID in domList: - try: - dom = sdCache.produce(sdUUID=sdUUID) - # TODO: consider removing validate() from here, as the domains - # are going to be accessed much later, and may loose validity - # until then. - dom.validate() - except: - raise se.StorageDomainAccessError(sdUUID) - #If you remove this condition, remove it from StoragePool.attachSD() too. - if dom.isData() and (dom.getVersion() != msdVersion): - raise se.MixedSDVersionError(dom.sdUUID, dom.getVersion(), msd.sdUUID, msdVersion) - vars.task.getExclusiveLock(STORAGE, spUUID) for dom in sorted(domList): vars.task.getExclusiveLock(STORAGE, dom) diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index ee45151..a5b65c7 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -549,6 +549,7 @@ domain.validate() if sdUUID == msdUUID: msd = domain + msdVersion = msd.getVersion() except se.StorageException: self.log.error("Unexpected error", exc_info=True) raise se.StorageDomainAccessError(sdUUID) @@ -560,6 +561,9 @@ # Non ISO domains have only 1 pool if len(spUUIDs) > 0: raise se.StorageDomainAlreadyAttached(spUUIDs[0], sdUUID) + + if domain.isData() and (domain.getVersion() != msdVersion): + raise se.MixedSDVersionError(domain.sdUUID, domain.getVersion(), msd.sdUUID, msdVersion) fileUtils.createdir(self.poolPath) self._acquireTemporaryClusterLock(msdUUID, safeLease) -- To view, visit http://gerrit.ovirt.org/7347 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1c236aa3043068ca8f3f376cb340e986cd484bb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

7 12

Change in vdsm[master]: [RFC] storage: Configure multipath using local interfaces
by apahim＠redhat.com 15 Feb '14

15 Feb '14

Amador Pahim has uploaded a new change for review. Change subject: [RFC] storage: Configure multipath using local interfaces ...................................................................... [RFC] storage: Configure multipath using local interfaces Currently is not possible to achieve multipath using one target IP and two or more local interfaces. iscsiadm is always executed with default interface. This patch takes advantage of pre-existent irs iscsi_default_ifaces configuration key to inform to vdsm the interfaces to be used creating paths to the target. This is the initial patch, hoping for comments and concerns. For now, let me keep some links to explain what is the goal: - iscsi multipath mannual configuration: https://gist.github.com/apahim/7434734 - current vdsm implementation: https://gist.github.com/apahim/7434764 - vdsm results after this patch: https://gist.github.com/apahim/7434836 Change-Id: I488c0a1401606ac40a5ee4ef3d816f53b1d22785 Bug-Url: http://bugzilla.redhat.com/753541 Signed-off-by: Amador Pahim <apahim(a)redhat.com> --- M vdsm/storage/hsm.py M vdsm/storage/iscsiadm.py 2 files changed, 54 insertions(+), 41 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/21189/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 15fd9fa..13ff51f 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -147,7 +147,11 @@ def _BCInitiatorNameResolve(ifaceName): if not ifaceName: - return iscsi.IscsiInterface('default') + ifaces = config.get('irs', 'iscsi_default_ifaces').split(',') + if ifaces and 'iser' not in ifaces: + return iscsi.IscsiInterface(ifaces) + else: + return iscsi.IscsiInterface(['default']) for iface in iscsi.iterateIscsiInterfaces(): if iface.name == ifaceName: diff --git a/vdsm/storage/iscsiadm.py b/vdsm/storage/iscsiadm.py index 9bb27ea..30b811f 100644 --- a/vdsm/storage/iscsiadm.py +++ b/vdsm/storage/iscsiadm.py @@ -229,70 +229,79 @@ def node_new(iface, portal, targetName): - rc, out, err = _runCmd(["-m", "node", "-T", targetName, "-I", iface, "-p", - portal, "--op=new"]) - if rc == 0: - return + for i in iface: + if not iface_exists(i): + iface_new(i) - if not iface_exists(iface): - raise IscsiInterfaceDoesNotExistError(iface) + rc, out, err = _runCmd(["-m", "node", "-T", targetName, "-I", i, "-p", + portal+",1", "--op=new"]) - raise IscsiNodeError(rc, out, err) + if rc != 0: + raise IscsiNodeError(rc, out, err) + + return def node_update(iface, portal, targetName, key, value, hideValue=False): - rc, out, err = _runCmd(["-m", "node", "-T", targetName, "-I", iface, "-p", - portal, "-n", key, "-v", value, "--op=update"], - hideValue) - if rc == 0: - return + for i in iface: + if not iface_exists(i): + iface_new(i) - if not iface_exists(iface): - raise IscsiInterfaceDoesNotExistError(iface) + rc, out, err = _runCmd(["-m", "node", "-T", targetName, "-I", i, "-p", + portal+",1", "-n", key, "-v", + value, "--op=update"], hideValue) - raise IscsiNodeError(rc, out, err) + if rc != 0: + raise IscsiNodeError(rc, out, err) + + return def node_delete(iface, portal, targetName): - rc, out, err = _runCmd(["-m", "node", "-T", targetName, "-I", iface, "-p", - portal, "--op=delete"]) - if rc == 0: - return + for i in iface: + if iface_exists(i): + iface_delete(i) - if not iface_exists(iface): - raise IscsiInterfaceDoesNotExistError(iface) + rc, out, err = _runCmd(["-m", "node", "-T", targetName, "-I", i, "-p", + portal+",1", "--op=delete"]) + if rc != 0: + raise IscsiNodeError(rc, out, err) - raise IscsiNodeError(rc, out, err) + return def node_disconnect(iface, portal, targetName): - rc, out, err = _runCmd(["-m", "node", "-T", targetName, "-I", iface, "-p", - portal, "-u"]) - if rc == 0: - return + for i in iface: + if not iface_exists(i): + raise IscsiInterfaceDoesNotExistError(i) - if not iface_exists(iface): - raise IscsiInterfaceDoesNotExistError(iface) + rc, out, err = _runCmd(["-m", "node", "-T", targetName, "-I", + iface, "-p", portal+",1", "-u"]) - if rc == ISCSI_ERR_OBJECT_NOT_FOUND: - raise IscsiSessionNotFound(iface, portal, targetName) + if rc == ISCSI_ERR_OBJECT_NOT_FOUND: + raise IscsiSessionNotFound(iface, portal, targetName) - raise IscsiNodeError(rc, out, err) + if rc != 0: + raise IscsiNodeError(rc, out, err) + + return def node_login(iface, portal, targetName): - rc, out, err = _runCmd(["-m", "node", "-T", targetName, "-I", iface, "-p", - portal, "-l"]) - if rc == 0: - return + for i in iface: + if not iface_exists(i): + raise IscsiInterfaceDoesNotExistError(i) - if not iface_exists(iface): - raise IscsiInterfaceDoesNotExistError(iface) + rc, out, err = _runCmd(["-m", "node", "-T", targetName, "-I", i, "-p", + portal+",1", "-l"]) - if rc == ISCSI_ERR_LOGIN_AUTH_FAILED: - raise IscsiAuthenticationError(rc, out, err) + if rc == ISCSI_ERR_LOGIN_AUTH_FAILED: + raise IscsiAuthenticationError(rc, out, err) - raise IscsiNodeError(rc, out, err) + if rc != 0: + raise IscsiNodeError(rc, out, err) + + return def session_rescan_async(): -- To view, visit http://gerrit.ovirt.org/21189 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I488c0a1401606ac40a5ee4ef3d816f53b1d22785 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Amador Pahim <apahim(a)redhat.com>

4 10

Change in vdsm[master]: [WIP]vdsm: add support for TPM device passthrough
by mpoledni＠redhat.com 14 Feb '14

14 Feb '14

Martin Polednik has uploaded a new change for review. Change subject: [WIP]vdsm: add support for TPM device passthrough ...................................................................... [WIP]vdsm: add support for TPM device passthrough This patch adds basic support for TPM (to be expanded) passthrough, which allows VM to be given access directly to host's TPM module. Currently missing: reporting host's tpm status (nonexistant / passed to VM / available) Engine constraints: vm with assigned TPM cannot be allowed to migrate, host cannot pass single TPM to multiple VMs using passthrough protocol (currently only supported protocol http://wiki.qemu.org/Features/TPM) Change-Id: I53a77a0977d367d1066e85590dd35b18bb5fa32a Signed-off-by: Martin Polednik <mpoledni(a)redhat.com> --- M tests/vmTests.py M vdsm/vm.py M vdsm_api/vdsmapi-schema.json 3 files changed, 90 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/20649/1 diff --git a/tests/vmTests.py b/tests/vmTests.py index 1f69f0a..b879e5f 100644 --- a/tests/vmTests.py +++ b/tests/vmTests.py @@ -114,6 +114,20 @@ smartcard = vm.SmartCardDevice(self.conf, self.log, **dev) self.assertXML(smartcard.getXML(), smartcardXML) + def testTpmXML(self): + tpmXML = """ + <tpm model="tpm-tis"> + <backend type="passthrough"> + <device path="/dev/tpm0"/> + </backend> + </tpm> + """ + dev = {'device': 'tpm', + 'specParams': {'type': 'passthrough', + 'path': '/dev/tpm0', 'model': 'tpm-tis'}} + tpm = vm.TpmDevice(self.conf, self.log, **dev) + self.assertXML(tpm.getXML(), tpmXML) + def testFeaturesXML(self): featuresXML = """ <features> diff --git a/vdsm/vm.py b/vdsm/vm.py index 0c12334..d73e83e 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -1673,6 +1673,26 @@ return card +class TpmDevice(VmDevice): + def getXML(self): + """ + Add tpm section to domain xml + + <tpm model='tpm-tis'> + <backend type='passthrough'> + <device path='/dev/tpm0'> + </backend> + </tpm> + """ + tpm = self.createXmlElem(self.device, None) + tpm.setAttrs(**{'model': self.specParams['model']}) + backend = tpm.appendChildWithArgs('backend', + type=self.specParams['type']) + backend.appendChildWithArgs('device', + path=self.specParams['path']) + return tpm + + class RedirDevice(VmDevice): def getXML(self): """ diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 73889d1..1be8e9d 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -1832,7 +1832,7 @@ ## {'enum': 'VmDeviceType', 'data': ['disk', 'interface', 'video', 'sound', 'controller', 'balloon', - 'channel', 'console', 'smartcard']} + 'channel', 'console', 'tpm', 'smartcard']} ## # @VmDiskDeviceType: @@ -2590,6 +2590,61 @@ 'address': 'VmDeviceAddress', 'alias': 'str', 'deviceId': 'UUID'}} ## +# @VmTpmDeviceType: +# +# An enumeration of VM tpm device types. +# +# @passthrough: use hosts TPM +# +# Since: 4.10.3 +## +{'enum': 'VmTpmDeviceType', 'data': ['passthrough']} + +## +# @VmTpmDeviceModel: +# +# An enumeration of VM tpm device modes. +# +# @tpm-tis: TODO +# +# Since: 4.10.3 +## +{'enum': 'VmTpmDeviceModel', 'data': ['tpm-tis']} + +## +# @VmTpmDeviceSpecParams: +# +# Additional VM tpm device parameters. +# +# @type: #optional Protocol used by tpmdevice (defaults to @passthrough) +# +# @model: #optional Model of TPM device (defaults to @tpm-tis) +# +# @path: #optional Path to hosts device TPM (defaults to /dev/tpm0) +# +# Since: 4.10.3 +## +{'type': 'VmTpmDeviceSpecParams', + 'data': {'*model': 'VmTpmDeviceModel', + '*path': 'str', + '*type': 'VmTpmDeviceType'}} + +## +# @VmTpmDevice: +# +# Properties of a VM tpm device. +# +# @deviceType: The device type (always @tpm) +# +# @specParams: #optional Additional device parameters +# +# Since: 4.10.3 +## +{'type': 'VmTpmDevice', + 'data': {'deviceType': 'VmDeviceType', + '*specParams': 'VmTpmDeviceSpecParams'}} + +## # @VmSmartcardDeviceProtocol: # # An enumeration of VM smartcard device protocols. -- To view, visit http://gerrit.ovirt.org/20649 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I53a77a0977d367d1066e85590dd35b18bb5fa32a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com>

5 10

Change in vdsm[master]: tests: validate cdrom path sent to/received from vdsm
by mpoledni＠redhat.com 14 Feb '14

14 Feb '14

Martin Polednik has uploaded a new change for review. Change subject: tests: validate cdrom path sent to/received from vdsm ...................................................................... tests: validate cdrom path sent to/received from vdsm related to http://gerrit.ovirt.org/#/c/20074/ Tests prepareVolumePath for cdrom by verifying that path and specParams['path'] remains unchanged during creation of VM Change-Id: I620c481056f7ee3b4d3270ba1f4bc45cbb132ebb Signed-off-by: Martin Polednik <mpoledni(a)redhat.com> --- M tests/functional/utils.py M tests/functional/virtTests.py 2 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/22194/1 diff --git a/tests/functional/utils.py b/tests/functional/utils.py index 5713db3..8bdd978 100644 --- a/tests/functional/utils.py +++ b/tests/functional/utils.py @@ -210,6 +210,11 @@ else: return result['status']['code'], result['status']['message'] + def getVmList(self, vmId): + result = self.vdscli.list('true', [vmId]) + return result['status']['code'], result['status']['message'],\ + result['vmList'][0] + def getVdsCapabilities(self): result = self.vdscli.getVdsCapabilities() return result['status']['code'], result['status']['message'],\ diff --git a/tests/functional/virtTests.py b/tests/functional/virtTests.py index bd54621..e799eb1 100644 --- a/tests/functional/virtTests.py +++ b/tests/functional/virtTests.py @@ -271,3 +271,39 @@ deviceDef['hotplugDisk']), timeout=10) self.retryAssert(partial(self.vdsm.hotunplugDisk, deviceDef['hotplugDisk']), timeout=10) + + @permutations([['self'], ['specParams'], ['both']]) + def testVmWithCdrom(self, pathLocation): + fd, path = tempfile.mkstemp() + os.chmod(path, 0o644) + + cdrom = {'index': '2', 'iface': 'ide', 'specParams': + {'path': ''}, 'readonly': 'true', 'path': + '', 'device': 'cdrom', 'shared': + 'false', 'type': 'disk'} + + if pathLocation == 'self': + cdrom['path'] = path + elif pathLocation == 'specParams': + cdrom['specParams']['path'] = path + else: + # we can use the same path to avoid having to generate another + # tmpfile + cdrom['path'] = path + cdrom['specParams']['path'] = path + + customization = {'vmId': '77777777-ffff-3333-bbbb-222222222222', + 'vmName': 'testVm', 'devices': [cdrom]} + + with RunningVm(self.vdsm, customization) as vm: + self._waitForStartup(vm, 10) + + status, msg, stats = self.vdsm.getVmList(vm) + self.assertEqual(status, SUCCESS, msg) + for device in stats['devices']: + if device['device'] == 'cdrom': + self.assertEqual(device['path'], cdrom['path']) + self.assertEqual(device['specParams']['path'], + cdrom['specParams']['path']) + + os.unlink(path) -- To view, visit http://gerrit.ovirt.org/22194 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I620c481056f7ee3b4d3270ba1f4bc45cbb132ebb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com>

7 20

Change in vdsm[master]: typo in guest agent channel timeout handling
by michal.skrivanek＠redhat.com 13 Feb '14

13 Feb '14

Michal Skrivanek has uploaded a new change for review. Change subject: typo in guest agent channel timeout handling ...................................................................... typo in guest agent channel timeout handling Change-Id: I63a8a5aa098101ebb3e3c4de2b2dddae4c158490 Signed-off-by: Michal Skrivanek <michal.skrivanek(a)redhat.com> --- M vdsm/guestIF.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/17456/1 diff --git a/vdsm/guestIF.py b/vdsm/guestIF.py index 0f831da..0132692 100644 --- a/vdsm/guestIF.py +++ b/vdsm/guestIF.py @@ -316,7 +316,7 @@ @staticmethod def _onChannelTimeout(self): self.guestInfo['memUsage'] = 0 - if self.guestStatus not in ("Powered down", "RebootInProgress"): + if self.guestStatus not in ("Powering down", "RebootInProgress"): self.log.log(logging.TRACE, "Guest connection timed out") self.guestStatus = None -- To view, visit http://gerrit.ovirt.org/17456 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63a8a5aa098101ebb3e3c4de2b2dddae4c158490 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Michal Skrivanek <michal.skrivanek(a)redhat.com>

4 6

Change in vdsm[master]: supervdsm: Enable multiprocessing module logging.
by lyarwood＠redhat.com 13 Feb '14

13 Feb '14

Lee Yarwood has uploaded a new change for review. Change subject: supervdsm: Enable multiprocessing module logging. ...................................................................... supervdsm: Enable multiprocessing module logging. The multiprocessing module includes error logging using Python's logging module, but it is not enabled by default. This patch enables the logging and sets it to propagate to the supervdsmServer's root logger, so it now defaults to producing logging and can be configured easily from /etc/vdsm/svdsm.logger.conf. Change-Id: Idbbe0f1eb294e99de997f78b964a062fdddbb6ea Signed-off-by: Lee Yarwood <lyarwood(a)redhat.com> Signed-off-by: David Gibson <dgibson(a)redhat.com> --- M vdsm/supervdsmServer 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/19741/1 diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer index 40ec9df..006c35c 100755 --- a/vdsm/supervdsmServer +++ b/vdsm/supervdsmServer @@ -30,6 +30,7 @@ import signal import logging import logging.config +import multiprocessing LOG_CONF_PATH = "/etc/vdsm/svdsm.logger.conf" @@ -356,6 +357,7 @@ def main(sockfile, pidfile=None): log = logging.getLogger("SuperVdsm.Server") + multiprocessing.get_logger().propagate = 1 def bind(func): def wrapper(_SuperVdsm, *args, **kwargs): -- To view, visit http://gerrit.ovirt.org/19741 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idbbe0f1eb294e99de997f78b964a062fdddbb6ea Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Lee Yarwood <lyarwood(a)redhat.com>

6 22

Change in vdsm[master]: lvm: Make the isActiveLV() method public.
by lyarwood＠redhat.com 13 Feb '14

13 Feb '14

Lee Yarwood has uploaded a new change for review. Change subject: lvm: Make the isActiveLV() method public. ...................................................................... lvm: Make the isActiveLV() method public. This change makes the private isActiveLV() method public for use in the blockSD layer. Change-Id: I670fe3969b88819891c64ea3ac487b070618aaec Signed-off-by: Lee Yarwood <lyarwood(a)redhat.com> --- M vdsm/storage/lvm.py 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/86/21386/1 diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py index 112f1c0..76184b8 100644 --- a/vdsm/storage/lvm.py +++ b/vdsm/storage/lvm.py @@ -1221,10 +1221,8 @@ return os.path.basename(os.readlink(lvp)) -def _isLVActive(vgName, lvName): +def isLVActive(vgName, lvName): """Active volumes have a mp link. - - This function should not be used out of this module. """ return os.path.exists(lvPath(vgName, lvName)) -- To view, visit http://gerrit.ovirt.org/21386 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I670fe3969b88819891c64ea3ac487b070618aaec Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Lee Yarwood <lyarwood(a)redhat.com>

5 14

← Newer
1
...
16
17
18
19
20
21
22
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches December 2013