vdsm-patches March 2014

vdsm-patches@lists.fedorahosted.org

40 participants
401 discussions

Change in vdsm[master]: sampling: use constants for counter bounds
by Dan Kenigsberg 19 Jun '15

19 Jun '15

Dan Kenigsberg has uploaded a new change for review. Change subject: sampling: use constants for counter bounds ...................................................................... sampling: use constants for counter bounds When we report cpu and network usage, we take two samples of Linux counters, and divide their difference by the elapsed time. If a sampled counter wraps around its upper bound, we might report an invalid negative value. To avoid that, we take the modulu of the difference. For example, assume that the first sample was (2**64 - 10) jiffies and 30 jiffies have passed until the second sample, the difference would be the hugely negative value (30 - 2**64). Taking modulu 2**64 returns the correct value of 30 jiffies. JIFFIES_BOUND is taken from the size of clock_t and NETSTATS_BOUND - from the size of the fields of struct net_device_stats. I am not aware of any programmatic way to acquire this value, but they are both of 64 bit size on x86_64 and ppc64. Taking modulu 2**32 works perfectly well, since two subsequent samples are unlikly to be that far apart, and it has the benefit of working well on a 32 bit host, too. Change-Id: I706000106c3bc31edf8541c980bce1f49464ebf8 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/sampling.py M vdsm/vm.py 2 files changed, 11 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/24194/1 diff --git a/vdsm/sampling.py b/vdsm/sampling.py index 54b6381..a5492ce 100644 --- a/vdsm/sampling.py +++ b/vdsm/sampling.py @@ -42,6 +42,9 @@ if not os.path.exists(_THP_STATE_PATH): _THP_STATE_PATH = '/sys/kernel/mm/redhat_transparent_hugepage/enabled' +JIFFIES_BOUND = 2 ** 32 +NETSTATS_BOUND = 2 ** 32 + class InterfaceSample: """ @@ -430,14 +433,14 @@ return stats hs0, hs1 = self._samples[0], self._samples[-1] interval = hs1.timestamp - hs0.timestamp - jiffies = (hs1.pidcpu.user - hs0.pidcpu.user) % (2 ** 32) + jiffies = (hs1.pidcpu.user - hs0.pidcpu.user) % JIFFIES_BOUND stats['cpuUserVdsmd'] = (jiffies / interval) - jiffies = hs1.pidcpu.sys - hs0.pidcpu.sys % (2 ** 32) + jiffies = hs1.pidcpu.sys - hs0.pidcpu.sys % JIFFIES_BOUND stats['cpuSysVdsmd'] = (jiffies / interval) - jiffies = (hs1.totcpu.user - hs0.totcpu.user) % (2 ** 32) + jiffies = (hs1.totcpu.user - hs0.totcpu.user) % JIFFIES_BOUND stats['cpuUser'] = jiffies / interval / self._ncpus - jiffies = (hs1.totcpu.sys - hs0.totcpu.sys) % (2 ** 32) + jiffies = (hs1.totcpu.sys - hs0.totcpu.sys) % JIFFIES_BOUND stats['cpuSys'] = jiffies / interval / self._ncpus stats['cpuIdle'] = max(0.0, 100.0 - stats['cpuUser'] - stats['cpuSys']) @@ -479,9 +482,9 @@ ifrate = ifrate or 1000 Mbps2Bps = (10 ** 6) / 8 thisRx = (hs1.interfaces[ifid].rx - hs0.interfaces[ifid].rx) % \ - (2 ** 32) + NETSTATS_BOUND thisTx = (hs1.interfaces[ifid].tx - hs0.interfaces[ifid].tx) % \ - (2 ** 32) + NETSTATS_BOUND rxRate = 100.0 * thisRx / interval / ifrate / Mbps2Bps txRate = 100.0 * thisTx / interval / ifrate / Mbps2Bps if txRate > 100 or rxRate > 100: diff --git a/vdsm/vm.py b/vdsm/vm.py index aae8bd6..07fb581 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -606,11 +606,11 @@ ifRxBytes = (100.0 * (eInfo[nic.name][0] - sInfo[nic.name][0]) % - 2 ** 32 / + sampling.NETSTATS_BOUND / sampleInterval / ifSpeed / self.MBPS_TO_BPS) ifTxBytes = (100.0 * (eInfo[nic.name][4] - sInfo[nic.name][4]) % - 2 ** 32 / + sampling.NETSTATS_BOUND / sampleInterval / ifSpeed / self.MBPS_TO_BPS) ifStats['rxRate'] = '%.1f' % ifRxBytes -- To view, visit http://gerrit.ovirt.org/24194 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I706000106c3bc31edf8541c980bce1f49464ebf8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

7 16

Change in vdsm[master]: block: use the contextmanager for mapMetaOffset
by Federico Simoncelli 05 May '15

05 May '15

Federico Simoncelli has uploaded a new change for review. Change subject: block: use the contextmanager for mapMetaOffset ...................................................................... block: use the contextmanager for mapMetaOffset Change-Id: Id1496238ea4f9a1902f816b20959ce3379e87871 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/storage/blockSD.py M vdsm/storage/blockVolume.py M vdsm/storage/imageRepository/formatConverter.py 3 files changed, 13 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/25988/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index cac59fa..02c7dfd 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -29,6 +29,7 @@ import time import functools from collections import namedtuple +from contextlib import contextmanager from operator import itemgetter from vdsm.config import config @@ -732,11 +733,15 @@ newsize = self.metaSize(self.sdUUID) lvm.extendLV(self.sdUUID, sd.METADATA, newsize) + _mdSlotLock = threading.Lock() + + @contextmanager def mapMetaOffset(self, vol_name, slotSize): - if self.getVersion() in VERS_METADATA_LV: - return self.getVolumeMetadataOffsetFromPvMapping(vol_name) - else: - return self.getFreeMetadataSlot(slotSize) + with self._mdSlotLock: + if self.getVersion() in VERS_METADATA_LV: + yield self.getVolumeMetadataOffsetFromPvMapping(vol_name) + else: + yield self.getFreeMetadataSlot(slotSize) def _getOccupiedMetadataSlots(self): stripPrefix = lambda s, pfx: s[len(pfx):] diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index 36bfa1f..9a7fa81 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -73,7 +73,6 @@ class BlockVolume(volume.Volume): """ Actually represents a single volume (i.e. part of virtual disk). """ - _tagCreateLock = threading.Lock() def __init__(self, repoPath, sdUUID, imgUUID, volUUID): self.metaoff = None @@ -169,8 +168,7 @@ imgUUID, volUUID, srcImgUUID, srcVolUUID) volParent.clone(imgPath, volUUID, volFormat, preallocate) - with cls._tagCreateLock: - mdSlot = dom.mapMetaOffset(volUUID, VOLUME_MDNUMBLKS) + with dom.mapMetaOffset(volUUID, VOLUME_MDNUMBLKS) as mdSlot: mdTags = ["%s%s" % (TAG_PREFIX_MD, mdSlot), "%s%s" % (TAG_PREFIX_PARENT, srcVolUUID), "%s%s" % (TAG_PREFIX_IMAGE, imgUUID)] diff --git a/vdsm/storage/imageRepository/formatConverter.py b/vdsm/storage/imageRepository/formatConverter.py index c701163..11a0039 100644 --- a/vdsm/storage/imageRepository/formatConverter.py +++ b/vdsm/storage/imageRepository/formatConverter.py @@ -180,9 +180,9 @@ metaOffset, vol.volUUID) metaContent = vol.getMetadata() - with vol._tagCreateLock: - newMetaOffset = domain.mapMetaOffset( - vol.volUUID, blockVolume.VOLUME_MDNUMBLKS) + with domain.mapMetaOffset( + vol.volUUID, blockVolume.VOLUME_MDNUMBLKS) \ + as newMetaOffset: if newMetaOffset > metaMaxSlot: raise se.NoSpaceLeftOnDomain(domain.sdUUID) -- To view, visit http://gerrit.ovirt.org/25988 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1496238ea4f9a1902f816b20959ce3379e87871 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

7 61

Change in vdsm[master]: vm: per-attribute monitor response check
by fromani＠redhat.com 21 Apr '15

21 Apr '15

Francesco Romani has uploaded a new change for review. Change subject: vm: per-attribute monitor response check ...................................................................... vm: per-attribute monitor response check the responsiveness of the monitor is reported through a single instance variable, which is updated after each libvirt call. If one single call goes in timeout, while the others go well, due to interplay between timeouts and polling interval, it can happen that reported status bounces back and forth between 'Up' and 'Not Responding'. This patch address this behaviour by keeping track of the timeouts per-dom-attribute instead of per-dom, and reports the monitor as not respondig if, and until, at least one had a timeout in the last call. Change-Id: I32a98d34cde91fa9dc3d07f03c47a5f2f22da620 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/vm.py 1 file changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/23138/1 diff --git a/vdsm/vm.py b/vdsm/vm.py index 55683f4..9d7ca03 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -853,11 +853,11 @@ def f(*args, **kwargs): try: ret = attr(*args, **kwargs) - self._cb(False) + self._cb(False, name) return ret except libvirt.libvirtError as e: if e.get_error_code() == libvirt.VIR_ERR_OPERATION_TIMEOUT: - self._cb(True) + self._cb(True, name) toe = TimeoutError(e.get_error_message()) toe.err = e.err raise toe @@ -1938,6 +1938,9 @@ if (self.arch not in ['ppc64', 'x86_64']): raise RuntimeError('Unsupported architecture: %s' % self.arch) + + self._attrTimeoutLock = threading.Lock() + self._attrTimeoutExperienced = {} # will keep track of timeout data def _get_lastStatus(self): PAUSED_STATES = ('Powering down', 'RebootInProgress', 'Up') @@ -3631,11 +3634,13 @@ def _monitorDependentInit(self, timeout=None): self.log.warning('unsupported by libvirt vm') - def _timeoutExperienced(self, timeout): - if timeout: - self._monitorResponse = -1 - else: - self._monitorResponse = 0 + def _timeoutExperienced(self, timeout, attrName): + with self._attrTimeoutLock: + self._attrTimeoutExperienced[attrName] = timeout + if any(self._attrTimeoutExperienced.itervalues()): + self._monitorResponse = -1 + else: + self._monitorResponse = 0 def _waitForIncomingMigrationFinish(self): if 'restoreState' in self.conf: -- To view, visit http://gerrit.ovirt.org/23138 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I32a98d34cde91fa9dc3d07f03c47a5f2f22da620 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

8 52

Change in vdsm[master]: vm: make new timekeeping revertable
by fromani＠redhat.com 30 Mar '15

30 Mar '15

Francesco Romani has uploaded a new change for review. Change subject: vm: make new timekeeping revertable ...................................................................... vm: make new timekeeping revertable The commit Icb0752e54a4cb9ff609b8ddfaf5c8fe2ed5b9e72 implemented the new timekeeping options recommended by QEMU developers. In order to maximize the backward compatibility and to deal with possible regression with old guests, this patch makes the new timekeeping settings revertable by exposing a new configuration variable. The default is enabled because those settings, being recommended, are supposed to be safe. Change-Id: I471be44454dcae6e73c46a473eb1eee19a5275ab Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M lib/vdsm/config.py.in M vdsm/vm.py 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/24443/1 diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in index 01590a1..075face 100644 --- a/lib/vdsm/config.py.in +++ b/lib/vdsm/config.py.in @@ -192,6 +192,9 @@ ('transient_disks_repository', '@VDSMLIBDIR@/transient', 'Local path to the transient disks repository.'), + + ('new_timekeeping_enable', 'true', + 'Enable the new recomended QEMU time keeping settings'), ]), # Section: [ksm] diff --git a/vdsm/vm.py b/vdsm/vm.py index 9371049..d3baca8 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -970,10 +970,12 @@ m = XMLElement('clock', offset='variable', adjustment=str(self.conf.get('timeOffset', 0))) m.appendChildWithArgs('timer', name='rtc', tickpolicy='catchup') - m.appendChildWithArgs('timer', name='pit', tickpolicy='delay') - if self.arch == caps.Architecture.X86_64: - m.appendChildWithArgs('timer', name='hpet', present='no') + if config.getboolean('vars', 'new_timekeeping_enable'): + m.appendChildWithArgs('timer', name='pit', tickpolicy='delay') + + if self.arch == caps.Architecture.X86_64: + m.appendChildWithArgs('timer', name='hpet', present='no') self.dom.appendChild(m) -- To view, visit http://gerrit.ovirt.org/24443 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I471be44454dcae6e73c46a473eb1eee19a5275ab Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

6 23

Change in vdsm[master]: gluster: command to create a public key file
by dnarayan＠redhat.com 26 Mar '15

26 Mar '15

Hello Bala.FA, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/17644 to review the following change. Change subject: gluster: command to create a public key file ...................................................................... gluster: command to create a public key file This executes the command to create a public key file which will have public keys of all the hosts of source cluster. This is needed for password-less communication between slave cluster hosts during geo-replication Change-Id: If8c979a89ce11a1622819c474b59dcf088733594 Signed-off-by: ndarshan <dnarayan(a)redhat.com> --- M vdsm/gluster/cli.py M vdsm/gluster/exception.py 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/17644/1 diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py index bac6d1c..64529ae 100644 --- a/vdsm/gluster/cli.py +++ b/vdsm/gluster/cli.py @@ -897,3 +897,12 @@ return _parseVolumeProfileInfo(xmltree, nfs) except _etreeExceptions: raise ge.GlusterXmlErrorException(err=[etree.tostring(xmltree)]) + +@makePublic +def createPublicKeyFile(): + command = _getGlusterSystemCmd() + ["execute", "gsec_create"] + rc, out, err = _execGluster(command) + if rc: + raise ge.GlusterGeoRepPublicKeyFileCreationFailedException(rc, out, err) + else: + return True diff --git a/vdsm/gluster/exception.py b/vdsm/gluster/exception.py index c569a9e..1ee73bb 100644 --- a/vdsm/gluster/exception.py +++ b/vdsm/gluster/exception.py @@ -484,3 +484,14 @@ prefix = "%s: " % (action) self.message = prefix + "Service action is not supported" self.err = [self.message] + +#geo-replication +class GlusterGeoRepException(GlusterException): + code = 4560 + message = "Gluster Geo-Replication Exception" + + +class GlusterGeoRepPublicKeyFileCreationFailedException(GlusterGeoRepException): + code = 4561 + message = "Creation of public key file failed" + -- To view, visit http://gerrit.ovirt.org/17644 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If8c979a89ce11a1622819c474b59dcf088733594 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ndarshan <dnarayan(a)redhat.com> Gerrit-Reviewer: Bala.FA <barumuga(a)redhat.com>

9 105

Change in vdsm[master]: vdsm-tool: vdsm-id: add force option to force generate id
by Alon Bar-Lev 01 Mar '15

01 Mar '15

Alon Bar-Lev has uploaded a new change for review. Change subject: vdsm-tool: vdsm-id: add force option to force generate id ...................................................................... vdsm-tool: vdsm-id: add force option to force generate id this is handy to hide the existence and usage of /etc/vdsm/vdsm.id from users (other components). Change-Id: I89f1e29c9cdad0cadb32545fa27c1702ad2e116a Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com> --- M lib/vdsm/tool/vdsm-id.py M lib/vdsm/utils.py 2 files changed, 35 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/20808/1 diff --git a/lib/vdsm/tool/vdsm-id.py b/lib/vdsm/tool/vdsm-id.py index 109c382..01f94a9 100644 --- a/lib/vdsm/tool/vdsm-id.py +++ b/lib/vdsm/tool/vdsm-id.py @@ -17,9 +17,13 @@ # Refer to the README and COPYING files for full details of the license # + +import sys +import argparse + + from vdsm.utils import getHostUUID from vdsm.tool import expose -import sys @expose("vdsm-id") @@ -27,7 +31,19 @@ """ Printing host uuid """ - hostUUID = getHostUUID(False) + parser = argparse.ArgumentParser('vdsm-tool configure') + parser.add_argument( + '--force', + dest='force', + default=False, + action='store_true', + help='Generate vdsmid if not available', + ) + args = parser.parse_args(sys.argv[2:]) + hostUUID = getHostUUID( + legacy=False, + force=args.force, + ) if hostUUID is None: raise RuntimeError('Cannot retrieve host UUID') sys.stdout.write(hostUUID) diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py index 78d055e..d38a273 100644 --- a/lib/vdsm/utils.py +++ b/lib/vdsm/utils.py @@ -48,6 +48,7 @@ import subprocess import threading import time +import uuid from cpopen import CPopen as BetterPopen import constants @@ -599,7 +600,7 @@ __hostUUID = None -def getHostUUID(legacy=True): +def getHostUUID(legacy=True, force=False): global __hostUUID if __hostUUID: return __hostUUID @@ -624,6 +625,14 @@ if p.returncode == 0 and 'Not' not in out: #Avoid error string - 'Not Settable' or 'Not Present' __hostUUID = out.strip() + elif force: + hostid = str(uuid.uuid4()) + with open(constants.P_VDSM_NODE_ID, 'w') as f: + f.write("%s\n", hostid) + if isOvirtNode(): + from ovirtnode import ovirtfunctions + ovirtfunctions.ovirt_store_config(constants.P_VDSM_NODE_ID) + __hostUUID = hostid else: logging.warning('Could not find host UUID.') @@ -877,3 +886,10 @@ logging.error("Panic: %s", msg, exc_info=True) os.killpg(0, 9) sys.exit(-3) + + +def isOvirtNode(): + return ( + os.path.exists('/etc/rhev-hypervisor-release') or + glob.glob('/etc/ovirt-node-*-release') + ) -- To view, visit http://gerrit.ovirt.org/20808 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89f1e29c9cdad0cadb32545fa27c1702ad2e116a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>

7 49

Change in vdsm[master]: vdsm-gluster: Added gluster volume geo-replication start verb
by tjeyasin＠redhat.com 21 Jan '15

21 Jan '15

Hello Ayal Baron, Bala.FA, Saggi Mizrahi, Dan Kenigsberg, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/17766 to review the following change. Change subject: vdsm-gluster: Added gluster volume geo-replication start verb ...................................................................... vdsm-gluster: Added gluster volume geo-replication start verb Start the geo-replication session between the hosts. Start distributed geo-replication on all the nodes that are a part of the master-volume. Even if any node, that is a part of the master-volume is down, the command will still be successful. Change-Id: I3cf03c748cf9fe28efe7d407727cd52da20701c5 Signed-off-by: Timothy Asir <tjeyasin(a)redhat.com> --- M client/vdsClientGluster.py M vdsm/gluster/api.py M vdsm/gluster/cli.py M vdsm/gluster/exception.py 4 files changed, 100 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/17766/1 diff --git a/client/vdsClientGluster.py b/client/vdsClientGluster.py index 90af83e..feb6387 100644 --- a/client/vdsClientGluster.py +++ b/client/vdsClientGluster.py @@ -424,6 +424,34 @@ pp.pprint(status) return status['status']['code'], status['status']['message'] + def do_glusterVolumeGeoRepStart(self, args): + params = self._eqSplit(args) + masterVolName = params.get('masterVolName', '') + slaveHost = params.get('slaveHost', '') + slaveVolName = params.get('slaveVolName', '') + if not(masterVolName and slaveHost and slaveVolName): + raise ValueError + + status = self.s.glusterVolumeGeoRepStart(masterVolName, + slaveHost, + slaveVolName) + pp.pprint(status) + return status['status']['code'], status['status']['message'] + + def do_glusterVolumeGeoRepStop(self, args): + params = self._eqSplit(args) + masterVolName = params.get('masterVolName', '') + slaveHost = params.get('slaveHost', '') + slaveVolName = params.get('slaveVolName', '') + if not(masterVolName and slaveHost and slaveVolName): + raise ValueError + + status = self.s.glusterVolumeGeoRepStop(masterVolName, + slaveHost, + slaveVolName) + pp.pprint(status) + return status['status']['code'], status['status']['message'] + def getGlusterCmdDict(serv): return \ @@ -705,4 +733,26 @@ 'not set' '(swift, glusterd, smb, memcached)' )), + 'glusterVolumeGeoRepStart': ( + serv.do_glusterVolumeGeoRepStart, + ('masterVolName=<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', + 'start volume geo-replication' + )), + 'glusterVolumeGeoRepStop': ( + serv.do_glusterVolumeGeoRepStop, + ('masterVolName=<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', + 'stop volume geo-replication' + )), } diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py index 4bd8308..ed9f5ae 100644 --- a/vdsm/gluster/api.py +++ b/vdsm/gluster/api.py @@ -287,6 +287,20 @@ status = self.svdsmProxy.glusterServicesGet(serviceNames) return {'services': status} + @exportAsVerb + def volumeGeoRepStart(self, masterVolName, slaveHost, slaveVolName, + options=None): + self.svdsmProxy.glusterVolumeGeoRepStart(masterVolName, + slaveHost, + slaveVolName) + + @exportAsVerb + def volumeGeoRepStop(self, masterVolName, slaveHost, slaveVolName, + options=None): + self.svdsmProxy.glusterVolumeGeoRepStop(masterVolName, + slaveHost, + slaveVolName) + def getGlusterMethods(gluster): l = [] diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py index bac6d1c..e4d6615 100644 --- a/vdsm/gluster/cli.py +++ b/vdsm/gluster/cli.py @@ -897,3 +897,29 @@ return _parseVolumeProfileInfo(xmltree, nfs) except _etreeExceptions: raise ge.GlusterXmlErrorException(err=[etree.tostring(xmltree)]) + + +@makePublic +def volumeGeoRepStart(masterVolName, slaveHost, slaveVolName): + command = _getGlusterVolCmd() + ["geo-replication", masterVolName, + "%s::%s" % (slaveHost, slaveVolName), + "start"] + try: + _execGlusterXml(command) + return True + except ge.GlusterCmdFailedException as e: + raise ge.GlusterVolumeGeoRepStartFailedException(rc=e.rc, + err=e.err) + + +@makePublic +def volumeGeoRepStop(masterVolName, slaveHost, slaveVolName): + command = _getGlusterVolCmd() + ["geo-replication", masterVolName, + "%s::%s" % (slaveHost, slaveVolName), + "stop"] + try: + _execGlusterXml(command) + return True + except ge.GlusterCmdFailedException as e: + raise ge.GlusterVolumeGeoRepStopFailedException(rc=e.rc, + err=e.err) diff --git a/vdsm/gluster/exception.py b/vdsm/gluster/exception.py index c569a9e..259df32 100644 --- a/vdsm/gluster/exception.py +++ b/vdsm/gluster/exception.py @@ -484,3 +484,13 @@ prefix = "%s: " % (action) self.message = prefix + "Service action is not supported" self.err = [self.message] + + +class GlusterVolumeGeoRepStartFailedException(GlusterVolumeException): + code = 4164 + message = "Volume geo-replication start failed" + + +class GlusterVolumeGeoRepStopFailedException(GlusterVolumeException): + code = 4165 + message = "Volume geo-replication stop failed" -- To view, visit http://gerrit.ovirt.org/17766 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3cf03c748cf9fe28efe7d407727cd52da20701c5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Timothy Asir <tjeyasin(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Bala.FA <barumuga(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>

7 47

Change in vdsm[master]: vm: Automatically add a serial port for a console device
by Vinzenz Feenstra 19 Jan '15

19 Jan '15

Vinzenz Feenstra has uploaded a new change for review. Change subject: vm: Automatically add a serial port for a console device ...................................................................... vm: Automatically add a serial port for a console device Without a serial device the console support does not work for linux systems. We switch from virtio to serial and append a serial port if a console device was defined. Change-Id: Ifa7b02a7bcaad63017c35c811a194fa42e2b694f Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M vdsm/vm.py 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/79/25979/1 diff --git a/vdsm/vm.py b/vdsm/vm.py index 9cb0e82..7ce7c59 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -1171,6 +1171,18 @@ commandLine.appendChildWithArgs('qemu:arg', value='keyboard') self.dom.appendChild(commandLine) + def appendSerial(self): + """ + Add a serial port for the console device if it exists + <serial type='pty'> + <target port='0'> + </serial> + """ + if len(self._devices.getElementsByTagName('console')) == 1: + s = XMLElement('serial', type='pty') + s.appendChildWithArgs('target', port='0') + self._devices.appendChild(s) + def appendGraphics(self): """ Add graphics section to domain xml. @@ -1888,7 +1900,7 @@ </console> """ m = self.createXmlElem('console', 'pty') - m.appendChildWithArgs('target', type='virtio', port='0') + m.appendChildWithArgs('target', type='serial', port='0') return m @@ -3025,6 +3037,7 @@ domxml.appendEmulator() self._appendDevices(domxml) + domxml.appendSerial() for drive in self._devices[DISK_DEVICES][:]: for leaseElement in drive.getLeasesXML(): -- To view, visit http://gerrit.ovirt.org/25979 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa7b02a7bcaad63017c35c811a194fa42e2b694f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

10 38

Change in vdsm[master]: gluster: geo replication status and status detail
by dnarayan＠redhat.com 16 Jan '15

16 Jan '15

Hello Bala.FA, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/18414 to review the following change. Change subject: gluster: geo replication status and status detail ...................................................................... gluster: geo replication status and status detail this has two verbs, status: provides geo-replication status of all running sessions or all sessions associated with a perticular source volume or session between a source and remote volume. status detail: provides detailed status of geo-repliction session between source and remote volume Change-Id: I4f37f35a5480fbe049a67758e122d4a0c2eba513 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, 223 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/18414/1 diff --git a/client/vdsClientGluster.py b/client/vdsClientGluster.py index 90af83e..76a5ba8 100644 --- a/client/vdsClientGluster.py +++ b/client/vdsClientGluster.py @@ -424,6 +424,35 @@ pp.pprint(status) return status['status']['code'], status['status']['message'] + def do_glusterVolumeGeoRepStatus(self, args): + params = self._eqSplit(args) + try: + volName = params.get('volName', '') + remoteHost = params.get('remoteHost', '') + remoteVolName = params.get('remoteVolName', '') + except: + raise ValueError + status = self.s.glusterVolumeGeoRepStatus(volName, remoteHost, + remoteVolName) + pp.pprint(status) + return status['status']['code'], status['status']['message'] + + def do_glusterVolumeGeoRepStatusDetail(self, args): + params = self._eqSplit(args) + try: + volName = params.get('volName', '') + remoteHost = params.get('remoteHost', '') + remoteVolName = params.get('remoteVolName', '') + except: + raise ValueError + if not (volName and remoteHost and remoteVolName): + raise ValueError + status = self.s.glusterVolumeGeoRepStatusDetail(volName, + remoteHost, + remoteVolName) + pp.pprint(status) + return status['status']['code'], status['status']['message'] + def getGlusterCmdDict(serv): return \ @@ -705,4 +734,24 @@ 'not set' '(swift, glusterd, smb, memcached)' )), + 'glusterVolumeGeoRepStatus': ( + serv.do_glusterVolumeGeoRepStatus, + ('volName=<master_volume_name> ' + 'remoteHost=<slave_host_name> ' + 'remoteVolName=<slave_volume_name> ' + '<master_volume_name>existing volume name in the master node\n\t' + '<slave_host_name>is remote slave host name or ip\n\t' + '<slave_volume_name>existing volume name in the slave node', + 'Returns ths status of geo-replication' + )), + 'glusterVolumeGeoRepStatusDetail': ( + serv.do_glusterVolumeGeoRepStatusDetail, + ('volName=<master_volume_name> ' + 'remoteHost=<slave_host_name> ' + 'remoteVolName=<slave_volume_name> ' + '<master_volume_name>existing volume name in the master node\n\t' + '<slave_host_name>is remote slave host name or ip\n\t' + '<slave_volume_name>existing volume name in the slave node', + 'Returns the Detailed status of geo-replication' + )) } diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py index 4bd8308..d24e700 100644 --- a/vdsm/gluster/api.py +++ b/vdsm/gluster/api.py @@ -287,6 +287,22 @@ status = self.svdsmProxy.glusterServicesGet(serviceNames) return {'services': status} + @exportAsVerb + def volumeGeoRepStatus(self, volName=None, remoteHost=None, + remoteVolName=None, options=None): + status = self.svdsmProxy.glusterVolumeGeoRepStatus(volName, + remoteHost, + remoteVolName) + return {'geo-rep': status} + + @exportAsVerb + def volumeGeoRepStatusDetail(self, volName, remoteHost, + remoteVolName, options=None): + status = self.svdsmProxy.glusterVolumeGeoRepStatusDetail(volName, + remoteHost, + remoteVolName) + return {'geo-rep': status} + def getGlusterMethods(gluster): l = [] diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py index bac6d1c..1cf0e12 100644 --- a/vdsm/gluster/cli.py +++ b/vdsm/gluster/cli.py @@ -897,3 +897,59 @@ return _parseVolumeProfileInfo(xmltree, nfs) except _etreeExceptions: raise ge.GlusterXmlErrorException(err=[etree.tostring(xmltree)]) + + +def _parseGeoRepStatusDetail(tree): + status = {'node': tree.find('geoRep/node').text, + 'health': tree.find('geoRep/health').text, + 'uptime': tree.find('geoRep/uptime').text, + 'filesSyncd': tree.find('geoRep/filesSyncd').text, + 'filesPending': tree.find('geoRep/filesPending').text, + 'bytesPending': tree.find('geoRep/bytesPending').text, + 'deletesPending': tree.find('geoRep/deletesPending').text} + return status + + +def _parseGeoRepStatus(tree): + pairs = [] + for el in tree.findall('geoRep/pair'): + value = {} + value['node'] = el.find('node').text + value['master'] = el.find('master').text + value['slave'] = el.find('slave').text + value['health'] = el.find('health').text + value['uptime'] = el.find('uptime').text + pairs.append(value) + return pairs + + +@makePublic +def volumeGeoRepStatus(volName=None, remoteHost=None, remoteVolName=None, + ): + command = _getGlusterVolCmd() + ["geo-replication", volName, + "%s::%s" % (remoteHost, remoteVolName), + "status"] + try: + xmltree = _execGlusterXml(command) + except ge.GlusterCmdFailedException as e: + raise ge.GlusterGeoRepStatusFailedException(rc=e.rc, err=e.err) + try: + return _parseGeoRepStatus(xmltree) + except _etreeExceptions: + raise ge.GlusterXmlErrorException(err=[etree.tostring(xmltree)]) + + +@makePublic +def volumeGeoRepStatusDetail(volName, remoteHost, remoteVolName, + ): + command = _getGlusterVolCmd() + ["geo-replication", volName, + "%s::%s" % (remoteHost, remoteVolName), + "status", "detail"] + try: + xmltree = _execGlusterXml(command) + except ge.GlusterCmdFailedException as e: + raise ge.GlusterGeoRepStatusDetailFailedException(rc=e.rc, err=e.err) + try: + return _parseGeoRepStatusDetail(xmltree) + except _etreeExceptions: + raise ge.GlusterXmlErrorException(err=[etree.tostring(xmltree)]) diff --git a/vdsm/gluster/exception.py b/vdsm/gluster/exception.py index c569a9e..d95b168 100644 --- a/vdsm/gluster/exception.py +++ b/vdsm/gluster/exception.py @@ -484,3 +484,19 @@ prefix = "%s: " % (action) self.message = prefix + "Service action is not supported" self.err = [self.message] + + +#geo-replication +class GlusterGeoRepException(GlusterException): + code = 4560 + message = "Gluster Geo-Replication Exception" + + +class GlusterGeoRepStatusFailedException(GlusterGeoRepException): + code = 4565 + message = "Geo Rep status failed" + + +class GlusterGeoRepStatusDetailFailedException(GlusterGeoRepException): + code = 4566 + message = "Geo Rep status detail failed" diff --git a/vdsm/gluster/vdsmapi-gluster-schema.json b/vdsm/gluster/vdsmapi-gluster-schema.json index 7a4c034..557c750 100644 --- a/vdsm/gluster/vdsmapi-gluster-schema.json +++ b/vdsm/gluster/vdsmapi-gluster-schema.json @@ -372,3 +372,89 @@ {'command': {'class': 'GlusterService', 'name': 'action'}, 'data': {'serviceName': 'str', 'action': 'GlusterServiceAction'}, 'returns': 'GlusterServicesStatusInfo'} + +## +# @GlusterGeoRepStatus: +# +# Gluster geo-replication status information. +# +# @node: The node where geo-replication is started +# +# @master: The source for geo-replication +# +# @slave: The destination of geo-replication +# +# @health: The status of the geo-replication session +# +# @uptime: The time since the geo-replication started +# +# Since: 4.10.3 +## +{'type': 'GlusterGeoRepStatus', + 'data': {'node': 'str', 'master': 'str', 'slave': 'str', 'health': 'str', 'uptime': 'int'}} + + +## +# @GlusterVolume.geoRepStatus: +# +# Gets the status of geo-Replication session +# +# @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: +# status information for geo-replication +# +# Since: 4.10.3 +## +{'command': {'class': 'GlusterVolume', 'name': 'geoRepStatus'}, + 'data': {'masterVolName': 'str', 'slaveHost': 'str', 'slaveVolName': 'str'}, + 'returns': 'GlusterGeoRepStatus'} + +## +# @GlusterGeoRepStatusDetail: +# +# Gluster geo-replication detailed status information. +# +# @node: The node where geo-replication is started +# +# @health: The status of the geo-replication session +# +# @uptime: The time since the geo-replication started +# +# @filesSyncd: The number of files that are synced +# +# @filesPending: The number of files that are pending to be synced +# +# @bytesPending: The number of bytes that are pending to be synced +# +# @deletesPending: The number of deletes that are pending +# +# Since: 4.10.3 +## +{'type': 'GlusterGeoRepStatusDetail', + 'data': {'node': 'str', 'health': 'str', 'uptime': 'int', 'filesSyncd': 'int', 'filesPending': 'int', + 'bytesPending': 'int','deletesPending': 'int'}} + +## +# @GlusterVolume.geoRepStatusDetail: +# +# Gets the detailed status of geo-Replication session +# +# @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: +# detailed status information of geo-replication session +# +# Since: 4.10.3 +## +{'command': {'class': 'GlusterVolume', 'name': 'geoRepStatusDetail'}, + 'data': {'masterVolName': 'str', 'slaveHost': 'str', 'slaveVolName': 'str'}, + 'returns': 'GlusterGeoRepStatusDetail'} -- To view, visit http://gerrit.ovirt.org/18414 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f37f35a5480fbe049a67758e122d4a0c2eba513 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ndarshan <dnarayan(a)redhat.com> Gerrit-Reviewer: Bala.FA <barumuga(a)redhat.com>

9 99

Change in vdsm[master]: configurator: move usermod to spec
by Douglas Schilling Landgraf 05 Dec '14

05 Dec '14

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: configurator: move usermod to spec ...................................................................... configurator: move usermod to spec vdsm-tool configure --force adds to /etc/group (qemu/kvm) sanlock but doesn't persist the file in ovirt node distro which will affect vdsm start on next reboot. This patch moves the usermod to spec file. Change-Id: I668552fa037414e9a6aee5b049d61749268f85d0 Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M lib/vdsm/tool/configurator.py M vdsm.spec.in 2 files changed, 5 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/26055/1 diff --git a/lib/vdsm/tool/configurator.py b/lib/vdsm/tool/configurator.py index d1c876c..516a7bc 100644 --- a/lib/vdsm/tool/configurator.py +++ b/lib/vdsm/tool/configurator.py @@ -24,7 +24,7 @@ from .. import utils from . import service, expose -from ..constants import P_VDSM_EXEC, QEMU_PROCESS_GROUP, VDSM_GROUP +from ..constants import P_VDSM_EXEC class _ModuleConfigure(object): @@ -108,8 +108,6 @@ class SanlockModuleConfigure(_ModuleConfigure): - SANLOCK_GROUPS = (QEMU_PROCESS_GROUP, VDSM_GROUP) - def __init__(self): super(SanlockModuleConfigure, self).__init__() @@ -118,28 +116,6 @@ def getServices(self): return ['sanlock'] - - def configure(self): - """ - Configure sanlock process groups - """ - if os.getuid() != 0: - raise UserWarning("Must run as root") - - rc, out, err = utils.execCmd( - ( - '/usr/sbin/usermod', - '-a', - '-G', - ','.join(self.SANLOCK_GROUPS), - 'sanlock' - ), - raw=True, - ) - sys.stdout.write(out) - sys.stderr.write(err) - if rc != 0: - raise RuntimeError("Failed to perform sanlock config.") def isconfigured(self): """ diff --git a/vdsm.spec.in b/vdsm.spec.in index 361a9c1..b149568 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -690,6 +690,7 @@ /usr/sbin/useradd -r -u 36 -g %{vdsm_group} -d /var/lib/vdsm \ -s /sbin/nologin -c "Node Virtualization Manager" %{vdsm_user} /usr/sbin/usermod -a -G %{qemu_group},%{snlk_group} %{vdsm_user} +/usr/sbin/usermod -a -G %{qemu_group},%{vdsm_group} %{snlk_user} %post %{_bindir}/vdsm-tool sebool-config || : @@ -734,6 +735,9 @@ %endif %preun +/usr/bin/gpasswd -d %{snlk_user} %{qemu_group} +/usr/bin/gpasswd -d %{snlk_user} %{vdsm_group} + if [ "$1" -eq 0 ]; then start_conf_section="## beginning of configuration section by vdsm" end_conf_section="## end of configuration section by vdsm" -- To view, visit http://gerrit.ovirt.org/26055 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I668552fa037414e9a6aee5b049d61749268f85d0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

6 27

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches March 2014