vdsm-patches December 2014

vdsm-patches@lists.fedorahosted.org

42 participants
734 discussions

Change in vdsm[master]: vm: sampling: delay initialization
by fromani＠redhat.com 16 Feb '15

16 Feb '15

Francesco Romani has uploaded a new change for review. Change subject: vm: sampling: delay initialization ...................................................................... vm: sampling: delay initialization A future MOM integration patch need that sampling starts once the QEMU PID of a VM is known. This patch does that. Change-Id: I950fc6ea2aae4257260cf2301d47153c4c7ff58b Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/31609/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index a429016..0b2a315 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -2855,9 +2855,6 @@ supervdsm.getProxy().setPortMirroring(network, nic.name) - # VmStatsThread may use block devices info from libvirt. - # So, run it after you have this info - self._initVmStats() if utils.tobool(self.conf.get('vmchannel', 'true')): try: self.guestAgent.connect() @@ -2874,6 +2871,10 @@ self.cont() self.conf['pid'] = self._getPid() + # VmStatsThread may use block devices info from libvirt. + # So, run it after you have this info + self._initVmStats() + nice = int(self.conf.get('nice', '0')) nice = max(min(nice, 19), 0) -- To view, visit http://gerrit.ovirt.org/31609 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I950fc6ea2aae4257260cf2301d47153c4c7ff58b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

3 5

Change in vdsm[master]: sampling: mom: add support for alien samplings
by fromani＠redhat.com 16 Feb '15

16 Feb '15

Francesco Romani has uploaded a new change for review. Change subject: sampling: mom: add support for alien samplings ...................................................................... sampling: mom: add support for alien samplings This patch allow a VM to do sampling callbacks on behalf of other components. These samplings are considered fully opaque: they are just a callable without arguments and an interval in seconds. The VM sampling code will call periodically these samplings alongside with the standard VM ones. This feature will be used by MOM in a future patch to avoid the need of one monitor thread per VM. Change-Id: I7b689f11353192858238c587a721b4a9f9d33b9b Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/31608/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index ad1ef2f..a429016 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -206,7 +206,7 @@ # TODO: Remove as soon as there is a hard dependency we can use _libvirt_metadata_supported = True - def __init__(self, vm): + def __init__(self, vm, extraMonitors=None): AdvancedStatsThread.__init__(self, log=vm.log, daemon=True) self._vm = vm @@ -265,6 +265,13 @@ self.sampleDisk, self.sampleDiskLatency, self.sampleNet, self.sampleBalloon, self.sampleVmJobs, self.sampleVcpuPinning, self.sampleCpuTune) + + extraMonitors = (tuple() if extraMonitors is None + else tuple(extraMonitors)) + self.addStatsFunction( + AdvancedStatsFunction(mon.collect, mon.interval, + self.GENERIC_SAMPLING_WINDOW) + for mon in extraMonitors) def _highWrite(self): if not self._vm.isDisksStatsCollectionEnabled(): @@ -2732,8 +2739,8 @@ return domxml.toxml() - def _initVmStats(self): - self._vmStats = VmStatsThread(self) + def _initVmStats(self, extraMonitors=None): + self._vmStats = VmStatsThread(self, extraMonitors) self._vmStats.start() self._guestEventTime = self._startTime -- To view, visit http://gerrit.ovirt.org/31608 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b689f11353192858238c587a721b4a9f9d33b9b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

4 6

Change in vdsm[master]: hostdev: add support for reporting usb addresses
by Martin Polednik 10 Feb '15

10 Feb '15

Martin Polednik has uploaded a new change for review. Change subject: hostdev: add support for reporting usb addresses ...................................................................... hostdev: add support for reporting usb addresses This patch extends the addr field in hostdev tree that holds map of address fields relevant to the device. This is required in order to passthrough a usb device Change-Id: I3d4a4e1d3703abd25c9fa0584ec0e0a1d52b685c Signed-off-by: Martin Polednik <mpolednik(a)redhat.com> --- M vdsm/hostdev.py 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/35785/1 diff --git a/vdsm/hostdev.py b/vdsm/hostdev.py index e8cdc0a..25f03e9 100644 --- a/vdsm/hostdev.py +++ b/vdsm/hostdev.py @@ -39,12 +39,17 @@ return _parse_address(caps, ('host', 'bus', 'target', 'lun')) +def _parse_usb_address(caps): + return _parse_address(caps, ('bus', 'device')) + + def _parse_device_params(device_xml): """ Process device_xml and return dict of found known parameters """ address_parser = {'pci': _parse_pci_address, - 'scsi': _parse_scsi_address} + 'scsi': _parse_scsi_address, + 'usb': _parse_usb_address} params = {} -- To view, visit http://gerrit.ovirt.org/35785 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d4a4e1d3703abd25c9fa0584ec0e0a1d52b685c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik <mpolednik(a)redhat.com>

6 25

Change in vdsm[master]: netlink: replace old ipwrapper event monitor
by phoracek＠redhat.com 09 Feb '15

09 Feb '15

Petr Horáček has uploaded a new change for review. Change subject: netlink: replace old ipwrapper event monitor ...................................................................... netlink: replace old ipwrapper event monitor Change-Id: Ie7a9765e59a8392fff9b3fd556133159aeb60b1c Signed-off-by: Petr Horáček <phoracek(a)redhat.com> --- M lib/vdsm/ipwrapper.py M tests/functional/networkTests.py 2 files changed, 8 insertions(+), 81 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/34929/1 diff --git a/lib/vdsm/ipwrapper.py b/lib/vdsm/ipwrapper.py index 89280e7..f7c518d 100644 --- a/lib/vdsm/ipwrapper.py +++ b/lib/vdsm/ipwrapper.py @@ -17,7 +17,6 @@ # Refer to the README and COPYING files for full details of the license # -from collections import namedtuple from contextlib import closing from glob import iglob import array @@ -25,7 +24,6 @@ import errno import fcntl import os -import signal import socket import struct @@ -622,69 +620,3 @@ def linkDel(dev): command = [_IP_BINARY.cmd, 'link', 'del', 'dev', dev] _execCmd(command) - - -MonitorEvent = namedtuple('MonitorEvent', ['index', 'device', 'flags', - 'state']) - - -class Monitor(object): - """Wrapper over `ip monitor link`. Usage: - Get events collected while the monitor was running: - - mon = Monitor() - mon.start() - .... - mon.stop() - for event in mon: - handle event - - Monitoring events forever: - mon = Monitor() - mon.start() - for event in mon: - handle event - - Note that the underlying `ip monitor` process is killed when its controlled - thread dies, so as not to leave stray processes when Vdsm crahsed. - """ - _DELETED_TEXT = 'Deleted' - LINK_STATE_DELETED = 'DELETED' - - def __init__(self): - self.proc = None - - def __iter__(self): - if self.proc is None: - raise MonitorError('The monitor has not run yet') - for line in self.proc.stdout: - yield self._parseLine(line) - - def start(self): - self.proc = execCmd([_IP_BINARY.cmd, '-d', '-o', 'monitor', 'link'], - deathSignal=signal.SIGKILL, - sync=False) - self.proc.blocking = True - - def stop(self): - self.proc.kill() - self.proc.wait() - - @classmethod - def _parseLine(cls, line): - state = None - if line.startswith(cls._DELETED_TEXT): - state = cls.LINK_STATE_DELETED - line = line[len(cls._DELETED_TEXT):] - - data = _parseLinkLine(line) - # Consider everything with an '@' symbol a vlan/macvlan/macvtap - # since that's how iproute2 reports it and there is currently no - # disambiguation (iproute bug https://bugzilla.redhat.com/1042799 - data['name'] = data['name'].split('@', 1)[0] - state = state if state or 'state' not in data else data['state'] - return MonitorEvent(data['index'], data['name'], data['flags'], state) - - @classmethod - def _parse(cls, text): - return [cls._parseLine(line) for line in text.splitlines()] diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index f7c6893..d38c1f6 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -20,7 +20,6 @@ from functools import wraps import os.path import json -import signal import netaddr from hookValidation import ValidatesHook @@ -46,6 +45,7 @@ from vdsm.utils import RollbackContext, execCmd from vdsm.netinfo import (bridges, operstate, prefix2netmask, getRouteDeviceTo, getDhclientIfaces) +from vdsm.netlink import Monitor from vdsm import ipwrapper from vdsm.utils import pgrep @@ -165,20 +165,15 @@ def _waitForKnownOperstate(device, timeout=1): - def _alarmHandler(signum, frame): - raise Alarm - - monitor = ipwrapper.Monitor() + monitor = Monitor(groups=['link'], timeout=1) monitor.start() + try: - state = operstate(device).upper() - if state == 'UNKNOWN': - signal.signal(signal.SIGALRM, _alarmHandler) - signal.alarm(timeout) + state = operstate(device).lower() + if state == 'unknown': for event in monitor: - if event.device == device and event.state != 'UNKNOWN': + if event.device == device and event.state != 'unknown': break - signal.alarm(0) finally: monitor.stop() @@ -190,8 +185,8 @@ @contextmanager def nonChangingOperstate(device): """Raises an exception if it detects that the device link state changes.""" - originalState = operstate(device).upper() - monitor = ipwrapper.Monitor() + originalState = operstate(device).lower() + monitor = Monitor() monitor.start() try: yield -- To view, visit http://gerrit.ovirt.org/34929 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie7a9765e59a8392fff9b3fd556133159aeb60b1c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com>

5 18

Change in vdsm[master]: storageServer: Cleanup logging when mount fails
by Nir Soffer 06 Feb '15

06 Feb '15

Nir Soffer has uploaded a new change for review. Change subject: storageServer: Cleanup logging when mount fails ...................................................................... storageServer: Cleanup logging when mount fails - Remove unhelpful traceback if os.rmdir fails - Use logging.exception instead of exc_info=True - Use %r for revealing whitespace bugs in paths - Unify logging messages Change-Id: I24ae2c6ce71a1f20459977a8860dd6a1ebc45db3 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/storageServer.py 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/71/36371/1 diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py index f5a1b17..de88ec4 100644 --- a/vdsm/storage/storageServer.py +++ b/vdsm/storage/storageServer.py @@ -212,8 +212,8 @@ try: os.rmdir(self._getLocalPath()) except OSError: - self.log.warn("Failed to remove mount point directory: %s", - self._getLocalPath(), exc_info=True) + self.log.warn("Error removing mountpoint directory: %r", + self._getLocalPath()) raise t, v, tb else: try: @@ -224,8 +224,7 @@ try: self.disconnect() except OSError: - self.log.warn("Error while disconnecting after access" - "problem", exc_info=True) + self.log.exception("Error disconnecting") raise t, v, tb def isConnected(self): -- To view, visit http://gerrit.ovirt.org/36371 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24ae2c6ce71a1f20459977a8860dd6a1ebc45db3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

6 13

Change in vdsm[master]: storageServer: Keep the original traceback
by Nir Soffer 06 Feb '15

06 Feb '15

Nir Soffer has uploaded a new change for review. Change subject: storageServer: Keep the original traceback ...................................................................... storageServer: Keep the original traceback We used to raise the original exception instance (raise e), which was dropping the original traceback, making debugging harder. Now we keep the original exception info and re-raising it. Change-Id: I746cd71d065849dda7a2b53d7b74b53265a36b36 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/storageServer.py 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/36331/1 diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py index dcd2b5d..71b8efc 100644 --- a/vdsm/storage/storageServer.py +++ b/vdsm/storage/storageServer.py @@ -27,6 +27,7 @@ from collections import namedtuple import misc from functools import partial +import sys from vdsm.compat import pickle @@ -206,26 +207,27 @@ try: self._mount.mount(self.options, self._vfsType) - except MountError as e: + except MountError: + t, v, tb = sys.exc_info() self.log.error("Mount failed: %s", e, exc_info=True) try: os.rmdir(self._getLocalPath()) except OSError: self.log.warn("Failed to remove mount point directory: %s", self._getLocalPath(), exc_info=True) - raise e - + raise t, v, tb else: try: fileSD.validateDirAccess( self.getMountObj().getRecord().fs_file) - except se.StorageServerAccessPermissionError as e: + except se.StorageServerAccessPermissionError: + t, v, tb = sys.exc_info() try: self.disconnect() except OSError: self.log.warn("Error while disconnecting after access" "problem", exc_info=True) - raise e + raise t, v, tb def isConnected(self): return self._mount.isMounted() -- To view, visit http://gerrit.ovirt.org/36331 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I746cd71d065849dda7a2b53d7b74b53265a36b36 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

7 16

Change in vdsm[master]: net_func_tests: Rollback only when an error happens
by asegurap＠redhat.com 03 Feb '15

03 Feb '15

Antoni Segura Puimedon has uploaded a new change for review. Change subject: net_func_tests: Rollback only when an error happens ...................................................................... net_func_tests: Rollback only when an error happens Up until now, net_func_tests used RollbackContext that always performs all the rolling back operations on context exit. This patch adds a flag to RollbackContext that if explicitely set to True, will only perform the rollback operations in case the context was left due to an exception. Change-Id: Iaeb9bf19f4bf63d3705cfdda92aa6ec7513a8b98 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M lib/vdsm/utils.py M tests/functional/networkTests.py 2 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/29817/1 diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py index 76c2a79..7b06ea2 100644 --- a/lib/vdsm/utils.py +++ b/lib/vdsm/utils.py @@ -1057,8 +1057,9 @@ More examples see tests/utilsTests.py ''' - def __init__(self, *args): + def __init__(self, on_exception_only=False): self._finally = [] + self._on_exception_only = on_exception_only def __enter__(self): return self @@ -1069,6 +1070,9 @@ exception), python re-raises the original exception once this function is finished. """ + if self._on_exception_only and exc_type is None and exc_value is None: + return + undoExcInfo = None for undo, args, kwargs in self._finally: try: diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index b59ef01..2a58970 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -191,7 +191,7 @@ @wraps(func) def wrapper(*args, **kwargs): - with RollbackContext() as rollback: + with RollbackContext(on_exception_only=True) as rollback: rollback.prependDefer(args[0].vdsm_net.restoreNetConfig) func(*args, **kwargs) return wrapper -- To view, visit http://gerrit.ovirt.org/29817 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaeb9bf19f4bf63d3705cfdda92aa6ec7513a8b98 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

8 21

Change in vdsm[master]: gluster: geo-replication configuration related verbs.
by dnarayan＠redhat.com 03 Feb '15

03 Feb '15

Darshan N has uploaded a new change for review. Change subject: gluster: geo-replication configuration related verbs. ...................................................................... gluster: geo-replication configuration related verbs. This patch adds four verbs related to geo-replication configuration. Verbs: * glusterVolumeGeoRepConfigList - Lists all the configuration for the session. Returns: {georepConfig:[{'configName': configuration name, 'description': value}]} * glusterVolumeGeoRepConfigGet - Gives the configuration value for a specified configuration. Returns: {georepConfig:{'configName': configuration name, 'description': value}} * glusterVolumeGeoRepConfigSet - Sets the configuration value for a given configuration. Returns:bool * glusterVolumeGeoRepConfigSetDefault - Sets the configuration to its default value Returns:bool Change-Id: Ifee571dbf3c56633e415d32f8d518cb64aaf1add Signed-off-by: ndarshan <dnarayan(a)redhat.com> --- M client/vdsClientGluster.py M vdsm/gluster/api.py M vdsm/gluster/cli.py M vdsm/gluster/exception.py M vdsm/gluster/vdsmapi-gluster-schema.json 5 files changed, 354 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/30162/1 diff --git a/client/vdsClientGluster.py b/client/vdsClientGluster.py index 421c853..4c65707 100644 --- a/client/vdsClientGluster.py +++ b/client/vdsClientGluster.py @@ -430,6 +430,70 @@ pp.pprint(status) return status['status']['code'], status['status']['message'] + def do_glusterVolumeGeoRepConfigList(self, args): + params = self._eqSplit(args) + masterVolName = params.get('volumeName', '') + slaveHost = params.get('slaveHost', '') + slaveVolName = params.get('slaveVolName', '') + if not(masterVolName and slaveHost and slaveVolName): + raise ValueError + + status = self.s.glusterVolumeGeoRepConfigList(masterVolName, + slaveHost, + slaveVolName) + pp.pprint(status) + return status['status']['code'], status['status']['message'] + + def do_glusterVolumeGeoRepConfigSet(self, args): + params = self._eqSplit(args) + masterVolName = params.get('volumeName', '') + slaveHost = params.get('slaveHost', '') + slaveVolName = params.get('slaveVolName', '') + key = params.get('key', '') + value = params.get('value', '') + if not(masterVolName and slaveHost and slaveVolName and key and value): + raise ValueError + + status = self.s.glusterVolumeGeoRepConfigSet(masterVolName, + slaveHost, + slaveVolName, + key, + value) + pp.pprint(status) + return status['status']['code'], status['status']['message'] + + def do_glusterVolumeGeoRepConfigGet(self, args): + params = self._eqSplit(args) + masterVolName = params.get('volumeName', '') + slaveHost = params.get('slaveHost', '') + slaveVolName = params.get('slaveVolName', '') + key = params.get('key', '') + if not(masterVolName and slaveHost and slaveVolName and key): + raise ValueError + + status = self.s.glusterVolumeGeoRepConfigGet(masterVolName, + slaveHost, + slaveVolName, + key) + pp.pprint(status) + return status['status']['code'], status['status']['message'] + + def do_glusterVolumeGeoRepConfigSetDefault(self, args): + params = self._eqSplit(args) + masterVolName = params.get('volumeName', '') + slaveHost = params.get('slaveHost', '') + slaveVolName = params.get('slaveVolName', '') + key = params.get('key', '') + if not(masterVolName and slaveHost and slaveVolName and key): + raise ValueError + + status = self.s.glusterVolumeGeoRepConfigSetDefault(masterVolName, + slaveHost, + slaveVolName, + key) + pp.pprint(status) + return status['status']['code'], status['status']['message'] + def getGlusterCmdDict(serv): return \ @@ -731,4 +795,55 @@ ('volumeName=<volume name>', 'Returns total, free and used space(bytes) of gluster volume' )), + 'glusterVolumeGeoRepConfigList': ( + serv.do_glusterVolumeGeoRepConfigList, + ('volumeName=<master_volume_name> slaveHost=<slave_host> ' + 'slaveVolName=<slave_volume_name>\n\t' + '<master_volume_name> is an existing volume name in ' + 'the master node\n\t' + '<slave_host> is slave host name\n\t' + '<slave_volume_name> is an existing volume name ' + 'in the slave node', + 'list volume geo-replication configurations' + )), + 'glusterVolumeGeoRepConfigSet': ( + serv.do_glusterVolumeGeoRepConfigSet, + ('volumeName=<master_volume_name> slaveHost=<slave_host> ' + 'slaveVolName=<slave_volume_name> keyName=<key> ' + 'value=<value>\n\t' + '<master_volume_name> is an existing volume name ' + 'in the master node\n\t' + '<slave_host> is slave host name\n\t' + '<slave_volume_name> is an existing volume name in ' + 'the slave node\n\t' + '<key> is the key name of configuration\n\t' + '<value> is the key value', + 'set volume geo-replication configuration' + )), + 'glusterVolumeGeoRepConfigGet': ( + serv.do_glusterVolumeGeoRepConfigGet, + ('volumeName=<master_volume_name> slaveHost=<slave_host> ' + 'slaveVolName=<slave_volume_name> keyName=<key> ' + 'value=<value>\n\t' + '<master_volume_name> is an existing volume name in ' + 'the master node\n\t' + '<slave_host> is slave host name\n\t' + '<slave_volume_name> is an existing volume name in ' + 'the slave node\n\t' + '<key> is the key name of configuration', + 'get volume geo-replication configuration' + )), + 'glusterVolumeGeoRepConfigSetDefault': ( + serv.do_glusterVolumeGeoRepConfigSetDefault, + ('masterVolName=<master_volume_name> slaveHost=<slave_host> ' + 'slaveVolName=<slave_volume_name> keyName=<key> ' + 'value=<value>\n\t' + '<master_volume_name> is an existing volume name in ' + 'the master node\n\t' + '<slave_host> is slave host name\n\t' + '<slave_volume_name> is an existing volume name in ' + 'the slave node\n\t' + '<key> is the key name', + 'Set volume geo-replication configuration to devault' + )) } diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py index 0e6c850..5b3eec7 100644 --- a/vdsm/gluster/api.py +++ b/vdsm/gluster/api.py @@ -322,6 +322,46 @@ data = self.svdsmProxy.glusterVolumeStatvfs(volumeName) return self._computeVolumeStats(data) + @exportAsVerb + def volumeGeoRepConfigList(self, masterVolName, slaveHost, slaveVolName, + options=None): + status = self.svdsmProxy.glusterVolumeGeoRepConfigList(masterVolName, + slaveHost, + slaveVolName) + return {'geoRepConfig': status} + + @exportAsVerb + def volumeGeoRepConfigSet(self, masterVolName, slaveHost, slaveVolName, + key, value, options=None): + status = self.svdsmProxy.glusterVolumeGeoRepConfigSet(masterVolName, + slaveHost, + slaveVolName, + key, + value) + return {'geoRepSet': status} + + @exportAsVerb + def volumeGeoRepConfigGet(self, masterVolName, slaveHost, slaveVolName, + key, options=None): + + status = self.svdsmProxy.glusterVolumeGeoRepConfigGet(masterVolName, + slaveHost, + slaveVolName, + key) + return {'geoRepGet': status} + + @exportAsVerb + def volumeGeoRepConfigSetDefault(self, masterVolName, slaveHost, + slaveVolName, + key, options=None): + + status = self.svdsmProxy.glusterVolumeGeoRepConfigSetDefault( + masterVolName, + slaveHost, + slaveVolName, + key) + return {'geoRepSetDefault': status} + def getGlusterMethods(gluster): l = [] diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py index 2e1c9a9..6a4ffd6 100644 --- a/vdsm/gluster/cli.py +++ b/vdsm/gluster/cli.py @@ -1054,3 +1054,74 @@ return _parseVolumeTasks(xmltree) except _etreeExceptions: raise ge.GlusterXmlErrorException(err=[etree.tostring(xmltree)]) + + +def _parseVolumeGeoRepConfigList(tree): + """ + Returns: + {geoRepConfig:[{'option name': name of the configuration, + 'description': value of the configuration}] + } + """ + result = {} + conf = tree.find('geoRep/config') + config_list = [] + for child in conf.getchildren(): + config = {} + config['optionName'] = child.tag + config['description'] = child.text + config_list.append(config) + result['geoRepConfig'] = config_list + return result + + +@makePublic +def volumeGeoRepConfigList(masterVolName, slaveHost, slaveVolName): + command = _getGlusterVolCmd() + ["geo-replication", masterVolName, + "%s::%s" % (slaveHost, slaveVolName), + "config"] + try: + xmltree = _execGlusterXml(command) + except ge.GlusterCmdFailedException as e: + raise ge.GlusterGeoRepConfigListFailedException(rc=e.rc, err=e.err) + try: + return _parseVolumeGeoRepConfigList(xmltree) + except _etreeExceptions: + raise ge.GlusterXmlErrorException(err=[etree.tostring(xmltree)]) + + +@makePublic +def volumeGeoRepConfigSet(masterVolName, slaveHost, slaveVolName, key, value): + command = _getGlusterVolCmd() + ["geo-replication", masterVolName, + "%s::%s" % (slaveHost, slaveVolName), + "config", key, value] + rc, out, err = _execGluster(command) + if rc: + raise ge.GlusterGeoRepConfigSetFailedException(rc, out, err) + return True + + +@makePublic +def volumeGeoRepConfigGet(masterVolName, slaveHost, slaveVolName, key): + command = _getGlusterVolCmd() + ["geo-replication", masterVolName, + "%s::%s" % (slaveHost, slaveVolName), + "config", key] + try: + xmltree = _execGlusterXml(command) + except ge.GlusterCmdFailedException as e: + raise ge.GlusterGeoRepConfigGetFailedException(rc=e.rc, err=e.err) + try: + return _parseVolumeGeoRepConfigList(xmltree) + except _etreeExceptions: + raise ge.GlusterXmlErrorException(err=[etree.tostring(xmltree)]) + + +@makePublic +def volumeGeoRepConfigSetDefault(masterVolName, slaveHost, slaveVolName, key): + command = _getGlusterVolCmd() + ["geo-replication", masterVolName, + "%s::%s" % (slaveHost, slaveVolName), + "config", "!%s" % key] + rc, out, err = _execGluster(command) + if rc: + raise ge.GlusterGeoRepConfigSetDefaultFailedException(rc, out, err) + return True diff --git a/vdsm/gluster/exception.py b/vdsm/gluster/exception.py index 0205cb1..ca6b7cf 100644 --- a/vdsm/gluster/exception.py +++ b/vdsm/gluster/exception.py @@ -506,3 +506,29 @@ class GlfsFiniException(GlusterLibgfapiException): code = 4573 message = "glfs fini failed" + + +#geo-replication +class GlusterGeoRepException(GlusterException): + code = 4560 + message = "Gluster Geo-Replication Exception" + + +class GlusterGeoRepConfigListFailedException(GlusterVolumeException): + code = 4169 + message = "Get volume geo-replication config list failed" + + +class GlusterGeoRepConfigSetFailedException(GlusterVolumeException): + code = 4170 + message = "Set volume geo-replication config failed" + + +class GlusterGeoRepConfigGetFailedException(GlusterVolumeException): + code = 4171 + message = "Get volume geo-replication config failed" + + +class GlusterGeoRepConfigSetDefaultFailedException(GlusterVolumeException): + code = 4172 + message = "Set volume geo-replication config to default failed" diff --git a/vdsm/gluster/vdsmapi-gluster-schema.json b/vdsm/gluster/vdsmapi-gluster-schema.json index 4ddd182..06de6ca 100644 --- a/vdsm/gluster/vdsmapi-gluster-schema.json +++ b/vdsm/gluster/vdsmapi-gluster-schema.json @@ -1238,3 +1238,105 @@ {'command': {'class': 'GlusterVolume', 'name': 'statsInfoGet'}, 'data': {'volumeName': 'str'}, 'returns': 'GlusterVolumeStatsInfo'} + +# @GeoRepConfig: +# +# Geo replication config details. +# +# @optionname: Config option name +# +# @description: Option details +# +# Since: 4.16.0 +## +{'type': 'GeoRepConfig', + 'data': {'optionname': 'str', 'description': 'str'}} + +## +# @GlusterGeoRep.configList: +# +# List Geo Replication configuration +# +# @mastervolname: is an existing volume name in the master node +# +# @slavehost: is remote slave host name or ip +# +# @slavevolname: is an available existing volume name in the slave node +# +# Returns: +# List of geo replication configurations +# +# Since: 4.16.0 +## +{'command': {'class': 'GlusterGeoRep', 'name': 'geoRepConfigList'}, + 'data': {'mastervolname': 'str', 'slavehost': 'str', 'slavevolname': 'str'}, + 'returns': 'GeoRepConfig'} + +## +# @GlusterGeoRep.configSet: +# +# Set Geo Replication config option +# +# @mastervolname: is an existing volume name in the master node +# +# @slavehost: is remote slave host name or ip +# +# @slavevolname: is an available existing volume name in the slave node +# +# @key: valid configuration option name +# +# @value: value to the option +# +# Returns: +# True if it sets value to the option successfully +# +# Since: 4.16.0 +## +{'command': {'class': 'GlusterGeoRep', 'name': 'geoRepConfigSet'}, + 'data': {'mastervolname': 'str', 'slavehost': 'str', 'slavevolname': 'str', 'key': 'str', 'value': 'str'}, + 'returns': 'bool'} + +## +# @GlusterVolume.geoRepConfigGet: +# +# Get value of the Geo Replication config option +# +# @mastervolname: is an existing volume name in the master node +# +# @slavehost: is remote slave host name or ip +# +# @slavevolname: is an available existing volume name in the slave node +# +# @key: valid configuration option name +# +# Returns: +# The value of the Geo Replication config option +# +# Since: 4.16.0 +## +{'command': {'class': 'GlusterGeoRep', 'name': 'geoRepConfigGet'}, + 'data': {'mastervolname': 'str', 'slavehost': 'str', 'slavevolname': 'str', 'key': 'str'}, + 'returns': 'GeoRepConfig'} + +## +# @GlusterVolume.geoRepConfigSetDefault: +# +# Resets the the config option to default value +# +# @mastervolname: is an existing volume name in the master node +# +# @slavehost: is remote slave host name or ip +# +# @slavevolname: is an available existing volume name in the slave node +# +# @key: valid configuration option name +# +# Returns: +# True if default value is set successfully +# +# Since: 4.16.0 +## +{'command': {'class': 'GlusterGeoRep', 'name': 'geoRepConfigSetDefault'}, + 'data': {'mastervolname': 'str', 'slavehost': 'str', 'slavevolname': 'str', 'key': 'str'}, + 'returns': 'bool'} + -- To view, visit http://gerrit.ovirt.org/30162 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifee571dbf3c56633e415d32f8d518cb64aaf1add Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N <dnarayan(a)redhat.com>

8 46

Change in vdsm[master]: virt: move all_channels into DomainDescriptor
by fromani＠redhat.com 03 Feb '15

03 Feb '15

Francesco Romani has uploaded a new change for review. Change subject: virt: move all_channels into DomainDescriptor ...................................................................... virt: move all_channels into DomainDescriptor before the introduction of the DomainDescriptor class, we had a bunch of functions/methods who repeteadly parsed the VM XML Domain using the slow minidom module. The introduction of the DomainDescriptor opens the gate for both more efficient and cleaner processing. DomainDescriptor should provide methods to return high-level objects, not low-level ones, e.g, XML document nodes, which are inevitabily tied to the underlying xml library being used. The first step in this (long) journey is to move vmxml.all_channels into the DomainDescriptor. This allow us to have both nicer code in vm.Vm and to save us one unneeded XML parsing. Change-Id: I870cce435b2e26ff33cbd52f2421c1f3ce661707 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M tests/vmXmlTests.py M vdsm/virt/domain_descriptor.py M vdsm/virt/vm.py M vdsm/virt/vmxml.py 4 files changed, 45 insertions(+), 40 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/34415/1 diff --git a/tests/vmXmlTests.py b/tests/vmXmlTests.py index 17ada42..2e73d6f 100644 --- a/tests/vmXmlTests.py +++ b/tests/vmXmlTests.py @@ -18,6 +18,7 @@ # Refer to the README and COPYING files for full details of the license # +from virt import domain_descriptor from virt import vm from virt import vmxml import caps @@ -32,29 +33,7 @@ from vmTestsData import CONF_TO_DOMXML_NO_VDSM -@expandPermutations -class TestVmXmlFunctions(TestCaseBase): - - @permutations([[caps.Architecture.X86_64], - [caps.Architecture.PPC64]]) - def test_has_channel(self, arch): - for _, dom_xml in self._build_domain_xml(arch): - self.assertEqual(True, vmxml.has_channel( - dom_xml, vm._VMCHANNEL_DEVICE_NAME)) - - @permutations([[caps.Architecture.X86_64], [caps.Architecture.PPC64]]) - def test_all_channels_vdsm_domain(self, arch): - for _, dom_xml in self._build_domain_xml(arch): - channels = list(vmxml.all_channels(dom_xml)) - self.assertTrue(len(channels) >= len(vm._AGENT_CHANNEL_DEVICES)) - for name, path in channels: - self.assertIn(name, vm._AGENT_CHANNEL_DEVICES) - - def test_all_channels_extra_domain(self): - for conf, raw_xml in CONF_TO_DOMXML_NO_VDSM: - dom_xml = raw_xml % conf - self.assertNotEquals(sorted(vmxml.all_channels(dom_xml)), - sorted(vm._AGENT_CHANNEL_DEVICES)) +class VmXmlTestCase(TestCaseBase): _CONFS = { caps.Architecture.X86_64: CONF_TO_DOMXML_X86_64, @@ -65,3 +44,33 @@ for conf, rawXml in self._CONFS[arch]: domXml = rawXml % conf yield fake.Domain(domXml, vmId=conf['vmId']), domXml + + +@expandPermutations +class TestVmXmlFunctions(VmXmlTestCase): + + @permutations([[caps.Architecture.X86_64], + [caps.Architecture.PPC64]]) + def test_has_channel(self, arch): + for _, dom_xml in self._build_domain_xml(arch): + self.assertEqual(True, vmxml.has_channel( + dom_xml, vm._VMCHANNEL_DEVICE_NAME)) + + +@expandPermutations +class TestDomainDescriptor(VmXmlTestCase): + + @permutations([[caps.Architecture.X86_64], [caps.Architecture.PPC64]]) + def test_all_channels_vdsm_domain(self, arch): + for _, dom_xml in self._build_domain_xml(arch): + dom = domain_descriptor.DomainDescriptor(dom_xml) + channels = list(dom.all_channels()) + self.assertTrue(len(channels) >= len(vm._AGENT_CHANNEL_DEVICES)) + for name, path in channels: + self.assertIn(name, vm._AGENT_CHANNEL_DEVICES) + + def test_all_channels_extra_domain(self): + for conf, raw_xml in CONF_TO_DOMXML_NO_VDSM: + dom = domain_descriptor.DomainDescriptor(raw_xml % conf) + self.assertNotEquals(sorted(dom.all_channels()), + sorted(vm._AGENT_CHANNEL_DEVICES)) diff --git a/vdsm/virt/domain_descriptor.py b/vdsm/virt/domain_descriptor.py index 3100a25..a5b2956 100644 --- a/vdsm/virt/domain_descriptor.py +++ b/vdsm/virt/domain_descriptor.py @@ -52,6 +52,18 @@ def devicesHash(self): return self._devicesHash + def all_channels(self): + for channel in self.getDeviceElements('channel'): + try: + name = channel.getElementsByTagName('target')[0].\ + getAttribute('name') + path = channel.getElementsByTagName('source')[0].\ + getAttribute('path') + except IndexError: + continue + else: + yield name, path + def _firstElementByTagName(self, tagName): elements = self._dom.childNodes[0].getElementsByTagName(tagName) return elements[0] if elements else None diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 2992674..59cff66 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -2703,7 +2703,7 @@ This is necessary to prevent incoming migrations, restoring of VMs and the upgrade of VDSM with running VMs to fail on this. """ - for name, path in vmxml.all_channels(self._domain.xml): + for name, path in self._domain.all_channels(): if name not in _AGENT_CHANNEL_DEVICES: continue diff --git a/vdsm/virt/vmxml.py b/vdsm/virt/vmxml.py index eb07ba9..f8b546d 100644 --- a/vdsm/virt/vmxml.py +++ b/vdsm/virt/vmxml.py @@ -44,22 +44,6 @@ return False -def all_channels(domXML): - domObj = xml.dom.minidom.parseString(domXML) - for channel in domObj.childNodes[0]. \ - getElementsByTagName('devices')[0]. \ - getElementsByTagName('channel'): - try: - name = channel.getElementsByTagName('target')[0].\ - getAttribute('name') - path = channel.getElementsByTagName('source')[0].\ - getAttribute('path') - except IndexError: - continue - else: - yield name, path - - def all_devices(domXML): domObj = xml.dom.minidom.parseString(domXML) devices = domObj.childNodes[0].getElementsByTagName('devices')[0] -- To view, visit http://gerrit.ovirt.org/34415 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I870cce435b2e26ff33cbd52f2421c1f3ce661707 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

5 11

Change in vdsm[master]: vm: use DomainDescriptor in setTicket
by fromani＠redhat.com 03 Feb '15

03 Feb '15

Francesco Romani has uploaded a new change for review. Change subject: vm: use DomainDescriptor in setTicket ...................................................................... vm: use DomainDescriptor in setTicket setTicket used to fetch and parse yet again the Domain XML. Since there is no known good reason to do so, this patch changes the code to make use of the DomainDescriptor, in order to gain a bit more of performance and of code brevity. Change-Id: I512586497209cb631e684c5f09084dcecfca0ec2 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/34545/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 8b17a03..8e221a9 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -4187,8 +4187,7 @@ setTicket defaults to the first graphic device. use updateDevice to select the device. """ - graphics = _domParseStr(self._dom.XMLDesc(0)).childNodes[0]. \ - getElementsByTagName('graphics')[0] + graphics = self._domain.getDeviceElements('graphics')[0] return self._setTicketForGraphicDev( graphics, otp, seconds, connAct, params) -- To view, visit http://gerrit.ovirt.org/34545 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I512586497209cb631e684c5f09084dcecfca0ec2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

5 10

← Newer
1
...
15
16
17
18
19
20
21
...
74
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches December 2014