vdsm-patches June 2014

vdsm-patches@lists.fedorahosted.org

41 participants
740 discussions

Change in vdsm[master]: json-rpc: Protocol detection
by Jenkins CI RO 06 Jun '14

06 Jun '14

oVirt Jenkins CI Server has posted comments on this change. Change subject: json-rpc: Protocol detection ...................................................................... Patch Set 34: Build Failed http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9758/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/688/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9602/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_storage_functional_tests_localfs_g… : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8820/ : FAILURE -- To view, visit http://gerrit.ovirt.org/26300 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id739a40e2b37dcc175137ec91cd5ec166ad24a75 Gerrit-PatchSet: 34 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Liron Ar <laravot(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No

1 0

Change in vdsm[master]: json-rpc: Protocol detection
by Jenkins CI RO 06 Jun '14

06 Jun '14

oVirt Jenkins CI Server has posted comments on this change. Change subject: json-rpc: Protocol detection ...................................................................... Patch Set 34: Build Failed http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8816/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/688/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9602/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_storage_functional_tests_localfs_g… : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9758/ : FAILURE -- To view, visit http://gerrit.ovirt.org/26300 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id739a40e2b37dcc175137ec91cd5ec166ad24a75 Gerrit-PatchSet: 34 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Liron Ar <laravot(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No

1 0

Change in vdsm[master]: json-rpc: Protocol detection
by Jenkins CI RO 06 Jun '14

06 Jun '14

oVirt Jenkins CI Server has posted comments on this change. Change subject: json-rpc: Protocol detection ...................................................................... Patch Set 34: Build Failed http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8816/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/688/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9602/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_storage_functional_tests_localfs_g… : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9757/ : FAILURE -- To view, visit http://gerrit.ovirt.org/26300 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id739a40e2b37dcc175137ec91cd5ec166ad24a75 Gerrit-PatchSet: 34 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Liron Ar <laravot(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No

1 0

Change in vdsm[master]: json-rpc: Protocol detection
by Nir Soffer 06 Jun '14

06 Jun '14

Nir Soffer has posted comments on this change. Change subject: json-rpc: Protocol detection ...................................................................... Patch Set 34: This Jenkins error: http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8816/console Is already solved in master and not related to this patch. -- To view, visit http://gerrit.ovirt.org/26300 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id739a40e2b37dcc175137ec91cd5ec166ad24a75 Gerrit-PatchSet: 34 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Liron Ar <laravot(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No

1 0

Change in vdsm[master]: pyflakes: use #noqa instead of invented hack
by Dan Kenigsberg 06 Jun '14

06 Jun '14

Dan Kenigsberg has uploaded a new change for review. Change subject: pyflakes: use #noqa instead of invented hack ...................................................................... pyflakes: use #noqa instead of invented hack Older versions of pyflakes complain about list comprehension hiding other variables. Setting #noqa on the relevant lines should silence this problem. Change-Id: Ie0c2f147d04dccf2cbe0921bb23a8c6a98d7b989 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M Makefile.am M vdsm/network/sourceroute.py M vdsm/storage/lvm.py 3 files changed, 5 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/46/28446/1 diff --git a/Makefile.am b/Makefile.am index dde8651..af88b30 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,14 +76,10 @@ $(NULL) -SKIP_PYFLAKES_ERR = "\./vdsm/storage/lvm\.py.*: list comprehension redefines \ - 'lv' from line .*" - check-local: + python -c 'import pyflakes; print "pyflakes", pyflakes.__version__' find . -path './.git' -prune -type f -o \ - -name '*.py' -o -name '*.py.in' | xargs $(PYFLAKES) | \ - grep -w -v $(SKIP_PYFLAKES_ERR) | \ - while read LINE; do echo "$$LINE"; false; done + -name '*.py' -o -name '*.py.in' | xargs $(PYFLAKES) $(PEP8) --version for x in $(PEP8_BLACKLIST); do \ exclude="$${exclude},$${x}" ; \ diff --git a/vdsm/network/sourceroute.py b/vdsm/network/sourceroute.py index 29093e1..bb3287e 100644 --- a/vdsm/network/sourceroute.py +++ b/vdsm/network/sourceroute.py @@ -150,7 +150,7 @@ allRules.append(rule) # Find the rule we put in place with 'device' as its 'srcDevice' - rules = [rule for rule in allRules if rule.srcDevice == device] + rules = [rule for rule in allRules if rule.srcDevice == device] # noqa if not rules: logging.error("Routing rules not found for device %s", device) @@ -161,7 +161,7 @@ # Find the other rule we put in place - It'll have 'network' as # its source - rules += [rule for rule in allRules if rule.source == network] + rules += [rule for rule in allRules if rule.source == network] # noqa return rules diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py index 86edf55..b7789d9 100644 --- a/vdsm/storage/lvm.py +++ b/vdsm/storage/lvm.py @@ -612,7 +612,7 @@ else: lvs = dict(self._lvs) # lvs = self._reloadlvs() - lvs = [lv for lv in lvs.values() + lvs = [lv for lv in lvs.values() # noqa if not isinstance(lv, Stub) and (lv.vg_name == vgName)] res = lvs return res -- To view, visit http://gerrit.ovirt.org/28446 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0c2f147d04dccf2cbe0921bb23a8c6a98d7b989 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

2 2

Change in vdsm[master]: upgrade_unified: fix for nicless and bridges with vnics
by asegurap＠redhat.com 06 Jun '14

06 Jun '14

Antoni Segura Puimedon has uploaded a new change for review. Change subject: upgrade_unified: fix for nicless and bridges with vnics ...................................................................... upgrade_unified: fix for nicless and bridges with vnics The upgrade script had a mistake when dealing with bridged networks that made it not consider bridgeless networks nor bridges that had vnics on them. This bug would have made that a bridge with nic eth2 and several vnics would have setup a network targetting: 'eth2vnet0vnet1' Change-Id: I979ad260e86865fc7ca9760d58765e4bf0c14c3c Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M lib/vdsm/tool/unified_persistence.py 1 file changed, 15 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/28354/1 diff --git a/lib/vdsm/tool/unified_persistence.py b/lib/vdsm/tool/unified_persistence.py index 46bf8e2..d4222e6 100644 --- a/lib/vdsm/tool/unified_persistence.py +++ b/lib/vdsm/tool/unified_persistence.py @@ -64,10 +64,20 @@ networks[network]['bridged'] = netParams['bridged'] # Determine devices: nic/bond -> vlan -> bridge - physicalDevice = "".join(netParams['ports']) if \ - netParams.get('ports') else netParams.get('interface') - topLevelDevice = netParams['iface'] if \ - netParams['bridged'] else physicalDevice + topLevelDevice = netParams['iface'] + if netParams['bridged']: + devices = (netinfo.nics.keys() + netinfo.vlans.keys() + + netinfo.bondings.keys()) + nonVnicPorts = [dev for dev in netParams['ports'] if + dev in devices] + # A network should only ever have (at most) an underlying + # device hierarchy + if nonVnicPorts: + physicalDevice, = nonVnicPorts + else: + physicalDevice = None # vdsm allows nicless VM nets + else: + physicalDevice = topLevelDevice # Copy ip addressing information bootproto = str(getIfaceCfg(topLevelDevice).get('BOOTPROTO')) @@ -96,7 +106,7 @@ # Is the physical device a bond or a nic? if physicalDevice in netinfo.bondings: networks[network]['bonding'] = physicalDevice - else: + elif physicalDevice in netinfo.nics: networks[network]['nic'] = physicalDevice return networks -- To view, visit http://gerrit.ovirt.org/28354 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I979ad260e86865fc7ca9760d58765e4bf0c14c3c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

3 8

Change in vdsm[master]: api: remove obsolete volume prepare and teardown
by Federico Simoncelli 06 Jun '14

06 Jun '14

Federico Simoncelli has uploaded a new change for review. Change subject: api: remove obsolete volume prepare and teardown ...................................................................... api: remove obsolete volume prepare and teardown Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1092166 Change-Id: Ic101ebc6e62e83b06b268c52e146cf0740fab887 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/API.py M vdsm/BindingXMLRPC.py M vdsm/storage/hsm.py M vdsm_api/vdsmapi-schema.json 4 files changed, 0 insertions(+), 142 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/28390/1 diff --git a/vdsm/API.py b/vdsm/API.py index 8b1032d..c43c1d0 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -766,10 +766,6 @@ return self._irs.setVolumeSize(self._sdUUID, self._spUUID, self._imgUUID, self._UUID, newSize) - def prepare(self, rw): - return self._irs.prepareVolume(self._sdUUID, self._spUUID, - self._imgUUID, self._UUID, rw) - def refresh(self): return self._irs.refreshVolume(self._sdUUID, self._spUUID, self._imgUUID, self._UUID) @@ -782,10 +778,6 @@ def setLegality(self, legality): return self._irs.setVolumeLegality(self._sdUUID, self._spUUID, self._imgUUID, self._UUID, legality) - - def tearDown(self): - return self._irs.teardownVolume(self._sdUUID, self._spUUID, - self._imgUUID, self._UUID) class Image(APIBase): diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py index 87ce86f..08a818d 100644 --- a/vdsm/BindingXMLRPC.py +++ b/vdsm/BindingXMLRPC.py @@ -850,10 +850,6 @@ volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID) return volume.setSize(newSize) - def volumePrepare(self, sdUUID, spUUID, imgUUID, volUUID, rw=True): - volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID) - return volume.prepare(rw) - def volumeRefresh(self, sdUUID, spUUID, imgUUID, volUUID): volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID) return volume.refresh() @@ -866,10 +862,6 @@ def volumeSetLegality(self, sdUUID, spUUID, imgUUID, volUUID, legality): volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID) return volume.setLegality(legality) - - def volumeTearDown(self, sdUUID, spUUID, imgUUID, volUUID): - volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID) - return volume.tearDown() def taskClear(self, taskId): task = API.Task(taskId) @@ -1079,11 +1071,9 @@ (self.volumeGetPath, 'getVolumePath'), (self.volumeGetSize, 'getVolumeSize'), (self.volumeSetSize, 'volumeSetSize'), - (self.volumePrepare, 'prepareVolume'), (self.volumeRefresh, 'refreshVolume'), (self.volumeSetDescription, 'setVolumeDescription'), (self.volumeSetLegality, 'setVolumeLegality'), - (self.volumeTearDown, 'teardownVolume'), (self.tasksGetAllInfo, 'getAllTasksInfo'), (self.tasksGetAllStatuses, 'getAllTasksStatuses'), (self.tasksGetAll, 'getAllTasks'), diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index e874c23..afc5c0a 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -65,7 +65,6 @@ from threadLocal import vars from vdsm import constants from storageConstants import STORAGE -from resourceFactories import IMAGE_NAMESPACE import resourceManager as rm import devicemapper import logUtils @@ -3127,88 +3126,6 @@ fails = supervdsm.getProxy().rmAppropriateRules(thiefId) if fails: self.log.error("Failed to remove the following rules: %s", fails) - - @public - def prepareVolume(self, sdUUID, spUUID, imgUUID, volUUID, rw=True, - options=None): - """ - Prepares a volume (used in SAN). - Activates LV and rebuilds 'images' subtree. - - .. warning:: - This method is obsolete and is kept only for testing purposes; - use prepareImage instead. - - :param sdUUID: The UUID of the storage domain that owns the volume. - :type sdUUID: UUID - :param spUUID: The UUID of the storage pool that owns the volume. - :type spUUID: UUID - :param imgUUID: The UUID of the image contained on the volume. - :type imgUUID: UUID - :param volUUID: The UUID of the volume you want to prepare. - :type volUUID: UUID - :param rw: Should the volume be set as RW. ? - :type rw: bool - :param options: ? - """ - vars.task.getSharedLock(STORAGE, sdUUID) - imageResourcesNamespace = sd.getNamespace(sdUUID, IMAGE_NAMESPACE) - lockType = rm.LockType.exclusive if rw else rm.LockType.shared - timeout = config.getint('irs', 'prepare_image_timeout') / 1000.0 - - imgResource = rmanager.acquireResource(imageResourcesNamespace, - imgUUID, lockType, timeout) - try: - vol = sdCache.produce(sdUUID=sdUUID).produceVolume( - imgUUID=imgUUID, volUUID=volUUID) - # NB We want to be sure that at this point HSM does not use stale - # LVM cache info, so we call refresh explicitly. We may want to - # remove this refresh later, when we come up with something better. - vol.refreshVolume() - vol.prepare(rw=rw) - - self._preparedVolumes[sdUUID + volUUID].append(imgResource) - except: - self.log.error("Prepare volume %s in domain %s failed", - volUUID, sdUUID, exc_info=True) - imgResource.release() - raise - - @public - def teardownVolume(self, sdUUID, spUUID, imgUUID, volUUID, rw=False, - options=None): - """ - Tears down a volume (used in SAN). - Deactivates LV. - - .. warning:: - This method is obsolete and is kept only for testing purposes; - use teardownImage instead. - - :param sdUUID: The UUID of the storage domain that owns the volume. - :type sdUUID: UUID - :param spUUID: The UUID of the storage pool that owns the volume. - :type spUUID: UUID - :param imgUUID: The UUID of the image contained on the volume. - :type imgUUID: UUID - :param volUUID: The UUID of the volume you want to teardown. - :type volUUID: UUID - :param rw: deprecated - :param options: ? - """ - vars.task.getSharedLock(STORAGE, sdUUID) - try: - imgResource = self._preparedVolumes[sdUUID + volUUID].pop() - except IndexError: - raise se.VolumeWasNotPreparedBeforeTeardown() - - imgResource.release() - - try: - volclass = sdCache.produce(sdUUID).getVolumeClass() - volclass.teardown(sdUUID=sdUUID, volUUID=volUUID) - except Exception: - self.log.warn("Problem tearing down volume", exc_info=True) @public def prepareImage(self, sdUUID, spUUID, imgUUID, leafUUID): diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 1d094b8..6457af8 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -7233,28 +7233,6 @@ 'returns': 'VolumeSizeInfo'} ## -# @Volume.prepare: -# -# Make a Volume accessible. -# -# @volumeID: The UUID of the Volume -# -# @storagepoolID: The Storage Pool associated with the Volume -# -# @storagedomainID: The Storage Domain associated with the Volume -# -# @imageID: The Image associated with the Volume -# -# @rw: If True, the Volume should be made writeable, otherwise -# read-only -# -# Since: 4.10.0 -## -{'command': {'class': 'Volume', 'name': 'prepare'}, - 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', - 'storagedomainID': 'UUID', 'imageID': 'UUID', 'rw': 'bool'}} - -## # @Volume.refresh: # # Refresh Volume to synchronize changes made by a remote host. @@ -7315,25 +7293,6 @@ 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', 'storagedomainID': 'UUID', 'imageID': 'UUID', 'legality': 'VolumeLegality'}} - -## -# @Volume.tearDown: -# -# Deactivate the Volume and release resources. -# -# @volumeID: The UUID of the Volume -# -# @storagepoolID: The Storage Pool associated with the Volume -# -# @storagedomainID: The Storage Domain associated with the Volume -# -# @imageID: The Image associated with the Volume -# -# Since: 4.10.0 -## -{'command': {'class': 'Volume', 'name': 'tearDown'}, - 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', - 'storagedomainID': 'UUID', 'imageID': 'UUID'}} ## # @VM.setNumberOfCpus: -- To view, visit http://gerrit.ovirt.org/28390 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic101ebc6e62e83b06b268c52e146cf0740fab887 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

4 12

Change in vdsm[master]: net: janitorial: format log messages lazily
by Dan Kenigsberg 06 Jun '14

06 Jun '14

Dan Kenigsberg has uploaded a new change for review. Change subject: net: janitorial: format log messages lazily ...................................................................... net: janitorial: format log messages lazily Change-Id: Iac858d31e363483776ba73fd2f0ae9b0907cd52b Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/netconfpersistence.py M lib/vdsm/netinfo.py M lib/vdsm/tool/nwfilter.py M vdsm/network/api.py M vdsm/network/configurators/__init__.py M vdsm/network/configurators/ifcfg.py M vdsm/network/sourceroute.py 7 files changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/28249/1 diff --git a/lib/vdsm/netconfpersistence.py b/lib/vdsm/netconfpersistence.py index d400df6..5b43980 100644 --- a/lib/vdsm/netconfpersistence.py +++ b/lib/vdsm/netconfpersistence.py @@ -65,25 +65,25 @@ ('configurator', '_netinfo', 'force', 'implicitBonding')) self.networks[network] = cleanAttrs - logging.info('Adding network %s(%s)' % (network, cleanAttrs)) + logging.info('Adding network %s(%s)', network, cleanAttrs) def removeNetwork(self, network): try: del self.networks[network] - logging.info('Removing network %s' % network) + logging.info('Removing network %s', network) except KeyError: - logging.debug('Network %s not found for removal' % network) + logging.debug('Network %s not found for removal', network) def setBonding(self, bonding, attributes): self.bonds[bonding] = attributes - logging.info('Adding %s(%s)' % (bonding, attributes)) + logging.info('Adding %s(%s)', bonding, attributes) def removeBonding(self, bonding): try: del self.bonds[bonding] - logging.info('Removing %s' % bonding) + logging.info('Removing %s', bonding) except KeyError: - logging.debug('%s not found for removal' % bonding) + logging.debug('%s not found for removal', bonding) @staticmethod def _confDictDiff(lhs, rhs): @@ -118,7 +118,7 @@ return json.load(configurationFile) except IOError as ioe: if ioe.errno == os.errno.ENOENT: - logging.debug('Network entity at %s not found' % path) + logging.debug('Network entity at %s not found', path) return {} else: raise @@ -154,8 +154,8 @@ def _clearDisk(self): try: - logging.info('Clearing %s and %s' % (self.networksPath, - self.bondingsPath)) + logging.info('Clearing %s and %s', self.networksPath, + self.bondingsPath) for filePath in os.listdir(self.networksPath): self._removeConfig(self.networksPath + filePath) diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index e25def9..cfcc5ef 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -829,7 +829,7 @@ ipv6bin = '\x00' * 10 + '\xff\xff' + socket.inet_aton(ip) mapped = socket.inet_ntop(socket.AF_INET6, ipv6bin) except socket.error as e: - logging.debug("getIfaceByIP: %s" % str(e)) + logging.debug("getIfaceByIP: %s", e) return mapped @@ -840,13 +840,13 @@ try: route = routeGet([destinationIP])[0] except (IPRoute2Error, IndexError): - logging.exception('Could not route to %s' % destinationIP) + logging.exception('Could not route to %s', destinationIP) return '' try: return Route.fromText(route).device except ValueError: - logging.exception('Could not parse route %s' % route) + logging.exception('Could not parse route %s', route) return '' diff --git a/lib/vdsm/tool/nwfilter.py b/lib/vdsm/tool/nwfilter.py index bf360db..85f6303 100755 --- a/lib/vdsm/tool/nwfilter.py +++ b/lib/vdsm/tool/nwfilter.py @@ -58,7 +58,7 @@ """ nwFilter = conn.nwfilterDefineXML(self.buildFilterXml()) - logging.debug("Filter %s was defined" % nwFilter.name()) + logging.debug("Filter %s was defined", nwFilter.name()) class NoMacSpoofingFilter(NwFilter): diff --git a/vdsm/network/api.py b/vdsm/network/api.py index 0819d81..bf210b4 100755 --- a/vdsm/network/api.py +++ b/vdsm/network/api.py @@ -631,7 +631,7 @@ # Remove edited networks and networks with 'remove' attribute for network, networkAttrs in networks.items(): if network in _netinfo.networks: - logger.debug("Removing network %r" % network) + logger.debug("Removing network %r", network) delNetwork(network, configurator=configurator, force=force, implicitBonding=False, _netinfo=_netinfo) if 'remove' in networkAttrs: @@ -643,7 +643,7 @@ # If the network was not in _netinfo but is in the networks # returned by libvirt, it means that we are dealing with # a broken network. - logger.debug('Removing broken network %r' % network) + logger.debug('Removing broken network %r', network) _delBrokenNetwork(network, libvirt_nets[network], configurator=configurator) if 'remove' in networkAttrs: @@ -669,7 +669,7 @@ d['nics'] = [d.pop('nic')] if 'nic' in d else [] d['force'] = force - logger.debug("Adding network %r" % network) + logger.debug("Adding network %r", network) addNetwork(network, configurator=configurator, implicitBonding=True, _netinfo=_netinfo, **d) _netinfo.updateDevices() # Things like a bond mtu can change diff --git a/vdsm/network/configurators/__init__.py b/vdsm/network/configurators/__init__.py index c8876b7..2923290 100644 --- a/vdsm/network/configurators/__init__.py +++ b/vdsm/network/configurators/__init__.py @@ -125,7 +125,7 @@ def _removeSourceRoute(self, netEnt, sourceRouteClass): if netEnt.ipConfig.bootproto != 'dhcp' and netEnt.master is None: - logging.debug("Removing source route for device %s" % netEnt.name) + logging.debug("Removing source route for device %s", netEnt.name) sourceRouteClass(netEnt.name, self).remove() def _setNewMtu(self, iface, ifaceVlans): diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py index 0d48453..8dc5743 100644 --- a/vdsm/network/configurators/ifcfg.py +++ b/vdsm/network/configurators/ifcfg.py @@ -535,8 +535,8 @@ writes the new configuration and sets the specified access mode.''' self._backup(fileName) configuration = self.CONFFILE_HEADER + '\n' + configuration - logging.debug('Writing to file %s configuration:\n%s' % (fileName, - configuration)) + logging.debug('Writing to file %s configuration:\n%s', fileName, + configuration) with open(fileName, 'w') as confFile: confFile.write(configuration) os.chmod(fileName, 0o664) diff --git a/vdsm/network/sourceroute.py b/vdsm/network/sourceroute.py index f029ab6..29093e1 100644 --- a/vdsm/network/sourceroute.py +++ b/vdsm/network/sourceroute.py @@ -116,7 +116,7 @@ try: route = Route.fromText(entry) except ValueError: - logging.debug("Could not parse route %s" % entry) + logging.debug("Could not parse route %s", entry) else: if route.table == table: routes.append(route) @@ -145,7 +145,7 @@ try: rule = Rule.fromText(entry) except ValueError: - logging.debug("Could not parse rule %s" % entry) + logging.debug("Could not parse rule %s", entry) else: allRules.append(rule) @@ -153,7 +153,7 @@ rules = [rule for rule in allRules if rule.srcDevice == device] if not rules: - logging.error("Routing rules not found for device %s" % device) + logging.error("Routing rules not found for device %s", device) return # Extract its destination network @@ -166,7 +166,7 @@ return rules def remove(self): - logging.info("Removing gateway - device: %s" % self.device) + logging.info("Removing gateway - device: %s", self.device) rules = self._getRules(self.device) if rules: -- To view, visit http://gerrit.ovirt.org/28249 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac858d31e363483776ba73fd2f0ae9b0907cd52b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

4 8

Change in vdsm[master]: _findLiveSnapshotSupport: do not assume that guest <features...
by Dan Kenigsberg 06 Jun '14

06 Jun '14

Dan Kenigsberg has uploaded a new change for review. Change subject: _findLiveSnapshotSupport: do not assume that guest <features> exist ...................................................................... _findLiveSnapshotSupport: do not assume that guest <features> exist Change-Id: I8e6d1ae6d020bedcfa8f2986fce628714e877765 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/caps.py 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/28349/1 diff --git a/vdsm/caps.py b/vdsm/caps.py index c5458e6..a4caa13 100644 --- a/vdsm/caps.py +++ b/vdsm/caps.py @@ -191,8 +191,11 @@ None if libvirt does not report the live snapshot support (as in version <= 1.2.2), ''' - features = guest.getElementsByTagName('features')[0] - for feature in features.childNodes: + features = guest.getElementsByTagName('features') + if not features: + return None + + for feature in features[0].childNodes: if feature.nodeName == 'disksnapshot': value = feature.getAttribute('default') if value.lower() == 'on': -- To view, visit http://gerrit.ovirt.org/28349 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e6d1ae6d020bedcfa8f2986fce628714e877765 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

4 8

Change in vdsm[master]: json-rpc: Protocol detection
by Nir Soffer 06 Jun '14

06 Jun '14

Nir Soffer has posted comments on this change. Change subject: json-rpc: Protocol detection ...................................................................... Patch Set 34: Code-Review+1 (1 comment) I think it is ready now. Hopefully breaking to smaller patches will not break anything. http://gerrit.ovirt.org/#/c/26300/34/vdsm/protocolDetector.py File vdsm/protocolDetector.py: Line 172: def _handle_connection_read(self, fd): Line 173: _, client_socket = self._pending_connections[fd] Line 174: try: Line 175: data = client_socket.recv(self._required_size, socket.MSG_PEEK) Line 176: if data is None: A comment explain this unusual return value would be nice. Line 177: return Line 178: except socket.error as e: Line 179: if e.errno not in (errno.EAGAIN, errno.EWOULDBLOCK): Line 180: self.log.warning("Unable to read data") -- To view, visit http://gerrit.ovirt.org/26300 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id739a40e2b37dcc175137ec91cd5ec166ad24a75 Gerrit-PatchSet: 34 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Liron Ar <laravot(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes

1 0

← Newer
1
...
66
67
68
69
70
71
72
73
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches June 2014