vdsm-patches December 2013

vdsm-patches@lists.fedorahosted.org

48 participants
493 discussions

Change in vdsm[master]: set the # of vcpus for a VM (hot plug/unplug)
by Roy Golan 13 Jan '14

13 Jan '14

Roy Golan has uploaded a new change for review. Change subject: set the # of vcpus for a VM (hot plug/unplug) ...................................................................... set the # of vcpus for a VM (hot plug/unplug) RFE https://bugzilla.redhat.com/show_bug.cgi?id=833102 Change-Id: Ief35e1d335737cd98d21a5413ac9f8ab9d824c3e Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=833102 Signed-off-by: Roy Golan <rgolan(a)redhat.com> --- M client/vdsClient.py M lib/vdsm/define.py M tests/vmTests.py M vdsm/API.py M vdsm/BindingXMLRPC.py M vdsm/vm.py M vdsm_api/Bridge.py M vdsm_api/vdsmapi-schema.json 8 files changed, 82 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/21789/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 67ce3b7..097e21f 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -245,6 +245,9 @@ params = {'vmId': args[0], 'drive': drive} return self.ExecAndExit(self.s.hotunplugDisk(params)) + def setNumberOfCpus(self, args): + return self.ExecAndExit(self.s.setNumberOfCpus(args[0], args[1])) + def do_changeCD(self, args): vmId = args[0] file = self._parseDriveSpec(args[1]) @@ -2511,6 +2514,11 @@ '<vmId> <spUUID> <sdUUID> <imgUUID> <volUUID> <newSize>', 'Extends the virtual size of a disk' )), + 'setNumberOfCpu': ( + serv.setNumberOfCpus, ( + '<vmId> <numberOfCpus>', + 'set the number of cpus for a running VM' + )), } if _glusterEnabled: commands.update(ge.getGlusterCmdDict(serv)) @@ -2550,7 +2558,7 @@ try: serv.do_connect(hostPort) try: - commandArgs = args[2:] + commandArgs = args[2:] except: commandArgs = [] code, message = commands[command][0](commandArgs) diff --git a/lib/vdsm/define.py b/lib/vdsm/define.py index eb78633..389a5ba 100644 --- a/lib/vdsm/define.py +++ b/lib/vdsm/define.py @@ -132,6 +132,9 @@ 'transientErr': {'status': { 'code': 59, 'message': 'Action not permitted on a VM with transient disks'}}, + 'setNumberOfCpus': {'status': { + 'code': 60, + 'message': 'Failed to set the number of cpus'}}, 'recovery': {'status': { 'code': 99, 'message': 'Recovering from crash or Initializing'}}, diff --git a/tests/vmTests.py b/tests/vmTests.py index 1f69f0a..8d5fbd3 100644 --- a/tests/vmTests.py +++ b/tests/vmTests.py @@ -67,7 +67,7 @@ <uuid>9ffe28b6-6134-4b1e-8804-1185f49c436f</uuid> <memory>1048576</memory> <currentMemory>1048576</currentMemory> - <vcpu>8</vcpu> + <vcpu placement="static" current='8'>160</vcpu> <memtune> <min_guarantee>524288</min_guarantee> </memtune> diff --git a/vdsm/API.py b/vdsm/API.py index 48eecc6..40d641c 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -453,6 +453,22 @@ return curVm.hotunplugDisk(params) + def setNumberOfCpus(self, params): + try: + utils.validateMinimalKeySet(params, ('vmId', 'numberOfCpus')) + except ValueError: + self.log.error('Missing one of required parameters: vmId, drive') + return {'status': {'code': errCode['MissParam']['status']['code'], + 'message': 'Missing one of required ' + 'parameters: vmId, numberOfCpus'}} + try: + curVm = self._cif.vmContainer[self._UUID] + except KeyError: + self.log.warning("vm %s doesn't exist", self._UUID) + return errCode['noVM'] + + return curVm.setNumberOfCpus(params) + def migrate(self, params): """ Migrate a VM to a remote host. diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py index 1602c5c..fc5d926 100644 --- a/vdsm/BindingXMLRPC.py +++ b/vdsm/BindingXMLRPC.py @@ -283,6 +283,10 @@ vm = API.VM(vmId) return vm.vmUpdateDevice(params) + def setNumberOfCpus(self, vmId, numberOfCpus): + vm = API.VM(vmId) + return vm.setNumberOfCpus(vmId, numberOfCpus) + def vmSnapshot(self, vmId, snapDrives, snapMemVolHandle=''): """ Take snapshot of VM @@ -867,7 +871,8 @@ (self.vmHotunplugDisk, 'hotunplugDisk'), (self.vmHotplugNic, 'hotplugNic'), (self.vmHotunplugNic, 'hotunplugNic'), - (self.vmUpdateDevice, 'vmUpdateDevice')) + (self.vmUpdateDevice, 'vmUpdateDevice'), + (self.vmSetNumberOfCpus, 'setNumberOfCpus')) def getIrsMethods(self): return ((self.domainActivate, 'activateStorageDomain'), diff --git a/vdsm/vm.py b/vdsm/vm.py index 10eb54b..a2aa92a 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -77,6 +77,7 @@ WATCHDOG_DEVICES = 'watchdog' CONSOLE_DEVICES = 'console' SMARTCARD_DEVICES = 'smartcard' +CPU_DEVICES = 'cpu' def isVdsmImage(drive): @@ -852,7 +853,7 @@ <uuid>9ffe28b6-6134-4b1e-8804-1185f49c436f</uuid> <memory>262144</memory> <currentMemory>262144</currentMemory> - <vcpu>smp</vcpu> + <vcpu placement='static' current='smp'>160</vcpu> <devices> </devices> <memtune> @@ -877,7 +878,11 @@ memSizeKB = str(int(self.conf.get('memSize', '256')) * 1024) self.dom.appendChildWithArgs('memory', text=memSizeKB) self.dom.appendChildWithArgs('currentMemory', text=memSizeKB) - self.dom.appendChildWithArgs('vcpu', text=self.conf['smp']) + vcpu = self.dom.appendChildWithArgs('vcpu', text='160') + # hotplug cpu requires a maximum number which is higher than the static + # assignment. 160 is the max number of cpu's for a guest + # see http://www.ovirt.org/Hot_plug_cpu + vcpu.setAttrs({['placement', 'static'], ['current', self.conf['smp']]}) memSizeGuaranteedKB = str(1024 * int( self.conf.get('memGuaranteedSize', '0') @@ -3299,6 +3304,27 @@ params=customProps) return {'status': doneCode, 'vmList': self.status()} + def setNumberOfCpus(self, params): + + if self.isMigrating(): + return errCode['migInProgress'] + + self.log.debug("Setting number of cpus to : %s" % + params.get['numberOfCpus']) + + try: + self._dom.setVcpu(params.get('numberOfCpus')) + except libvirt.libvirtError as e: + self.log.error("setNumberOfCpus failed", exc_info=True) + if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: + return errCode['noVM'] + return {'status': {'code': errCode['setNumberOfCpus '] + ['status']['code'], 'message': e.message}} + + self.saveState() + + return {'status': doneCode, 'vmList': self.status()} + def _createTransientDisk(self, diskParams): if diskParams.get('shared', None) != DRIVE_SHARED_TYPE.TRANSIENT: return diff --git a/vdsm_api/Bridge.py b/vdsm_api/Bridge.py index f4d533c..959e0cb 100644 --- a/vdsm_api/Bridge.py +++ b/vdsm_api/Bridge.py @@ -340,6 +340,7 @@ 'Volume_getPath': {'ret': 'path'}, 'Volume_getSize': {'ret': Volume_getsize_Ret}, 'Host_getAllTasks': {'ret': 'tasks'}, + 'VM_setNumberOfCpus': {'ret': 'vmList'}, } diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index c8fbac4..7da896b 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -6679,3 +6679,21 @@ {'command': {'class': 'Volume', 'name': 'tearDown'}, 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', 'storagedomainID': 'UUID', 'imageID': 'UUID'}} + +## +# @VM.setNumberOfCpus: +# +# Set the number CPUs for a VM +# +# @vmID: The UUID of the VM +# +# @numberOfCpus: The new number of cpus +# +# Returns: +# The VM definition, as updated +# +# Since: 4.10.0 +## +{'command': {'class': 'VM', 'name': 'setNumberOfCpus'}, + 'data': {'vmID': 'UUID', 'numberOfCpus': 'int' }, + 'returns': 'VmDefinition'} -- To view, visit http://gerrit.ovirt.org/21789 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief35e1d335737cd98d21a5413ac9f8ab9d824c3e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Roy Golan <rgolan(a)redhat.com>

8 72

Change in vdsm[master]: ifcfg: include HWADDR line only if NM is around
by Dan Kenigsberg 13 Jan '14

13 Jan '14

Dan Kenigsberg has uploaded a new change for review. Change subject: ifcfg: include HWADDR line only if NM is around ...................................................................... ifcfg: include HWADDR line only if NM is around In prehistoric days, our ifcfg files included HWADDR lines for persistent NIC names on EL5 hosts. Our currently-supported systems no longer require HWADDR for that, but rather use udev rules. HWADDRs are still required if NetworkManager is running and needs them to adhere to our NM_CONTROLLED=no directive. HWADDR lines in ifcfg files are frowned upon, since they essentially duplicate information that already exists in udev rules. Change-Id: Ifc4904251150756594502367d4bea87620dfba58 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M debian/vdsm.install M vdsm.spec.in M vdsm/Makefile.am M vdsm/netconf/ifcfg.py A vdsm/nm.py 5 files changed, 60 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/22288/1 diff --git a/debian/vdsm.install b/debian/vdsm.install index 165d6e9..4a2d4aa 100644 --- a/debian/vdsm.install +++ b/debian/vdsm.install @@ -70,6 +70,7 @@ ./usr/share/vdsm/netconf/libvirtCfg.py ./usr/share/vdsm/neterrors.py ./usr/share/vdsm/netmodels.py +./usr/share/vdsm/nm.py ./usr/share/vdsm/parted_utils.py ./usr/share/vdsm/ppc64HardwareInfo.py ./usr/share/vdsm/respawn diff --git a/vdsm.spec.in b/vdsm.spec.in index 0bd4202..53c06f4 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1005,6 +1005,7 @@ %{_datadir}/%{vdsm_name}/netconf/iproute2.py* %{_datadir}/%{vdsm_name}/neterrors.py* %{_datadir}/%{vdsm_name}/netmodels.py* +%{_datadir}/%{vdsm_name}/nm.py* %{_datadir}/%{vdsm_name}/respawn %{_datadir}/%{vdsm_name}/sampling.py* %{_datadir}/%{vdsm_name}/set-conf-item diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 1044f66..795235c 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -44,6 +44,7 @@ momIF.py \ neterrors.py \ netmodels.py \ + nm.py \ parted_utils.py \ ppc64HardwareInfo.py \ sampling.py \ diff --git a/vdsm/netconf/ifcfg.py b/vdsm/netconf/ifcfg.py index ac36786..1c33837 100644 --- a/vdsm/netconf/ifcfg.py +++ b/vdsm/netconf/ifcfg.py @@ -40,6 +40,12 @@ import dsaversion import libvirtCfg import neterrors as ne +import nm + + +(a)utils.memoized +def _nm_around(): + return nm.running() class Ifcfg(Configurator): @@ -607,10 +613,12 @@ def addNic(self, nic, **opts): """ Create ifcfg-* file with proper fields for NIC """ _netinfo = netinfo.NetInfo() - hwaddr = (_netinfo.nics[nic.name].get('permhwaddr') or - _netinfo.nics[nic.name]['hwaddr']) + conf = '' + if _nm_around(): + hwaddr = (_netinfo.nics[nic.name].get('permhwaddr') or + _netinfo.nics[nic.name]['hwaddr']) - conf = 'HWADDR=%s\n' % pipes.quote(hwaddr) + conf += 'HWADDR=%s\n' % pipes.quote(hwaddr) if nic.bridge: conf += 'BRIDGE=%s\n' % pipes.quote(nic.bridge.name) if nic.bond: diff --git a/vdsm/nm.py b/vdsm/nm.py new file mode 100644 index 0000000..6e95060 --- /dev/null +++ b/vdsm/nm.py @@ -0,0 +1,46 @@ +# +# Copyright 2013 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 errno + +from vdsm.utils import execCmd +from vdsm.utils import CommandPath + +_NMCLI_BINARY = CommandPath('nmcli', '/usr/bin/nmcli') + + +class NMcliError(Exception): + pass + + +def running(): + """Return True iff NM is installed and running""" + + try: + cmd = [_NMCLI_BINARY.cmd, '-t', '-f', 'RUNNING', 'nm', 'status'] + except OSError as e: + if e.errno == errno.ENOENT: + return False + raise + + rc, out, err = execCmd(cmd, raw=True) + if rc: + raise NMcliError(rc, err) + return out.strip() == 'running' -- To view, visit http://gerrit.ovirt.org/22288 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc4904251150756594502367d4bea87620dfba58 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

4 27

Change in vdsm[master]: [WIP] objectfs integration
by peet＠redhat.com 13 Jan '14

13 Jan '14

Peter V. Saveliev has uploaded a new change for review. Change subject: [WIP] objectfs integration ...................................................................... [WIP] objectfs integration Export VM objects as files in runtime. Signed-off-by: Peter V. Saveliev <peet(a)redhat.com> Change-Id: I6dd2ca2245f3f5496eca9f8c14bed79d4638c189 --- M vdsm/vm.py 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/8383/1 diff --git a/vdsm/vm.py b/vdsm/vm.py index d49eef1..cd6c6ca 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -33,6 +33,7 @@ from logUtils import SimpleLogAdapter import libvirt from vdsm import vdscli +from pyvfs.objectfs import export DEFAULT_BRIDGE = config.get("vars", "default_bridge") @@ -250,6 +251,12 @@ 'Restoring state', 'Saving State', 'Up', 'WaitForLaunch') + +@export(blacklist=[ + "/log", + "/MigrationSourceThreadClass", + "/cif", + ]) class Vm(object): """ Used for abstracting communication between various parts of the -- To view, visit http://gerrit.ovirt.org/8383 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6dd2ca2245f3f5496eca9f8c14bed79d4638c189 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev <peet(a)redhat.com>

4 5

Change in vdsm[master]: vdsm: catch timeout while starting VM
by peet＠redhat.com 13 Jan '14

13 Jan '14

Peter V. Saveliev has uploaded a new change for review. Change subject: vdsm: catch timeout while starting VM ...................................................................... vdsm: catch timeout while starting VM If the requested VM does not start within given timeout, set its status to «down» and throw an exception. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=755528 Signed-off-by: Peter V. Saveliev <peet(a)redhat.com> Change-Id: I233d3c6cf1e62e46d005b8a6d502a02438100daa --- M vdsm/vm.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/12235/1 diff --git a/vdsm/vm.py b/vdsm/vm.py index 8b2bbb6..19e6aa4 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -35,6 +35,7 @@ import libvirt from vdsm import vdscli +__timeout__ = 10 DEFAULT_BRIDGE = config.get("vars", "default_bridge") DISK_DEVICES = 'disk' @@ -657,6 +658,10 @@ def run(self): self._creationThread.start() + self._creationThread.join(__timeout__) + if self._creationThread.is_alive(): + self.setDownStatus(ERROR, 'timeout while starting vm') + raise Exception("timeout exception") def memCommit(self): """ -- To view, visit http://gerrit.ovirt.org/12235 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I233d3c6cf1e62e46d005b8a6d502a02438100daa Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev <peet(a)redhat.com>

3 9

Change in vdsm[master]: vdsm: cope with I/O errors, getting permissions
by peet＠redhat.com 13 Jan '14

13 Jan '14

Peter V. Saveliev has uploaded a new change for review. Change subject: vdsm: cope with I/O errors, getting permissions ...................................................................... vdsm: cope with I/O errors, getting permissions Treat OSError during floppy image permission check as a read-only floppy. Later the floppy can be safely "ejected", if the error persists. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=755528 Change-Id: I1f595a7adc05cd2efbfb831c247233ecb01da05a Signed-off-by: Peter V. Saveliev <peet(a)redhat.com> --- M vdsm/vm.py 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/71/18371/1 diff --git a/vdsm/vm.py b/vdsm/vm.py index 4f80b4c..165670a 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -1531,10 +1531,15 @@ driverAttrs['error_policy'] = 'stop' diskelem.appendChildWithArgs('driver', **driverAttrs) elif self.device == 'floppy': - if (self.path and - not utils.getUserPermissions(constants.QEMU_PROCESS_USER, - self.path)['write']): - diskelem.appendChildWithArgs('readonly') + if self.path: + try: + wp = utils.getUserPermissions(constants.QEMU_PROCESS_USER, + self.path)['write']) + except OSError: + wp = False + + if not wp: + diskelem.appendChildWithArgs('readonly') if hasattr(self, 'specParams') and 'ioTune' in self.specParams: self._validateIoTuneParams() -- To view, visit http://gerrit.ovirt.org/18371 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f595a7adc05cd2efbfb831c247233ecb01da05a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev <peet(a)redhat.com>

3 3

Change in vdsm[master]: new API call getVersionInfo()
by peet＠redhat.com 13 Jan '14

13 Jan '14

Peter V. Saveliev has uploaded a new change for review. Change subject: new API call getVersionInfo() ...................................................................... new API call getVersionInfo() getCapabilities() is too expensive to discover the target VDSM version e.g. for migration Signed-off-by: Peter V. Saveliev <peet(a)redhat.com> Change-Id: I3f55ef437ca404ca04598d34c41756b1e68ced95 --- M vdsm/API.py M vdsm/BindingXMLRPC.py M vdsm_api/vdsmapi-schema.json 3 files changed, 50 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/8431/1 diff --git a/vdsm/API.py b/vdsm/API.py index bbc3221..f95ac80 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -39,6 +39,7 @@ import storage.image from vdsm.define import doneCode, errCode, Kbytes, Mbytes import caps +import dsaversion from vdsm.config import config import supervdsm @@ -328,6 +329,12 @@ return errCode['noVM'] return v.migrateStatus() + def getVersionInfo(self): + """ + """ + info = dsaversion.version_info + return {'status': doneCode, 'info': info} + def getStats(self): """ Obtain statistics of the specified VM diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py index fc57019..351e3a0 100644 --- a/vdsm/BindingXMLRPC.py +++ b/vdsm/BindingXMLRPC.py @@ -284,6 +284,10 @@ ret['info'].update(self.getServerInfo()) return ret + def getVersionInfo(self): + api = API.Global() + return api.getVersionInfo() + def getStats(self): api = API.Global() return api.getStats() @@ -748,6 +752,7 @@ (self.vmGetMigrationStatus, 'migrateStatus'), (self.vmMigrationCancel, 'migrateCancel'), (self.getCapabilities, 'getVdsCapabilities'), + (self.getVersionInfo, 'getVersionInfo'), (self.getStats, 'getVdsStats'), (self.vmGetStats, 'getVmStats'), (self.getAllVmStats, 'getAllVmStats'), diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 10d2aaa..a1b5ba3 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -1515,6 +1515,44 @@ 'returns': 'HostStats'} ## +# @VdsmCapabilities: +# +# Host information and capabilities. +# +# @version_name: The name given to this version of VDSM +# +# @software_version: VDSM version (x.y.z) +# +# @software_revision: Extra VDSM version information +# +# @supportedRHEVMs: A list of supported ovirt-engine versions +# +# @supportedProtocols: A list of supported xmlrpc protocol versions +# +# @clusterLevels: A list of supported cluster versions +# +# Since: 4.10.1 +# +## +{'type': 'HostInfo', + 'data': {'version_name': 'str', 'software_version': 'str', + 'software_revision': 'str', 'supportedRHEVMs': ['str'], + 'supportedProtocols': ['str'], 'clusterLevels': ['str']}} + +## +## @Host.getVersionInfo: +# +# Get VDSM version information +# +# Returns: +# The versions dictionary +# +# Since: 4.10.1 +## +{'command': {'class': 'Host', 'name': 'getVersionInfo'}, + 'returns': 'HostInfo'} + +## # @StorageDomainImageClass: # # An enumeration of Storage Domain classes. -- To view, visit http://gerrit.ovirt.org/8431 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f55ef437ca404ca04598d34c41756b1e68ced95 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev <peet(a)redhat.com>

5 8

Change in vdsm[master]: Change log message from warning to debug
by ykaplan＠redhat.com 12 Jan '14

12 Jan '14

Yeela Kaplan has uploaded a new change for review. Change subject: Change log message from warning to debug ...................................................................... Change log message from warning to debug Related to BZ#876558 Change-Id: I87d78a36abe0751960ecd4e7798d79210a3a0704 Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com> --- M vdsm/storage/blockVolume.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/10621/1 diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index 186ca95..f399d58 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -641,7 +641,7 @@ def _getVolumeTag(sdUUID, volUUID, tagPrefix): tags = lvm.getLV(sdUUID, volUUID).tags if TAG_VOL_UNINIT in tags: - log.warning("Reloading uninitialized volume %s/%s", sdUUID, volUUID) + log.debug("Reloading uninitialized volume %s/%s", sdUUID, volUUID) lvm.invalidateVG(sdUUID) tags = lvm.getLV(sdUUID, volUUID).tags if TAG_VOL_UNINIT in tags: -- To view, visit http://gerrit.ovirt.org/10621 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I87d78a36abe0751960ecd4e7798d79210a3a0704 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>

7 13

Change in vdsm[master]: Add --force option to upgrades
by amuller＠redhat.com 12 Jan '14

12 Jan '14

Assaf Muller has uploaded a new change for review. Change subject: Add --force option to upgrades ...................................................................... Add --force option to upgrades The --force option will ignore the existance of upgrade files in /var/lib/vdsm/upgrade/ Each upgrade will still only run if it thinks it should run. Change-Id: I2e6b84bdd14b9cd3921cea187b2654be22989334 Signed-off-by: Assaf Muller <amuller(a)redhat.com> --- M lib/vdsm/tool/unified_persistence.py M lib/vdsm/tool/upgrade.py M lib/vdsm/tool/upgrade_300_networks.py 3 files changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/22750/1 diff --git a/lib/vdsm/tool/unified_persistence.py b/lib/vdsm/tool/unified_persistence.py index d1b3d0a..a2d92cf 100644 --- a/lib/vdsm/tool/unified_persistence.py +++ b/lib/vdsm/tool/unified_persistence.py @@ -137,7 +137,7 @@ @expose('upgrade-to-unified-persistence') -def unified_persistence(): +def unified_persistence(*args): """ Upgrade host networking persistence from ifcfg to unified if the persistence model is set as unified in /usr/lib64/python2.X/site-packages/ diff --git a/lib/vdsm/tool/upgrade.py b/lib/vdsm/tool/upgrade.py index c3e92bc..8c9f57b 100644 --- a/lib/vdsm/tool/upgrade.py +++ b/lib/vdsm/tool/upgrade.py @@ -17,6 +17,7 @@ # Refer to the README and COPYING files for full details of the license # +import argparse from functools import wraps import logging import logging.config @@ -116,6 +117,18 @@ self._detachUpgradeLog() +def _parse_args(): + parser = argparse.ArgumentParser('vdsm-tool') + parser.add_argument( + '--force', + dest='force', + default=False, + action='store_true', + help='Run the upgrade again, even if it was ran before', + ) + return parser.parse_args(sys.argv[2:]) + + def upgrade(upgradeName): """ Used as a decorator for upgrades. Runs the upgrade with an Upgrade @@ -126,7 +139,8 @@ @wraps(f) def wrapper(*args, **kwargs): with Upgrade(upgradeName) as upgrade: - if upgrade.isNeeded(): + cliArguments = _parse_args() + if cliArguments.force or upgrade.isNeeded(): upgrade.log.debug("Running upgrade %s", upgradeName) try: f(*args, **kwargs) diff --git a/lib/vdsm/tool/upgrade_300_networks.py b/lib/vdsm/tool/upgrade_300_networks.py index 0f754fd..41a49b5 100644 --- a/lib/vdsm/tool/upgrade_300_networks.py +++ b/lib/vdsm/tool/upgrade_300_networks.py @@ -55,7 +55,7 @@ @expose('upgrade-3.0.0-networks') -def upgrade_networks(): +def upgrade_networks(*args): """ Since ovirt-3.0, Vdsm uses libvirt networks (with names vdsm-*) to store its own networks. Older Vdsms did not have those defined, and used only -- To view, visit http://gerrit.ovirt.org/22750 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e6b84bdd14b9cd3921cea187b2654be22989334 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Assaf Muller <amuller(a)redhat.com>

4 16

Change in vdsm[master]: utils: Moved ContextManager from misc to utils
by vvolansk＠redhat.com 12 Jan '14

12 Jan '14

Vered Volansky has uploaded a new change for review. Change subject: utils: Moved ContextManager from misc to utils ...................................................................... utils: Moved ContextManager from misc to utils The ContextManager was located in storage/misc, and is used by several non-storage tests. It was therefore moved to utils, where it belongs. Accordingly, ContextManagerTests class was moved to utilstests from mistests. Change-Id: I985103650a5706d35d9cd519618d09c692feb0be Signed-off-by: Vered Volansky <vvolansk(a)redhat.com> --- M lib/vdsm/utils.py M tests/functional/networkTests.py M tests/functional/storageTests.py M tests/functional/virtTests.py M tests/miscTests.py M tests/utilsTests.py M vdsm/storage/misc.py M vdsm/storage/resourceManager.py 8 files changed, 118 insertions(+), 121 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/61/22861/1 diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py index b072bd4..d6c65b2 100644 --- a/lib/vdsm/utils.py +++ b/lib/vdsm/utils.py @@ -1077,3 +1077,44 @@ :return: """ self.callbacks.append(Callback(func, args, kwargs)) + + +class RollbackContext(object): + ''' + A context manager for recording and playing rollback. + The first exception will be remembered and re-raised after rollback + + Sample usage: + with RollbackContext() as rollback: + step1() + rollback.prependDefer(lambda: undo step1) + def undoStep2(arg): pass + step2() + rollback.prependDefer(undoStep2, arg) + + More examples see tests/miscTests.py + ''' + def __init__(self, *args): + self._finally = [] + + def __enter__(self): + return self + + def __exit__(self, exc_type, exc_value, traceback): + for undo, args, kwargs in self._finally: + try: + undo(*args, **kwargs) + except Exception: + # keep the earliest exception info + if exc_type is None: + exc_type, exc_value, traceback = sys.exc_info() + + # re-raise the earliest exception + if exc_type is not None: + raise exc_type, exc_value, traceback + + def defer(self, func, *args, **kwargs): + self._finally.append((func, args, kwargs)) + + def prependDefer(self, func, *args, **kwargs): + self._finally.insert(0, (func, args, kwargs)) diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 21d00ff..9f8e50f 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -21,8 +21,6 @@ import os.path import neterrors -from storage.misc import RollbackContext - from hookValidation import ValidatesHook from testrunner import (VdsmTestCase as TestCaseBase, expandPermutations, permutations) @@ -40,6 +38,7 @@ ruleExists, Route, Rule, addrFlush, LinkType, getLinks) +from vdsm.utils import RollbackContext from vdsm.netinfo import operstate, prefix2netmask, getRouteDeviceTo from vdsm import ipwrapper diff --git a/tests/functional/storageTests.py b/tests/functional/storageTests.py index 542f72a..de70864 100644 --- a/tests/functional/storageTests.py +++ b/tests/functional/storageTests.py @@ -40,12 +40,11 @@ import storage.storage_exception as se import storage.volume from storage.misc import execCmd -from storage.misc import RollbackContext from storage.mount import Mount from vdsm.config import config from vdsm.constants import VDSM_USER, VDSM_GROUP -from vdsm.utils import CommandPath +from vdsm.utils import CommandPath, RollbackContext from vdsm import vdscli _VARTMP = '/var/tmp' diff --git a/tests/functional/virtTests.py b/tests/functional/virtTests.py index bd54621..f41de07 100644 --- a/tests/functional/virtTests.py +++ b/tests/functional/virtTests.py @@ -30,10 +30,9 @@ from testrunner import VdsmTestCase as TestCaseBase from testrunner import permutations, expandPermutations -from vdsm.utils import CommandPath +from vdsm.utils import CommandPath, RollbackContext import storageTests as storage from storage.misc import execCmd -from storage.misc import RollbackContext from utils import VdsProxy, SUCCESS diff --git a/tests/miscTests.py b/tests/miscTests.py index c726908..824e783 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -1086,77 +1086,6 @@ proc.wait() -class RollbackContextTests(TestCaseBase): - def setUp(self): - self._called = 0 - - def _callDef(self): - self._called += 1 - self.log.info("Incremented call count (%d)", self._called) - - def _raiseDef(self, ex=Exception()): - self.log.info("Raised exception (%s)", ex.__class__.__name__) - raise ex - - def test(self): - with misc.RollbackContext() as rollback: - rollback.prependDefer(self._callDef) - - self.assertEquals(self._called, 1) - - def testRaise(self): - """ - Test that raising an exception in a deferred action does - not block all subsequent actions from running - """ - try: - with misc.RollbackContext() as rollback: - rollback.prependDefer(self._callDef) - rollback.prependDefer(self._raiseDef) - rollback.prependDefer(self._callDef) - except Exception: - self.assertEquals(self._called, 2) - return - - self.fail("Exception was not raised") - - def testFirstException(self): - """ - Test that if multiple actions raise an exception only the first one is - raised. When performing a batch rollback operations, probably the first - exception is the root cause. - """ - try: - with misc.RollbackContext() as rollback: - rollback.prependDefer(self._callDef) - rollback.prependDefer(self._raiseDef) - rollback.prependDefer(self._callDef) - rollback.prependDefer(self._raiseDef, RuntimeError()) - rollback.prependDefer(self._callDef) - except RuntimeError: - self.assertEquals(self._called, 3) - return - except Exception: - self.fail("Wrong exception was raised") - - self.fail("Exception was not raised") - - def testKeyErrorException(self): - """ - KeyError is raised as a tuple and not expection. Re-rasing it - should be aware of this fact and handled carfully. - """ - try: - with misc.RollbackContext(): - {}['aKey'] - except KeyError: - return - except Exception: - self.fail("Wrong exception was raised") - - self.fail("Exception was not raised") - - class FindCallerTests(TestCaseBase): def _assertFindCaller(self, callback): frame = inspect.currentframe() diff --git a/tests/utilsTests.py b/tests/utilsTests.py index c5b250d..7cde5a3 100644 --- a/tests/utilsTests.py +++ b/tests/utilsTests.py @@ -302,3 +302,74 @@ def handle(self, record): assert self.record is None self.record = record + + +class RollbackContextTests(TestCaseBase): + def setUp(self): + self._called = 0 + + def _callDef(self): + self._called += 1 + self.log.info("Incremented call count (%d)", self._called) + + def _raiseDef(self, ex=Exception()): + self.log.info("Raised exception (%s)", ex.__class__.__name__) + raise ex + + def test(self): + with utils.RollbackContext() as rollback: + rollback.prependDefer(self._callDef) + + self.assertEquals(self._called, 1) + + def testRaise(self): + """ + Test that raising an exception in a deferred action does + not block all subsequent actions from running + """ + try: + with utils.RollbackContext() as rollback: + rollback.prependDefer(self._callDef) + rollback.prependDefer(self._raiseDef) + rollback.prependDefer(self._callDef) + except Exception: + self.assertEquals(self._called, 2) + return + + self.fail("Exception was not raised") + + def testFirstException(self): + """ + Test that if multiple actions raise an exception only the first one is + raised. When performing a batch rollback operations, probably the first + exception is the root cause. + """ + try: + with utils.RollbackContext() as rollback: + rollback.prependDefer(self._callDef) + rollback.prependDefer(self._raiseDef) + rollback.prependDefer(self._callDef) + rollback.prependDefer(self._raiseDef, RuntimeError()) + rollback.prependDefer(self._callDef) + except RuntimeError: + self.assertEquals(self._called, 3) + return + except Exception: + self.fail("Wrong exception was raised") + + self.fail("Exception was not raised") + + def testKeyErrorException(self): + """ + KeyError is raised as a tuple and not expection. Re-rasing it + should be aware of this fact and handled carfully. + """ + try: + with utils.RollbackContext(): + {}['aKey'] + except KeyError: + return + except Exception: + self.fail("Wrong exception was raised") + + self.fail("Exception was not raised") diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index f1d8ab0..2c06af3 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -43,7 +43,6 @@ import select import string import struct -import sys import threading import types import weakref @@ -675,47 +674,6 @@ nextRequest, self._currentState = self._queue.get_nowait() nextRequest.set() - - -class RollbackContext(object): - ''' - A context manager for recording and playing rollback. - The first exception will be remembered and re-raised after rollback - - Sample usage: - with RollbackContext() as rollback: - step1() - rollback.prependDefer(lambda: undo step1) - def undoStep2(arg): pass - step2() - rollback.prependDefer(undoStep2, arg) - - More examples see tests/miscTests.py - ''' - def __init__(self, *args): - self._finally = [] - - def __enter__(self): - return self - - def __exit__(self, exc_type, exc_value, traceback): - for undo, args, kwargs in self._finally: - try: - undo(*args, **kwargs) - except Exception: - # keep the earliest exception info - if exc_type is None: - exc_type, exc_value, traceback = sys.exc_info() - - # re-raise the earliest exception - if exc_type is not None: - raise exc_type, exc_value, traceback - - def defer(self, func, *args, **kwargs): - self._finally.append((func, args, kwargs)) - - def prependDefer(self, func, *args, **kwargs): - self._finally.insert(0, (func, args, kwargs)) class DynamicBarrier(object): diff --git a/vdsm/storage/resourceManager.py b/vdsm/storage/resourceManager.py index 14049dc..9d30eba 100644 --- a/vdsm/storage/resourceManager.py +++ b/vdsm/storage/resourceManager.py @@ -29,6 +29,7 @@ import storage_exception as se import misc from logUtils import SimpleLogAdapter +from vdsm.utils import RollbackContext # Errors @@ -539,7 +540,7 @@ request = Request(namespace, name, lockType, callback) self._log.debug("Trying to register resource '%s' for lock type '%s'", fullName, lockType) - with nested(misc.RollbackContext(), + with nested(RollbackContext(), self._syncRoot.shared) as (contextCleanup, lock): try: namespaceObj = self._namespaces[namespace] @@ -613,7 +614,7 @@ fullName = "%s.%s" % (namespace, name) self._log.debug("Trying to release resource '%s'", fullName) - with nested(misc.RollbackContext(), + with nested(RollbackContext(), self._syncRoot.shared) as (contextCleanup, lock): try: namespaceObj = self._namespaces[namespace] -- To view, visit http://gerrit.ovirt.org/22861 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I985103650a5706d35d9cd519618d09c692feb0be Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvolansk(a)redhat.com>

7 28

Change in vdsm[master]: Move uninstall preun section to vdsm-unregister
by lilei＠linux.vnet.ibm.com 12 Jan '14

12 Jan '14

Lei Li has uploaded a new change for review. Change subject: Move uninstall preun section to vdsm-unregister ...................................................................... Move uninstall preun section to vdsm-unregister The specfile vdsm.spec.in has very long %post and %preun sections, move the install/uninstall hooks into vdsm-tool. This patch move unregister to a script which will be encapsulated into a vdsm-tool function stop-vdsm-service. Change-Id: I4e7b5dc969dfb51e6880b9bb209a363609f5e123 Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> --- M vdsm.spec.in M vdsm/Makefile.am A vdsm/vdsm-unregister.in 3 files changed, 36 insertions(+), 42 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/4526/1 -- To view, visit http://gerrit.ovirt.org/4526 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e7b5dc969dfb51e6880b9bb209a363609f5e123 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Lei Li <lilei(a)linux.vnet.ibm.com>

9 35

← Newer
1
...
22
23
24
25
26
27
28
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches December 2013