June 2013 - vdsm-patches - Fedora Mailing-Lists

Change in vdsm[master]: Improve __prefetch logging.

by ewarszaw＠redhat.com

Eduardo has uploaded a new change for review. Change subject: Improve __prefetch logging. ...................................................................... Improve __prefetch logging. Related-To: https://bugzilla.redhat.com/show_bug.cgi?id=967296 Change-Id: I2c00fc114a8582aad15280f502a8a035d22af2a4 Signed-off-by: Eduardo <ewarszaw(a)redhat.com> --- M vdsm/storage/hsm.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/15483/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index a1cc1e7..eb8a5b8 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -2316,7 +2316,9 @@ else: sdCache.knownSDs.update(doms) - self.log.debug("knownSDs: %s", sdCache.knownSDs) + self.log.debug("knownSDs: {%s}", ", ".join("%s: %s.%s" % + (k, v.__module__, v.__name__) + for k, v in sdCache.knownSDs.iteritems())) res.append({'id': conDef["id"], 'status': status}) -- To view, visit http://gerrit.ovirt.org/15483 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c00fc114a8582aad15280f502a8a035d22af2a4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

10 years, 11 months

3
5
0 / 0

Change in vdsm[master]: vdsm_hooks/hostusb: Allow multiple usb devices with same ven...

by Jenkins CI RO

oVirt Jenkins CI Server has posted comments on this change. Change subject: vdsm_hooks/hostusb: Allow multiple usb devices with same vendor and product id ...................................................................... Patch Set 11: Build Successful http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2720/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1908/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2794/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/14237 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I831d047e5a2284dcc2e4db7608a9831e64f9c8dc Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: David Guglielmi <david.guglielmi(a)gmail.com> Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: David Guglielmi <david.guglielmi(a)gmail.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server

10 years, 11 months

1
0
0 / 0

Change in vdsm[master]: Add unit tests for iproute2 configurator

by wudxw＠linux.vnet.ibm.com

Mark Wu has uploaded a new change for review. Change subject: Add unit tests for iproute2 configurator ...................................................................... Add unit tests for iproute2 configurator Change-Id: If9f4dc10028a0d766b7dd13aeffa23b0fe533143 Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- M tests/netconfTests.py 1 file changed, 46 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/15302/1 diff --git a/tests/netconfTests.py b/tests/netconfTests.py index 3ae5590..ce0cdc7 100644 --- a/tests/netconfTests.py +++ b/tests/netconfTests.py @@ -35,6 +35,7 @@ from netconf import ifcfg from netmodels import Nic, Bond, Vlan, Bridge from netconf import libvirtCfg +from netconf import iproute2 from monkeypatch import MonkeyPatch from monkeypatch import MonkeyPatchScope @@ -218,9 +219,7 @@ ifaceObj.remove() self._assertIface(ifaceObj, removalAction=True) - @testValidation.ValidateRunningAsRoot - def testIfcfgConfigureNic(self): - configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter()) + def _testConfigureNic(self, configurator): nic = 'dummy0' self._testConfigureIface(nics=[nic], configurator=configurator) self._testRemoveIface(nics=[nic], configurator=configurator) @@ -250,12 +249,9 @@ if bond.ip: self._assertIfaceInfo(bondInfo) - @testValidation.ValidateRunningAsRoot - def testIfcfgConfigureBond(self): + def _testConfigureBond(self, configurator): if not os.path.exists(netinfo.BONDING_MASTERS): raise SkipTest("bonding kernel module could not be found.") - - configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter()) bond = 'bond100' nics = ['dummy1', 'dummy2'] @@ -282,9 +278,7 @@ if vlan.ip and not removalAction: self._assertIfaceInfo(vlanInfo) - @testValidation.ValidateRunningAsRoot - def testIfcfgConfigureVlan(self): - configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter()) + def _testConfigureVlan(self, configurator): vlanId = '1' nic = 'dummy3' @@ -319,9 +313,7 @@ if bridge.ip and not removalAction: self._assertIfaceInfo(bridgeInfo) - @testValidation.ValidateRunningAsRoot - def testIfcfgConfigureBridge(self): - configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter()) + def _testConfigureBridge(self, configurator): bridge = 'dummybridge' nic = 'dummy3' @@ -344,6 +336,7 @@ bond = 'bond100' nics = ['dummy1', 'dummy2'] bondOptions = 'mode=1 primary=dummy2' + self._testConfigureIface(bridge=bridge, bonding=bond, nics=nics, bondingOptions=bondOptions, configurator=configurator) @@ -357,3 +350,43 @@ self._testRemoveIface(bridge=bridge, vlan=vlanId, bonding=bond, nics=nics, bondingOptions=bondOptions, configurator=configurator) + + @testValidation.ValidateRunningAsRoot + def testIfcfgConfigureNic(self): + configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter()) + self._testConfigureNic(configurator) + + @testValidation.ValidateRunningAsRoot + def testIfcfgConfigureBond(self): + configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter()) + self._testConfigureBond(configurator) + + @testValidation.ValidateRunningAsRoot + def testIfcfgConfigureVlan(self): + configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter()) + self._testConfigureVlan(configurator) + + @testValidation.ValidateRunningAsRoot + def testIfcfgConfigureBridge(self): + configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter()) + self._testConfigureBridge(configurator) + + @testValidation.ValidateRunningAsRoot + def testIproute2ConfigureNic(self): + configurator = iproute2.Iproute2(iproute2.ConfigWriter()) + self._testConfigureNic(configurator) + + @testValidation.ValidateRunningAsRoot + def testIproute2ConfigureBond(self): + configurator = iproute2.Iproute2(iproute2.ConfigWriter()) + self._testConfigureBond(configurator) + + @testValidation.ValidateRunningAsRoot + def testIproute2ConfigureVlan(self): + configurator = iproute2.Iproute2(iproute2.ConfigWriter()) + self._testConfigureVlan(configurator) + + @testValidation.ValidateRunningAsRoot + def testIproute2ConfigureBridge(self): + configurator = iproute2.Iproute2(iproute2.ConfigWriter()) + self._testConfigureBridge(configurator) -- To view, visit http://gerrit.ovirt.org/15302 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9f4dc10028a0d766b7dd13aeffa23b0fe533143 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>

10 years, 11 months

2
2
0 / 0

Change in vdsm[master]: misc: handle scientific notation in readspeed

by Federico Simoncelli

Federico Simoncelli has uploaded a new change for review. Change subject: misc: handle scientific notation in readspeed ...................................................................... misc: handle scientific notation in readspeed When the amount of bytes is low and the speed is high the elapsed time is expressed using the scientific notation. In this patch: * minor fix to make _readfile prettier Bug-Url: http://bugzilla.redhat.com/show_bug.cgi?id=948232 Change-Id: I05168fe44e987e684c42392b1e64f1885533cc7d Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M tests/miscTests.py M vdsm/storage/misc.py 2 files changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/33/15433/1 diff --git a/tests/miscTests.py b/tests/miscTests.py index c05406b..d8b188a 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -890,6 +890,9 @@ ("1024", "s", "1", "k", "1", "1", "k"), ("1572864", "s", "1.5", "M", "1.5", "1", "M"), ("1610612736", "s", "1.5", "G", "1000.5", "1.53", "M"), + ("479", "s", "479", "", "5.6832e-05", "8.4", "M"), + ("512", "s", "512e-3", "M", "1", "512e-3", "M"), + ("524288", "s", "512e3", "", "1", "512e3", ""), ) def testReadSpeedRegExp(self): diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index e5ba760..1b10619 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -211,14 +211,14 @@ """ Read the content of the file using /bin/dd command """ - _rc, out, _err = _readfile(name, buffersize) + _, out, _ = _readfile(name, buffersize) return out _readspeed_regex = re.compile( - "(?P<bytes>\d+) bytes? \([\d.]+ [kMGT]*B\) copied, " - "(?P<seconds>[\d.]+) s, " - "[\d.]+ [kMGT]*B/s" + "(?P<bytes>\d+) bytes? \([\de\-.]+ [kMGT]*B\) copied, " + "(?P<seconds>[\de\-.]+) s, " + "[\de\-.]+ [kMGT]*B/s" ) -- To view, visit http://gerrit.ovirt.org/15433 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05168fe44e987e684c42392b1e64f1885533cc7d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

10 years, 11 months

4
5
0 / 0

Change in vdsm[master]: vdsm_hooks/hostusb: Allow multiple usb devices with same ven...

by Jenkins CI RO

oVirt Jenkins CI Server has posted comments on this change. Change subject: vdsm_hooks/hostusb: Allow multiple usb devices with same vendor and product id ...................................................................... Patch Set 10: Build Successful http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2701/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1889/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2775/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/14237 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I831d047e5a2284dcc2e4db7608a9831e64f9c8dc Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: David Guglielmi <david.guglielmi(a)gmail.com> Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: David Guglielmi <david.guglielmi(a)gmail.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server

10 years, 11 months

1
0
0 / 0

Change in vdsm[master]: vdsm_hooks/hostusb: Allow multiple usb devices with same ven...

by Jenkins CI RO

oVirt Jenkins CI Server has posted comments on this change. Change subject: vdsm_hooks/hostusb: Allow multiple usb devices with same vendor and product id ...................................................................... Patch Set 9: Fails; I would prefer that you didn't submit this Build Failed http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2700/ : UNSTABLE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1888/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2774/ : FAILURE -- To view, visit http://gerrit.ovirt.org/14237 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I831d047e5a2284dcc2e4db7608a9831e64f9c8dc Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: David Guglielmi <david.guglielmi(a)gmail.com> Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: David Guglielmi <david.guglielmi(a)gmail.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server

10 years, 11 months

1
0
0 / 0

Change in vdsm[master]: vdsm_hooks/hostusb: Allow multiple usb devices with same ven...

by Jenkins CI RO

oVirt Jenkins CI Server has posted comments on this change. Change subject: vdsm_hooks/hostusb: Allow multiple usb devices with same vendor and product id ...................................................................... Patch Set 8: Fails; I would prefer that you didn't submit this Build Failed http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2699/ : UNSTABLE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1887/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2773/ : FAILURE -- To view, visit http://gerrit.ovirt.org/14237 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I831d047e5a2284dcc2e4db7608a9831e64f9c8dc Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: David Guglielmi <david.guglielmi(a)gmail.com> Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: David Guglielmi <david.guglielmi(a)gmail.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server

10 years, 11 months

1
0
0 / 0

Change in vdsm[master]: vdsm_hooks/hostusb: Allow multiple usb devices with same ven...

by Jenkins CI RO

oVirt Jenkins CI Server has posted comments on this change. Change subject: vdsm_hooks/hostusb: Allow multiple usb devices with same vendor and product id ...................................................................... Patch Set 7: Fails; I would prefer that you didn't submit this Build Failed http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2698/ : UNSTABLE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1886/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2772/ : FAILURE -- To view, visit http://gerrit.ovirt.org/14237 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I831d047e5a2284dcc2e4db7608a9831e64f9c8dc Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: David Guglielmi <david.guglielmi(a)gmail.com> Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: David Guglielmi <david.guglielmi(a)gmail.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server

10 years, 11 months

1
0
0 / 0

Change in vdsm[master]: vdsm_hooks/hostusb: Allow multiple usb devices with same ven...

by Jenkins CI RO

oVirt Jenkins CI Server has posted comments on this change. Change subject: vdsm_hooks/hostusb: Allow multiple usb devices with same vendor and product id ...................................................................... Patch Set 6: Fails; I would prefer that you didn't submit this Build Failed http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2697/ : UNSTABLE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1885/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2771/ : FAILURE -- To view, visit http://gerrit.ovirt.org/14237 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I831d047e5a2284dcc2e4db7608a9831e64f9c8dc Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: David Guglielmi <david.guglielmi(a)gmail.com> Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: David Guglielmi <david.guglielmi(a)gmail.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server

10 years, 11 months

1
0
0 / 0

Change in vdsm[master]: netinfo: Simplify the check if an interface still has any ot...

by wudxw＠linux.vnet.ibm.com

Mark Wu has uploaded a new change for review. Change subject: netinfo: Simplify the check if an interface still has any other users. ...................................................................... netinfo: Simplify the check if an interface still has any other users. In current oVirt network models, a nic device has four kinds of usages: * bonding's slave * vlan's slave * bridge's port * bridgeless network's interface A bond device has the same usages as nic except the first one. And an interface(nic or bonding) could be multiplexed by different usages. But bonding and bridge need use the interface exclusively. So only two combinations are valid: * multiple vlan users * multiple vlan users with one bridgeless network user When we remove one user of an interface, we need check if the interface still has by other users except the user being removed currently. According to that, we decide if restore the interface to initial state or destroy it (for bonding). The old implementation of this check is getting a set of all users(bonding, vlan, bridge and bridgeless network) and drop the user removed from the set. So it needs get the information of the user being removed. Actually, it's not neccessary. We could make a snapshot of the netinfo after the user is removed. The new snapshot shouldn't include the interface already removed, because we delete the network entities from top to bottom. We just need to check if it still has one or more vlan or bridgeless network users because bridge and bond can't coexist with any type of users. The conflict is validated when a new network is added. In the old implementation, the checks for nic and bonding are handled differently because it also checks the bond users if a nic is a slave of bond. Actually, it's not neccessary either. If the bond has other users, we will not remove its slave. That means the check will not be invoked. So for the check of nic, it doesn't need care about the usage of its bond master, because it's done in bond level. Change-Id: Ie70cbfcc4c561c98f2e90685329900796517f933 Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- M lib/vdsm/netinfo.py M vdsm/configNetwork.py 2 files changed, 21 insertions(+), 29 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/16/15416/1 diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index 564859e..8bf7078 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -605,32 +605,23 @@ users.add(v) return users - def nicOtherUsers(self, bridge, vlan, bonding, nic): + def ifaceHasOtherUsers(self, iface): """ - Returns a list of interfaces using a nic, - other than the specified one. - """ - if bonding: - owner = bonding - elif vlan: - owner = nic + '.' + vlan - else: - owner = bridge - users = self.ifaceUsers(nic) - if bonding: - users.update(self.bondingOtherUsers(bridge, vlan, bonding)) - users.discard(owner) - return users + It's used to check if an interface has other direct users when one of + its user is removed. It could only happen in the following two cases: - def bondingOtherUsers(self, bridge, vlan, bonding): + --> vlan1 --> network1 (bridged or bridgeless) + / + interface(nic or bond) ---> vlan2 --> network2 (bridged or bridgeless) + \ + --> vlan3 --> network3 (bridged or bridgeless) + + --> vlan1 --> network1 (bridged or bridgeless) + / + interface(nic or bond) ---> vlan2 --> network2 (bridged or bridgeless) + \ + --> network3 (bridgeless) + """ - Return a list of nics/interfaces using a bonding, - other than the specified one. - """ - if vlan: - owner = bonding + '.' + vlan - else: - owner = bridge - users = self.ifaceUsers(bonding) - users.discard(owner) - return users + return (list(self.getVlansForIface(iface)) or + self.getBridgelessNetworkForIface(iface)) diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 22d3699..fee985a 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -251,7 +251,7 @@ def _removeUnusedNics(network, vlan, bonding, nics, configWriter): _netinfo = netinfo.NetInfo() for nic in nics: - if not _netinfo.nicOtherUsers(network, vlan, bonding, nic): + if not _netinfo.ifaceHasOtherUsers(nic): ifdown(nic) configWriter.removeNic(nic) ifup(nic) @@ -345,15 +345,16 @@ # The (relatively) new setupNetwork verb allows to remove a network # defined on top of an bonding device without break the bond itself. + _netinfo = netinfo.NetInfo() if implicitBonding: - if bonding and not _netinfo.bondingOtherUsers(network, vlan, bonding): + if bonding and not _netinfo.ifaceHasOtherUsers(bonding): ifdown(bonding) configWriter.removeBonding(bonding) _removeUnusedNics(network, vlan, bonding, nics, configWriter) elif not bonding: _removeUnusedNics(network, vlan, bonding, nics, configWriter) - elif not _netinfo.bondingOtherUsers(network, vlan, bonding): + elif not _netinfo.ifaceHasOtherUsers(bonding): ifdown(bonding) configWriter.setBondingMtu(bonding, DEFAULT_MTU) ifup(bonding) -- To view, visit http://gerrit.ovirt.org/15416 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie70cbfcc4c561c98f2e90685329900796517f933 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>

10 years, 11 months

4
13
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches June 2013