vdsm-patches December 2012

vdsm-patches@lists.fedorahosted.org

51 participants
408 discussions

Change in vdsm[master]: pep8: comply with E121 (indentation must be multiple of 4)
by Dan Kenigsberg 05 Dec '12

05 Dec '12

Dan Kenigsberg has uploaded a new change for review. Change subject: pep8: comply with E121 (indentation must be multiple of 4) ...................................................................... pep8: comply with E121 (indentation must be multiple of 4) Change-Id: Ie720de04c4b76a4d3575fb6dc8c540e2391e45dc Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M Makefile.am M tests/libvirtvmTests.py M vdsm/configNetwork.py M vdsm/doc/source/conf.py M vdsm/kaxmlrpclib.py M vdsm/libvirtvm.py M vdsm/netinfo.py M vdsm/storage/lvm.py M vdsm/storage/nfsSD.py M vdsm/storage/resourceFactories.py M vdsm/storage/storage_exception.py M vdsm/storage/volume.py M vdsm_reg/define.py 13 files changed, 66 insertions(+), 68 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/9729/1 diff --git a/Makefile.am b/Makefile.am index 99e1a4f..11f0597 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,7 +104,7 @@ find . -path './.git' -prune -type f -o \ -name '*.py' -o -name '*.py.in' | xargs $(PYFLAKES) $(PEP8) --exclude="$(PEP8_BLACKLIST)" --filename '*.py,*.py.in' \ - --ignore=E121,E122,E123,E124,E125,E126,E127,E128,E241 \ + --ignore=E122,E123,E124,E125,E126,E127,E128,E241 \ $(PEP8_WHITELIST) @if test -f .gitignore; then \ for i in `git ls-files \*.in`; do \ diff --git a/tests/libvirtvmTests.py b/tests/libvirtvmTests.py index 4293276..8e7620f 100644 --- a/tests/libvirtvmTests.py +++ b/tests/libvirtvmTests.py @@ -284,10 +284,10 @@ def testControllerXML(self): devConfs = [ - {'device': 'ide', 'index': '0', 'address': self.PCI_ADDR_DICT}, - {'device': 'virtio-serial', 'address': self.PCI_ADDR_DICT}, - {'device': 'usb', 'model': 'ich9-ehci1', 'index': '0', - 'master': {'startport': '0'}, 'address': self.PCI_ADDR_DICT}] + {'device': 'ide', 'index': '0', 'address': self.PCI_ADDR_DICT}, + {'device': 'virtio-serial', 'address': self.PCI_ADDR_DICT}, + {'device': 'usb', 'model': 'ich9-ehci1', 'index': '0', + 'master': {'startport': '0'}, 'address': self.PCI_ADDR_DICT}] expectedXMLs = [ """ <controller index="0" type="ide"> @@ -323,20 +323,20 @@ def testDriveXML(self): SERIAL = '54-a672-23e5b495a9ea' devConfs = [ - {'index': '2', 'propagateErrors': 'off', 'iface': 'ide', - 'name': 'hdc', 'format': 'raw', 'device': 'cdrom', - 'path': '/tmp/fedora.iso', 'type': 'disk', 'readonly': 'True', - 'shared': 'False', 'serial': SERIAL}, + {'index': '2', 'propagateErrors': 'off', 'iface': 'ide', + 'name': 'hdc', 'format': 'raw', 'device': 'cdrom', + 'path': '/tmp/fedora.iso', 'type': 'disk', 'readonly': 'True', + 'shared': 'False', 'serial': SERIAL}, - {'index': '0', 'propagateErrors': 'on', 'iface': 'virtio', - 'name': 'vda', 'format': 'cow', 'device': 'disk', - 'path': '/tmp/disk1.img', 'type': 'disk', 'readonly': 'False', - 'shared': 'True', 'serial': SERIAL}, + {'index': '0', 'propagateErrors': 'on', 'iface': 'virtio', + 'name': 'vda', 'format': 'cow', 'device': 'disk', + 'path': '/tmp/disk1.img', 'type': 'disk', 'readonly': 'False', + 'shared': 'True', 'serial': SERIAL}, - {'index': '0', 'propagateErrors': 'off', 'iface': 'virtio', - 'name': 'vda', 'format': 'raw', 'device': 'disk', - 'path': '/dev/mapper/lun1', 'type': 'disk', 'readonly': 'False', - 'shared': 'False', 'serial': SERIAL}] + {'index': '0', 'propagateErrors': 'off', 'iface': 'virtio', + 'name': 'vda', 'format': 'raw', 'device': 'disk', + 'path': '/dev/mapper/lun1', 'type': 'disk', 'readonly': 'False', + 'shared': 'False', 'serial': SERIAL}] expectedXMLs = [ """ @@ -357,7 +357,7 @@ io="threads" name="qemu" type="qcow2"/> </disk>""", - """ + """ <disk device="disk" snapshot="no" type="block"> <source dev="/dev/mapper/lun1"/> <target bus="virtio" dev="vda"/> diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 09d70ac..78fd3af 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -728,7 +728,7 @@ for option in bondingOptions.split(): key, value = option.split('=') if not os.path.exists( - '/sys/class/net/%(bonding)s/bonding/%(key)s' % locals()): + '/sys/class/net/%(bonding)s/bonding/%(key)s' % locals()): raise ConfigNetworkError(ne.ERR_BAD_BONDING, "%r is not a valid bonding option" % key) except ValueError: @@ -1374,7 +1374,7 @@ d['nics'] = _ni.bondings[d['bonding']]['slaves'] d['bondingOptions'] = \ _ni.bondings[d['bonding']]['cfg'].get( - 'BONDING_OPTS', None) + 'BONDING_OPTS', None) else: d['nics'] = [d.pop('nic')] d['force'] = force diff --git a/vdsm/doc/source/conf.py b/vdsm/doc/source/conf.py index 693f289..4024217 100644 --- a/vdsm/doc/source/conf.py +++ b/vdsm/doc/source/conf.py @@ -171,9 +171,8 @@ # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). -latex_documents = [ - ('index', 'Vdsm.tex', u'VDSM Documentation', - u'Red Hat', 'manual'), +latex_documents = [('index', 'Vdsm.tex', u'VDSM Documentation', + u'Red Hat', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of diff --git a/vdsm/kaxmlrpclib.py b/vdsm/kaxmlrpclib.py index 2a087ae..8ab5e88 100644 --- a/vdsm/kaxmlrpclib.py +++ b/vdsm/kaxmlrpclib.py @@ -143,9 +143,9 @@ strict=None, timeout=CONNECTTIMEOUT, ca_certs=None, cert_reqs=ssl.CERT_REQUIRED): SecureXMLRPCServer.VerifyingHTTPSConnection.__init__( - self, host, port=port, key_file=key_file, cert_file=cert_file, - strict=strict, timeout=timeout, - ca_certs=ca_certs, cert_reqs=cert_reqs) + self, host, port=port, key_file=key_file, cert_file=cert_file, + strict=strict, timeout=timeout, + ca_certs=ca_certs, cert_reqs=cert_reqs) def connect(self): SecureXMLRPCServer.VerifyingHTTPSConnection.connect(self) diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index 082b756..df9def0 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -194,8 +194,8 @@ try: stats['cpuSys'] = self._usagePercentage( - self._diff(eInfo, sInfo, 'user_time') - + self._diff(eInfo, sInfo, 'system_time'), + self._diff(eInfo, sInfo, 'user_time') + + self._diff(eInfo, sInfo, 'system_time'), sampleInterval) stats['cpuUser'] = self._usagePercentage( self._diff(eInfo, sInfo, 'cpu_time') @@ -489,9 +489,10 @@ self._preparingMigrationEvt = False if not self._migrationCanceledEvt: self._vm._dom.migrateToURI2( - duri, muri, None, - libvirt.VIR_MIGRATE_LIVE | libvirt.VIR_MIGRATE_PEER2PEER, - None, maxBandwidth) + duri, muri, None, + libvirt.VIR_MIGRATE_LIVE | + libvirt.VIR_MIGRATE_PEER2PEER, + None, maxBandwidth) finally: t.cancel() if MigrationMonitorThread._MIGRATION_MONITOR_INTERVAL: @@ -2306,8 +2307,8 @@ '%Y-%m-%dT%H:%M:%S'), time.gmtime(time.time() + newlife)) graphics.setAttribute( - 'passwdValidTo', - time.strftime('%Y-%m-%dT%H:%M:%S', validto)) + 'passwdValidTo', + time.strftime('%Y-%m-%dT%H:%M:%S', validto)) graphics.setAttribute('connected', 'keep') self._dom.updateDeviceFlags(graphics.toxml(), 0) @@ -2884,8 +2885,8 @@ self.log.debug('migration destination: waiting for VM creation') self._vmCreationEvent.wait() prepareTimeout = self._loadCorrectedTimeout( - config.getint('vars', 'migration_listener_timeout'), - doubler=5) + config.getint('vars', 'migration_listener_timeout'), + doubler=5) self.log.debug('migration destination: waiting %ss ' 'for path preparation', prepareTimeout) self._pathsPreparedEvent.wait(prepareTimeout) diff --git a/vdsm/netinfo.py b/vdsm/netinfo.py index f7d1799..2750662 100644 --- a/vdsm/netinfo.py +++ b/vdsm/netinfo.py @@ -323,14 +323,13 @@ else: raise - d['bridges'] = dict([(bridge, { - 'ports': ports(bridge), - 'stp': bridge_stp_state(bridge), - 'addr': getaddr(bridge), - 'netmask': getnetmask(bridge), - 'mtu': getMtu(bridge), - 'cfg': getIfaceCfg(bridge), - }) + d['bridges'] = dict([(bridge, {'ports': ports(bridge), + 'stp': bridge_stp_state(bridge), + 'addr': getaddr(bridge), + 'netmask': getnetmask(bridge), + 'mtu': getMtu(bridge), + 'cfg': getIfaceCfg(bridge), + }) for bridge in bridges()]) d['nics'] = dict([(nic, {'speed': speed(nic), diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py index 65badf7..e94f2f3 100644 --- a/vdsm/storage/lvm.py +++ b/vdsm/storage/lvm.py @@ -1200,8 +1200,8 @@ addTags = set(addTags) if delTags.intersection(addTags): raise se.VolumeGroupReplaceTagError( - "Cannot add and delete the same tag vg: `%s` tags: `%s`" - % (vgName, ", ".join(delTags.intersection(addTags)))) + "Cannot add and delete the same tag vg: `%s` tags: `%s`" % + (vgName, ", ".join(delTags.intersection(addTags)))) cmd = ["vgchange"] diff --git a/vdsm/storage/nfsSD.py b/vdsm/storage/nfsSD.py index 3a1c90e..78ed237 100644 --- a/vdsm/storage/nfsSD.py +++ b/vdsm/storage/nfsSD.py @@ -111,7 +111,7 @@ def findDomainPath(sdUUID): for tmpSdUUID, domainPath in fileSD.scanDomains("*"): if tmpSdUUID == sdUUID and mount.isMounted( - os.path.join(domainPath, "..")): + os.path.join(domainPath, "..")): return domainPath raise se.StorageDomainDoesNotExist(sdUUID) diff --git a/vdsm/storage/resourceFactories.py b/vdsm/storage/resourceFactories.py index 02aba0f..f53fa35 100644 --- a/vdsm/storage/resourceFactories.py +++ b/vdsm/storage/resourceFactories.py @@ -154,22 +154,22 @@ if template: if len(volUUIDChain) > 0: volRes = rmanager.acquireResource( - self.volumeResourcesNamespace, - template, rm.LockType.shared, - timeout=self.resource_default_timeout) + self.volumeResourcesNamespace, + template, rm.LockType.shared, + timeout=self.resource_default_timeout) else: volRes = rmanager.acquireResource( - self.volumeResourcesNamespace, - template, lockType, - timeout=self.resource_default_timeout) + self.volumeResourcesNamespace, + template, lockType, + timeout=self.resource_default_timeout) volResourcesList.append(volRes) # Acquire 'lockType' volume locks for volUUID in volUUIDChain: volRes = rmanager.acquireResource( - self.volumeResourcesNamespace, - volUUID, lockType, - timeout=self.resource_default_timeout) + self.volumeResourcesNamespace, + volUUID, lockType, + timeout=self.resource_default_timeout) volResourcesList.append(volRes) except (rm.RequestTimedOutError, se.ResourceAcqusitionFailed), e: diff --git a/vdsm/storage/storage_exception.py b/vdsm/storage/storage_exception.py index 54e64e6..71c5431 100644 --- a/vdsm/storage/storage_exception.py +++ b/vdsm/storage/storage_exception.py @@ -1285,8 +1285,8 @@ def __init__(self, domsizes, devsizes): self.value = "domlogblksize=%s domphyblksize=%s " \ "devlogblksize=%s devphyblksize=%s" % ( - domsizes[0], domsizes[1], - devsizes[0], devsizes[1]) + domsizes[0], domsizes[1], + devsizes[0], devsizes[1]) code = 517 message = "All devices in domain must have the same block size" diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index dcc6c0b..3f82e08 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -174,8 +174,8 @@ sdUUID, srcImg, srcVol, dstFormat, srcParent) imageResourcesNamespace = sd.getNamespace( - sdUUID, - resourceFactories.IMAGE_NAMESPACE) + sdUUID, + resourceFactories.IMAGE_NAMESPACE) with rmanager.acquireResource(imageResourcesNamespace, srcImg, rm.LockType.exclusive): try: @@ -191,10 +191,10 @@ try: (rc, out, err) = qemuRebase( - vol.getVolumePath(), vol.getFormat(), - os.path.join('..', srcImg, srcParent), - int(dstFormat), misc.parseBool(unsafe), - vars.task.aborting, False) + vol.getVolumePath(), vol.getFormat(), + os.path.join('..', srcImg, srcParent), + int(dstFormat), misc.parseBool(unsafe), + vars.task.aborting, False) if rc: raise se.MergeVolumeRollbackError(srcVol) @@ -1010,9 +1010,9 @@ if (src_fmt == "raw" and dst_fmt == "raw" and dstvolType == PREALLOCATED_VOL): (rc, out, err) = misc.ddWatchCopy( - src=src, dst=dst, - stop=stop, size=size, - recoveryCallback=baseAsyncTasksRollback) + src=src, dst=dst, + stop=stop, size=size, + recoveryCallback=baseAsyncTasksRollback) else: cmd = constants.CMD_LOWPRIO + [constants.EXT_QEMUIMG, "convert", "-t", "none", "-f", src_fmt, src, diff --git a/vdsm_reg/define.py b/vdsm_reg/define.py index bb4e4bd..c665634 100644 --- a/vdsm_reg/define.py +++ b/vdsm_reg/define.py @@ -48,8 +48,7 @@ 'message': 'Sparse creation failed'}}, 'createErr': {'status': - { - 'code': 9, + {'code': 9, 'message': 'Error creating the requested Desktop'}}, 'noConPeer': {'status': -- To view, visit http://gerrit.ovirt.org/9729 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie720de04c4b76a4d3575fb6dc8c540e2391e45dc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

2 3

Change in vdsm[master]: Remove Pool.isMember() function.
by ewarszaw＠redhat.com 04 Dec '12

04 Dec '12

Eduardo has uploaded a new change for review. Change subject: Remove Pool.isMember() function. ...................................................................... Remove Pool.isMember() function. Related to BZ#878894. Change-Id: I648c22f4914ed3d13994b7c5049fc6083f02633f Signed-off-by: Eduardo <ewarszaw(a)redhat.com> --- M vdsm/storage/hsm.py M vdsm/storage/sp.py 2 files changed, 3 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/9454/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 358876d..e47eee1 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -269,8 +269,10 @@ @classmethod def validatePoolSD(cls, spUUID, sdUUID): - if not cls.getPool(spUUID).isMember(sdUUID): + pool = cls.getPool(spUUID) + if sdUUID not in pool.getDomains(): raise se.StorageDomainNotMemberOfPool(spUUID, sdUUID) + return pool @classmethod def validateNonDomain(cls, sdUUID): diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index ac5e1db..25134d5 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1618,13 +1618,6 @@ return domainslist @unsecured - def isMember(self, sdUUID, checkActive=False): - """ - Check if domain is member in the pool. - """ - return sdUUID in self.getDomains(activeOnly=checkActive) - - @unsecured def isActive(self, sdUUID): return sdUUID in self.getDomains(activeOnly=True) -- To view, visit http://gerrit.ovirt.org/9454 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I648c22f4914ed3d13994b7c5049fc6083f02633f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

5 7

Change in vdsm[master]: mailbox: daemonize the hsm mailbox thread
by Federico Simoncelli 04 Dec '12

04 Dec '12

Federico Simoncelli has uploaded a new change for review. Change subject: mailbox: daemonize the hsm mailbox thread ...................................................................... mailbox: daemonize the hsm mailbox thread In order to successfully complete a prepareForShutdown command instead of waiting for a faulty mailbox thread to end, the thread has been daemonized. Change-Id: I416b42f46e67cecedbcd0ec4ead069279dd6935b Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/storage/storage_mailbox.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/9559/1 diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py index c74fccc..991509f 100644 --- a/vdsm/storage/storage_mailbox.py +++ b/vdsm/storage/storage_mailbox.py @@ -243,6 +243,7 @@ self._msgCounter = 0 self._sendMail() # Clear outgoing mailbox threading.Thread.__init__(self) + self.daemon = True self.start() def _initMailbox(self): -- To view, visit http://gerrit.ovirt.org/9559 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I416b42f46e67cecedbcd0ec4ead069279dd6935b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

4 9

Change in vdsm[master]: upgrade: skip volume lease for faulty metadata offsets
by Federico Simoncelli 04 Dec '12

04 Dec '12

Federico Simoncelli has uploaded a new change for review. Change subject: upgrade: skip volume lease for faulty metadata offsets ...................................................................... upgrade: skip volume lease for faulty metadata offsets This check has been added to overcome bz882276 (during the domain upgrade). Few vdsm releases (4.9 prior 496c0c3) generated metadata offsets higher than 2048 - 100 - 1 that would not permit sanlock to store the volume resource in the leases LV. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=882276 Change-Id: Ic84108d4fbe0dfee9fe1d57c802f99dd937cd8ec Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/storage/imageRepository/formatConverter.py 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/9600/1 diff --git a/vdsm/storage/imageRepository/formatConverter.py b/vdsm/storage/imageRepository/formatConverter.py index cd32a62..a0edaab 100644 --- a/vdsm/storage/imageRepository/formatConverter.py +++ b/vdsm/storage/imageRepository/formatConverter.py @@ -18,7 +18,9 @@ # Refer to the README and COPYING files for full details of the license # +import errno import logging +import sanlock from vdsm import qemuImg @@ -27,6 +29,10 @@ from storage import image from storage import safelease from storage import volume +from storage import blockVolume + + +BLKVOL_MAX_OFFSET = sd.LEASES_SIZE - blockVolume.RESERVED_LEASES - 1 def __convertDomainMetadataToTags(domain, targetVersion): @@ -153,7 +159,23 @@ log.debug("Creating the volume lease for %s", volUUID) metaId = vol.getMetadataId() - vol.newVolumeLease(metaId, domain.sdUUID, volUUID) + + try: + vol.newVolumeLease(metaId, domain.sdUUID, volUUID) + except sanlock.SanlockException, e: + metaOffset = (vol.getMetaOffset() + if hasattr(vol, "getMetaOffset") else 0 + # This check has been added to overcome BZ#882276 (during + # the domain upgrade). Few vdsm releases (4.9 prior 496c0c3) + # generated metadata offsets higher than 2048 - 100 - 1 that + # would not permit sanlock to store the volume resource in + # the leases LV. + if e.errno == errno.ENOSPC and metaOffset > BLKVOL_MAX_OFFSET: + log.error("The volume lease for %s has not been " + "initialized due bz882276, metadata offset " + "too high: %s", volUUID, metaOffset) + else: + raise # If this volume is used as a template let's update the other # volume's permissions and share the volume lease (at the moment -- To view, visit http://gerrit.ovirt.org/9600 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic84108d4fbe0dfee9fe1d57c802f99dd937cd8ec Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

1 2

Change in vdsm[master]: Fix return value of shutdown() on failure
by wudxw＠linux.vnet.ibm.com 04 Dec '12

04 Dec '12

Mark Wu has uploaded a new change for review. Change subject: Fix return value of shutdown() on failure ...................................................................... Fix return value of shutdown() on failure Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- M vdsm/vm.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/34/5434/1 -- To view, visit http://gerrit.ovirt.org/5434 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>

8 17

Change in vdsm[master]: concurrency: Vdscli uses a new HTTP conn per req.
by asegurap＠redhat.com 04 Dec '12

04 Dec '12

Antoni Segura Puimedon has uploaded a new change for review. Change subject: concurrency: Vdscli uses a new HTTP conn per req. ...................................................................... concurrency: Vdscli uses a new HTTP conn per req. Python-2.7 changed xmlrpclib's implementation detail of spawining a new http/https connection per each request to add support for Keepalive. Unfortunately, this implementation detail was also what made the xmlrpclib's Transport be thread-safe. This change reverts the change in Transport, thus mantaining the thread-safety of our python client code for unencrypted communications. Change-Id: Ifb08df759051bb340423958280e88df5792e9ed2 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M vdsm_cli/vdscli.py.in 1 file changed, 21 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/9329/1 diff --git a/vdsm_cli/vdscli.py.in b/vdsm_cli/vdscli.py.in index 2af41b7..9d5d8a3 100644 --- a/vdsm_cli/vdscli.py.in +++ b/vdsm_cli/vdscli.py.in @@ -19,7 +19,8 @@ # Refer to the README and COPYING files for full details of the license # -import xmlrpclib +from xmlrpclib import Server, ServerProxy, Transport +import httplib import subprocess import os from vdsm import SecureXMLRPCServer @@ -28,6 +29,21 @@ d_tsPath = '@TRUSTSTORE@' d_addr = '0' d_port = '54321' + + +class SingleRequestTransport(Transport): + '''Python 2.7 Transport introduced a change that makes it reuse connections + by default when new connections are requested for a host with an existing + connection. This class reverts the change to avoid the concurrency + issues.''' + + def make_connection(self, host): + '''Creates a new HTTPConnection to the host.''' + # create a HTTP connection object from a host descriptor + chost, self._extra_headers, x509 = self.get_host_info(host) + #store the host argument along with the connection object + self._connection = host, httplib.HTTPConnection(chost) + return self._connection[1] def __guessDefaults(): @@ -109,10 +125,11 @@ transport = TransportClass(key_file=KEYFILE, cert_file=CERTFILE, ca_certs=CACERT) - server = xmlrpclib.ServerProxy('https://%s' % addrport, - transport=transport) + server = ServerProxy('https://%s' % addrport, + transport=transport) else: - server = xmlrpclib.Server('http://%s' % addrport) + server = Server('http://%s' % addrport, + transport=SingleRequestTransport(use_datetime=0)) return server if __name__ == '__main__': -- To view, visit http://gerrit.ovirt.org/9329 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb08df759051bb340423958280e88df5792e9ed2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

3 14

Change in vdsm[master]: use default libvirt event handler impl
by lvroyce＠linux.vnet.ibm.com 04 Dec '12

04 Dec '12

Royce Lv has uploaded a new change for review. Change subject: use default libvirt event handler impl ...................................................................... use default libvirt event handler impl use default libvirt event handler implementation and event loop add setKeepAlive to avoid some buggy condition in libvirt connection Change-Id: I735d6b1f856b5a5b216d2dddf629c5ec80e8b7e7 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm/libvirtconnection.py M vdsm/libvirtev.py 2 files changed, 23 insertions(+), 486 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/5015/1 -- To view, visit http://gerrit.ovirt.org/5015 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I735d6b1f856b5a5b216d2dddf629c5ec80e8b7e7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

6 27

Change in vdsm[master]: Fix block volume atomicity creation issue.
by ewarszaw＠redhat.com 04 Dec '12

04 Dec '12

Hello Ayal Baron, Haim Ateya, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/9358 to review the following change. Change subject: Fix block volume atomicity creation issue. ...................................................................... Fix block volume atomicity creation issue. BlockVolume creation is a 2 step process where first an LV is created and then tags are added to it. If another host refreshes it's cache between the 2 commands it will have an LV with partial data on it. To solve this issue, we add an initial tag to the lvcreate command so that any other host would be able to identify this volume as incomplete and ignore it. Special LVs still have not MD tags. Bug-uri: https://bugzilla.redhat.com/show_bug.cgi?id=876558 Change-Id: I40cd67e563935de663d938cbc1bc9cf152802448 Signed-off-by: Eduardo <ewarszaw(a)redhat.com> Reviewed-on: https://gerrit.eng.lab.tlv.redhat.com/3299 Reviewed-by: Ayal Baron <abaron(a)redhat.com> Tested-by: Haim Ateya <hateya(a)redhat.com> --- M vdsm/storage/blockVolume.py 1 file changed, 29 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/58/9358/1 diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index 98c471b..692f8cd 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -20,6 +20,7 @@ import os import threading +import logging import sanlock from vdsm.config import config @@ -42,6 +43,7 @@ TAG_PREFIX_MDNUMBLKS = "MS_" TAG_PREFIX_IMAGE = "IU_" TAG_PREFIX_PARENT = "PU_" +TAG_VOL_UNINIT = "RHAT_VOL_INITIALIZING" VOLUME_TAGS = [TAG_PREFIX_PARENT, TAG_PREFIX_IMAGE, TAG_PREFIX_MD, @@ -58,6 +60,7 @@ # - 2..100 (Unassigned) RESERVED_LEASES = 100 +log = logging.getLogger('Storage.Volume') rmanager = rm.ResourceManager.getInstance() @@ -159,7 +162,8 @@ else: volSize = "%s" % (size / 2 / 1024) - lvm.createLV(dom.sdUUID, volUUID, volSize, activate=True) + lvm.createLV(dom.sdUUID, volUUID, volSize, activate=True, + initialTag=TAG_VOL_UNINIT) fileUtils.safeUnlink(volPath) os.symlink(lvm.lvPath(dom.sdUUID, volUUID), volPath) @@ -180,11 +184,11 @@ with cls._tagCreateLock: mdSlot = dom.mapMetaOffset(volUUID, VOLUME_MDNUMBLKS) - lvm.addLVTags(dom.sdUUID, volUUID, ( - "%s%s" % (TAG_PREFIX_MD, mdSlot), - "%s%s" % (TAG_PREFIX_PARENT, srcVolUUID,), - "%s%s" % (TAG_PREFIX_IMAGE, imgUUID,) - )) + mdTags = ["%s%s" % (TAG_PREFIX_MD, mdSlot), + "%s%s" % (TAG_PREFIX_PARENT, srcVolUUID), + "%s%s" % (TAG_PREFIX_IMAGE, imgUUID)] + lvm.changeLVTags(dom.sdUUID, volUUID, delTags=[TAG_VOL_UNINIT], + addTags=mdTags) try: lvm.deactivateLVs(dom.sdUUID, volUUID) @@ -541,13 +545,15 @@ def getMetaOffset(self): if self.metaoff: return self.metaoff - l = lvm.getLV(self.sdUUID, self.volUUID).tags - for t in l: - if t.startswith(TAG_PREFIX_MD): - return int(t[3:]) - self.log.error("missing offset tag on volume %s", self.volUUID) - raise se.VolumeMetadataReadError("missing offset tag on volume %s" - % self.volUUID) + try: + md = _getVolumeTag(self.sdUUID, self.volUUID, TAG_PREFIX_MD) + except se.MissingTagOnLogicalVolume: + self.log.error("missing offset tag on volume %s/%s", + self.sdUUID, self.volUUID, exc_info=True) + raise se.VolumeMetadataReadError("missing offset tag on volume" + "%s/%s" % (self.sdUUID, self.volUUID)) + else: + return int(md) def getMetadataId(self): """ @@ -633,7 +639,16 @@ def _getVolumeTag(sdUUID, volUUID, tagPrefix): - for tag in lvm.getLV(sdUUID, volUUID).tags: + tags = lvm.getLV(sdUUID, volUUID).tags + if TAG_VOL_UNINIT in tags: + log.warning("Reloading unfinished volume %s/%s", sdUUID, volUUID) + lvm.invalidateVG(sdUUID) + tags = lvm.getLV(sdUUID, volUUID).tags + if TAG_VOL_UNINIT in tags: + log.error("Unfinished volume %s/%s", sdUUID, volUUID) + raise se.VolumeDoesNotExist("%s/%s" % (sdUUID, volUUID)) + + for tag in tags: if tag.startswith(tagPrefix): return tag[len(tagPrefix):] -- To view, visit http://gerrit.ovirt.org/9358 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I40cd67e563935de663d938cbc1bc9cf152802448 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Haim Ateya <hateya(a)redhat.com>

6 21

Change in vdsm[master]: bz#849886 allow multilib in bootstrap when download package
by lvroyce＠linux.vnet.ibm.com 04 Dec '12

04 Dec '12

Royce Lv has uploaded a new change for review. Change subject: bz#849886 allow multilib in bootstrap when download package ...................................................................... bz#849886 allow multilib in bootstrap when download package Change-Id: Id0574afc94c038f7b53b890bae875cf66d9b58f1 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vds_bootstrap/vds_bootstrap.py M vdsm_reg/deployUtil.py.in 2 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/7383/1 diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py index 8211c81..59230f2 100755 --- a/vds_bootstrap/vds_bootstrap.py +++ b/vds_bootstrap/vds_bootstrap.py @@ -443,9 +443,10 @@ def _installPackage(self, pack, type, update=0): nReturn = 0 + option = "--setopt=protected_multilib=false" logging.debug('Installing %s %d',pack, update ) if type == "REQ" or type == "DEVEL": - self.res, self.message = deployUtil.installAndVerify(type, pack, "install") + self.res, self.message = deployUtil.installAndVerify(type, pack, "install", option) res = "OK" if not self.res: res = "FAIL" @@ -456,7 +457,7 @@ if update == 1: yumcmd = "update" - self.res, self.message = deployUtil.installAndVerify(type, pack, yumcmd) + self.res, self.message = deployUtil.installAndVerify(type, pack, yumcmd, option) res = "OK" if not self.res: res = "FAIL" @@ -468,7 +469,7 @@ yumcmd = "update" self.res, self.message = deployUtil.installAndVerify(type, pack, - yumcmd) + yumcmd, option) res = "OK" if not self.res: res = "FAIL" diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in index e22bfb5..af37547 100644 --- a/vdsm_reg/deployUtil.py.in +++ b/vdsm_reg/deployUtil.py.in @@ -1015,7 +1015,7 @@ """ execFunc = [EX_YUM, "-y"] if args is not None: - execFunc += args + execFunc.append(args) if action == "install": execFunc.append(action) @@ -1033,7 +1033,7 @@ a package, and then verify it. """ fReturn = True - out, err, ret = yumInstallDeleteUpdate(pckgName, action, args=None) + out, err, ret = yumInstallDeleteUpdate(pckgName, action, args) msg = None if not ret: fReturn, msg = getPackageInfo(pckgType, pckgName, 'install') -- To view, visit http://gerrit.ovirt.org/7383 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id0574afc94c038f7b53b890bae875cf66d9b58f1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

2 2

Change in vdsm[master]: vdsm-tool: add the sebool configuration module
by Federico Simoncelli 03 Dec '12

03 Dec '12

Federico Simoncelli has uploaded a new change for review. Change subject: vdsm-tool: add the sebool configuration module ...................................................................... vdsm-tool: add the sebool configuration module This patch moves the sebool configuration from a shell scriptlet in the rpm package to the vdsm-tool command. Change-Id: I01baf1c17f7cad2a0525b261be6b5ac648576252 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm-tool/Makefile.am A vdsm-tool/seboolsetup.py M vdsm.spec.in 3 files changed, 69 insertions(+), 36 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/9362/1 diff --git a/vdsm-tool/Makefile.am b/vdsm-tool/Makefile.am index 997e339..348940e 100644 --- a/vdsm-tool/Makefile.am +++ b/vdsm-tool/Makefile.am @@ -29,5 +29,6 @@ __init__.py \ load_needed_modules.py \ passwd.py \ + seboolsetup.py \ validate_ovirt_certs.py \ $(NULL) diff --git a/vdsm-tool/seboolsetup.py b/vdsm-tool/seboolsetup.py new file mode 100644 index 0000000..dee1e58 --- /dev/null +++ b/vdsm-tool/seboolsetup.py @@ -0,0 +1,63 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# + +import seobject +from vdsm.tool import expose + +SEBOOL_ENABLED = "on" +SEBOOL_DISABLED = "off" + +VDSM_SEBOOL_LIST = [ + "virt_use_fusefs", + "virt_use_nfs", + "virt_use_samba", + "sanlock_use_fusefs", + "sanlock_use_nfs", + "sanlock_use_samba", + "virt_use_sanlock", +] + + +def setup_booleans(status): + sebool_obj = seobject.booleanRecords() + sebool_status = sebool_obj.get_all() + + sebool_obj.start() + + for sebool_variable in VDSM_SEBOOL_LIST: + if status and not all(sebool_status[sebool_variable]): + sebool_obj.modify(sebool_variable, SEBOOL_ENABLED) + + if not status and any(sebool_status[sebool_variable]): + sebool_obj.modify(sebool_variable, SEBOOL_DISABLED) + + sebool_obj.finish() + + +@expose("sebool-enable") +def sebool_enable(): + """Enable the required selinux booleans""" + setup_booleans(True) + + +@expose("sebool-disable") +def sebool_disable(): + """Disable the required selinux booleans""" + setup_booleans(False) diff --git a/vdsm.spec.in b/vdsm.spec.in index 3fa3395..033ce1a 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -456,30 +456,8 @@ /usr/sbin/usermod -a -G %{qemu_group},%{snlk_group} %{vdsm_user} /usr/sbin/usermod -a -G %{qemu_group},%{vdsm_group} %{snlk_user} -# vdsm makes extensive use of nfs-exported images -# The next lines will collect the default selinux behaviour for the booleans -virtNFS=$(/usr/sbin/semanage boolean -l | /bin/grep virt_use_nfs | cut -d ',' -f 2) -virtSANLOCK=$(/usr/sbin/semanage boolean -l | /bin/grep virt_use_sanlock | cut -d ',' -f 2) -snlkNFS=$(/usr/sbin/semanage boolean -l | /bin/grep sanlock_use_nfs | cut -d ',' -f 2) - -# Set the booleans and persist it across reboots -if [[ "${virtNFS}" == *off* || "${virtSANLOCK}" == *off* || \ - "${snlkNFS}" == *off* ]]; then - /usr/sbin/semanage boolean -m -S targeted -F /dev/stdin << _EOF -virt_use_nfs=1 -virt_use_sanlock=1 -sanlock_use_nfs=1 -_EOF -fi - -# Set the current state of SELinux booleans -if /usr/sbin/selinuxenabled; then - /usr/sbin/setsebool virt_use_nfs on - /usr/sbin/setsebool virt_use_sanlock on - /usr/sbin/setsebool sanlock_use_nfs on -fi - %post +%{_bindir}/vdsm-tool sebool-enable # set the vdsm "secret" password for libvirt %{_bindir}/vdsm-tool set-saslpasswd @@ -521,17 +499,7 @@ /bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \ /etc/sysctl.conf - /usr/sbin/semanage boolean -m -S targeted -F /dev/stdin << _EOF -virt_use_nfs=0 -virt_use_sanlock=0 -sanlock_use_nfs=0 -_EOF - - if /usr/sbin/selinuxenabled; then - /usr/sbin/setsebool virt_use_nfs off - /usr/sbin/setsebool virt_use_sanlock off - /usr/sbin/setsebool sanlock_use_nfs off - fi + %{_bindir}/vdsm-tool sebool-disable /usr/sbin/saslpasswd2 -p -a libvirt -d vdsm@ovirt @@ -794,9 +762,10 @@ %{python_sitearch}/%{vdsm_name}/betterPopen/__init__.py* %{python_sitearch}/%{vdsm_name}/betterPopen/createprocess.so %{python_sitearch}/%{vdsm_name}/tool/__init__.py* -%{python_sitearch}/%{vdsm_name}/tool/passwd.py* -%{python_sitearch}/%{vdsm_name}/tool/validate_ovirt_certs.py* %{python_sitearch}/%{vdsm_name}/tool/load_needed_modules.py* +%{python_sitearch}/%{vdsm_name}/tool/passwd.py* +%{python_sitearch}/%{vdsm_name}/tool/seboolsetup.py* +%{python_sitearch}/%{vdsm_name}/tool/validate_ovirt_certs.py* %files tests %doc %{_datadir}/%{vdsm_name}/tests/README -- To view, visit http://gerrit.ovirt.org/9362 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01baf1c17f7cad2a0525b261be6b5ac648576252 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

4 13

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches December 2012