vdsm-patches November 2015

vdsm-patches@lists.fedorahosted.org

47 participants
406 discussions

Change in vdsm[master]: Live Merge: Restore watermark tracking
by alitke＠redhat.com 08 Oct '16

08 Oct '16

Adam Litke has uploaded a new change for review. Change subject: Live Merge: Restore watermark tracking ...................................................................... Live Merge: Restore watermark tracking Change-Id: I632f31e7795ec5d8c6f52a480116b14470c3163f Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 108 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/24/36924/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index f22610d..09080b9 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -1512,12 +1512,94 @@ with self._confLock: self.conf['timeOffset'] = newTimeOffset + def _getWriteWatermarks(self): + def pathToVolID(drive, path): + for vol in drive.volumeChain: + if os.path.realpath(vol['path']) == os.path.realpath(path): + return vol['volumeID'] + raise LookupError("Unable to find VolumeID for path '%s'", path) + + volAllocMap = {} + statsFlags = self._libvirtBackingChainStatsFlag() + conn = libvirtconnection.get() + blkStats = conn.domainListGetStats([self._dom._dom], + libvirt.VIR_DOMAIN_STATS_BLOCK, + statsFlags)[0][1] + for i in xrange(0, blkStats['block.count']): + name = blkStats['block.%i.name' % i] + try: + drive = self._findDriveByName(name) + except LookupError: + continue + if not drive.blockDev or drive.format != 'cow': + continue + + try: + path = blkStats['block.%i.path' % i] + alloc = blkStats['block.%i.allocation' % i] + except KeyError as e: + self.log.debug("Block stats are missing expected key '%s', " + "skipping volume", e.args[0]) + continue + volID = pathToVolID(drive, path) + volAllocMap[volID] = alloc + return volAllocMap + + def _getLiveMergeExtendCandidates(self): + # The common case is that there are no active jobs. + if not self.conf['_blockJobs'].values(): + return {} + + candidates = {} + watermarks = self._getWriteWatermarks() + for job in self.conf['_blockJobs'].values(): + try: + drive = self._findDriveByUUIDs(job['disk']) + except LookupError: + # After an active layer merge completes the vdsm metadata will + # be out of sync for a brief period. If we cannot find the old + # disk then it's safe to skip it. + continue + + if not drive.blockDev: + continue + + if job['strategy'] == 'commit': + volumeID = job['baseVolume'] + else: + self.log.debug("Unrecognized merge strategy '%s'", + job['strategy']) + continue + res = self.cif.irs.getVolumeInfo(drive.domainID, drive.poolID, + drive.imageID, volumeID) + if res['status']['code'] != 0: + self.log.error("Unable to get the info of volume %s (domain: " + "%s image: %s)", volumeID, drive.domainID, + drive.imageID) + continue + volInfo = res['info'] + + if volInfo['format'].lower() != 'cow': + continue + + if volumeID in watermarks: + self.log.debug("Adding live merge extension candidate: " + "volume=%s allocation=%i", volumeID, + watermarks[volumeID]) + candidates[drive.imageID] = { + 'alloc': watermarks[volumeID], + 'physical': int(volInfo['truesize']), + 'capacity': int(volInfo['apparentsize']), + 'volumeID': volumeID} + else: + self.log.warning("No watermark info available for %s", + volumeID) + return candidates + def _getExtendCandidates(self): ret = [] - # FIXME: mergeCandidates should be a dictionary of candidate volumes - # once libvirt starts reporting watermark information for all volumes. - mergeCandidates = {} + mergeCandidates = self._getLiveMergeExtendCandidates() for drive in self._devices[hwclass.DISK]: if not drive.blockDev or drive.format != 'cow': continue @@ -4771,6 +4853,14 @@ jobsRet[jobID] = entry return jobsRet + def _libvirtBackingChainStatsFlag(self): + # Since libvirt 1.2.13, the virConnectGetAllDomainStats API will return + # block statistics for all volumes in the chain when using a new flag. + try: + return libvirt.VIR_CONNECT_GET_ALL_DOMAINS_STATS_BACKING + except AttributeError: + return 0 + def merge(self, driveSpec, baseVolUUID, topVolUUID, bandwidth, jobUUID): if not caps.getLiveMergeSupport(): self.log.error("Live merge is not supported on this host") @@ -4815,6 +4905,8 @@ if res['info']['voltype'] == 'SHARED': self.log.error("merge: Refusing to merge into a shared volume") return errCode['mergeErr'] + baseSize = int(res['info']['apparentsize']) + baseCow = bool(res['info']['format'].lower() == 'cow') # Indicate that we expect libvirt to maintain the relative paths of # backing files. This is necessary to ensure that a volume chain is @@ -4865,13 +4957,19 @@ # blockCommit will cause data to be written into the base volume. # Perform an initial extension to ensure there is enough space to - # copy all the required data. Normally we'd use monitoring to extend - # the volume on-demand but internal watermark information is not being - # reported by libvirt so we must do the full extension up front. In - # the worst case, we'll need to extend 'base' to the same size as 'top' - # plus a bit more to accomodate additional writes to 'top' during the - # live merge operation. - self.extendDriveVolume(drive, baseVolUUID, topSize) + # copy all the required data. If libvirt supports monitoring of + # backing chain volumes, just extend by one chunk now and monitor + # during the rest of the operation. Otherwise, extend now to + # accomodate the worst case scenario: no intersection between the + # allocated blocks in the base volume and the top volume. + if drive.blockDev and baseCow: + if self._libvirtBackingChainStatsFlag(): + self.extendDrivesIfNeeded() + else: + extendSize = baseSize + topSize + self.log.debug("Preemptively extending volume %s with size %i" + "(job: %s)", baseVolUUID, extendSize, jobUUID) + self.extendDriveVolume(drive, baseVolUUID, extendCurSize) # Trigger the collection of stats before returning so that callers # of getVmStats after this returns will see the new job -- To view, visit http://gerrit.ovirt.org/36924 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I632f31e7795ec5d8c6f52a480116b14470c3163f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

6 24

Change in vdsm[master]: GuestIF Refactoring
by Vinzenz Feenstra 08 Oct '16

08 Oct '16

Vinzenz Feenstra has uploaded a new change for review. Change subject: GuestIF Refactoring ...................................................................... GuestIF Refactoring Change-Id: Ib357d770a26ef1dc80b89a32bf6808551a7d622d Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M vdsm/guestIF.py 1 file changed, 114 insertions(+), 76 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/18/24618/1 diff --git a/vdsm/guestIF.py b/vdsm/guestIF.py index 229a55d..96ad68c 100644 --- a/vdsm/guestIF.py +++ b/vdsm/guestIF.py @@ -39,6 +39,115 @@ union(set(range(0x86, 0x9F + 1))) +class UnknownMessageError(Exception): + def __init__(self, message, args): + Exception.__init__(self, 'Unknown or unsupported guest agent message ' + '"%s" received with args "%s"' % (message, + str(args))) + + +class MessageHandler(object): + def __init__(self, agent): + self.log = agent.log + self._agent = agent + + def __call__(self, message, args): + handler = self.getattr(self, message.replace('-', '_'), None) + if handler: + handler(args) + else: + raise UnknownMessageError(message, args) + + def applications(self, args): + self._agent.guestInfo['appsList'] = args['applications'] + + def fqdn(self, args): + self._agent.guestInfo['guestFQDN'] = args['fqdn'] + + def host_name(self, args): + self._agent.guestInfo['guestName'] = args['name'] + + def os_version(self, args): + self._agent.guestInfo['guestOs'] = args['version'] + + def session_lock(self, args): + self.agent.guestInfo['session'] = 'Locked' + + def session_logoff(self, args): + self.agent.guestInfo['session'] = 'LoggedOff' + + def session_logon(self, args): + self.agent.guestInfo['session'] = 'UserLoggedOn' + + def session_unlock(self, args): + self.agent.guestInfo['session'] = 'Active' + + def session_shutdown(self, args): + self.log.debug('Guest system shuts down') + + def session_startup(self, args): + self.log.debug('Guest system started or restarted') + + def uninstalled(self, args): + self.log.debug('Guest agent was uninstalled') + self._agent.guestInfo['appsList'] = [] + + def heartbeat(self, args): + self._agent.guestStatus = 'Up' + self._agent.guestInfo['memUsage'] = int(args['free-ram']) + # ovirt-guest-agent reports the following fields in 'memory-stat': + # 'mem_total', 'mem_free', 'mem_unused', 'swap_in', 'swap_out', + # 'pageflt' and 'majflt' + if 'memory-stat' in args: + for (k, v) in args['memory-stat'].iteritems(): + # Convert the value to string since 64-bit integer is not + # supported in XMLRPC + self._agent.guestInfo['memoryStats'][k] = str(v) + + if 'apiVersion' in args: + # The guest agent supports API Versioning + self._agent._handleAPIVersion(args['apiVersion']) + elif self._agent.effectiveApiVersion != _IMPLICIT_API_VERSION_ZERO: + # Older versions of the guest agent (before the introduction + # of API versioning) do not report this field + # Disable the API if not already disabled (e.g. after + # downgrade of the guest agent) + self.log.debug("API versioning no longer reported by guest.") + self._agent.effectiveApiVersion = _IMPLICIT_API_VERSION_ZERO + + def network_interfaces(self, args): + interfaces = [] + old_ips = '' + for iface in args['interfaces']: + iface['inet'] = iface.get('inet', []) + iface['inet6'] = iface.get('inet6', []) + interfaces.append(iface) + # Provide the old information which includes + # only the IP addresses. + old_ips += ' '.join(iface['inet']) + ' ' + self._agent.guestInfo['netIfaces'] = interfaces + self._agent.guestInfo['guestIPs'] = old_ips.strip() + + def active_user(self, args): + currentUser = args['name'] + if ((currentUser != self._agent.guestInfo['username']) and + not (currentUser == 'Unknown' and + self._agent.guestInfo['username'] == 'None')): + self._agent.guestInfo['username'] = currentUser + self._agent.guestInfo['lastLogin'] = time.time() + self.log.debug("username: %s", repr(self.guestInfo['username'])) + + def disks_usage(self, args): + disks = [] + for disk in args['disks']: + # Converting to string because XML-RPC doesn't support 64-bit + # integers. + disk['total'] = str(disk['total']) + disk['used'] = str(disk['used']) + disks.append(disk) + self._agent.guestInfo['disksUsage'] = disks + + def _filterXmlChars(u): """ The set of characters allowed in XML documents is described in @@ -109,6 +218,7 @@ def __init__(self, socketName, channelListener, log, user='Unknown', ips='', connect=True): + self.handler = MessageHandler(self) self.effectiveApiVersion = _IMPLICIT_API_VERSION_ZERO self.log = log self._socketName = socketName @@ -223,82 +333,10 @@ self.log.log(logging.TRACE, "Guest's message %s: %s", message, args) if self.guestStatus is None: self.guestStatus = 'Up' - if message == 'heartbeat': - self.guestStatus = 'Up' - self.guestInfo['memUsage'] = int(args['free-ram']) - # ovirt-guest-agent reports the following fields in 'memory-stat': - # 'mem_total', 'mem_free', 'mem_unused', 'swap_in', 'swap_out', - # 'pageflt' and 'majflt' - if 'memory-stat' in args: - for (k, v) in args['memory-stat'].iteritems(): - # Convert the value to string since 64-bit integer is not - # supported in XMLRPC - self.guestInfo['memoryStats'][k] = str(v) - - if 'apiVersion' in args: - # The guest agent supports API Versioning - self._handleAPIVersion(args['apiVersion']) - elif self.effectiveApiVersion != _IMPLICIT_API_VERSION_ZERO: - # Older versions of the guest agent (before the introduction - # of API versioning) do not report this field - # Disable the API if not already disabled (e.g. after - # downgrade of the guest agent) - self.log.debug("API versioning no longer reported by guest.") - self.effectiveApiVersion = _IMPLICIT_API_VERSION_ZERO - elif message == 'host-name': - self.guestInfo['guestName'] = args['name'] - elif message == 'os-version': - self.guestInfo['guestOs'] = args['version'] - elif message == 'network-interfaces': - interfaces = [] - old_ips = '' - for iface in args['interfaces']: - iface['inet'] = iface.get('inet', []) - iface['inet6'] = iface.get('inet6', []) - interfaces.append(iface) - # Provide the old information which includes - # only the IP addresses. - old_ips += ' '.join(iface['inet']) + ' ' - self.guestInfo['netIfaces'] = interfaces - self.guestInfo['guestIPs'] = old_ips.strip() - elif message == 'applications': - self.guestInfo['appsList'] = args['applications'] - elif message == 'active-user': - currentUser = args['name'] - if ((currentUser != self.guestInfo['username']) and - not (currentUser == 'Unknown' and - self.guestInfo['username'] == 'None')): - self.guestInfo['username'] = currentUser - self.guestInfo['lastLogin'] = time.time() - self.log.debug("username: %s", repr(self.guestInfo['username'])) - elif message == 'session-logon': - self.guestInfo['session'] = "UserLoggedOn" - elif message == 'session-lock': - self.guestInfo['session'] = "Locked" - elif message == 'session-unlock': - self.guestInfo['session'] = "Active" - elif message == 'session-logoff': - self.guestInfo['session'] = "LoggedOff" - elif message == 'uninstalled': - self.log.debug("RHEV agent was uninstalled.") - self.guestInfo['appsList'] = [] - elif message == 'session-startup': - self.log.debug("Guest system is started or restarted.") - elif message == 'fqdn': - self.guestInfo['guestFQDN'] = args['fqdn'] - elif message == 'session-shutdown': - self.log.debug("Guest system shuts down.") - elif message == 'disks-usage': - disks = [] - for disk in args['disks']: - # Converting to string because XML-RPC doesn't support 64-bit - # integers. - disk['total'] = str(disk['total']) - disk['used'] = str(disk['used']) - disks.append(disk) - self.guestInfo['disksUsage'] = disks - else: - self.log.error('Unknown message type %s', message) + try: + self.handler(message, args) + except UnknownMessageError as e: + self.log.error(e) def stop(self): self._stopped = True -- To view, visit http://gerrit.ovirt.org/24618 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib357d770a26ef1dc80b89a32bf6808551a7d622d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

5 13

Change in vdsm[master]: network: Use new concurrent.thread() utility
by Nir Soffer 25 Sep '16

25 Sep '16

Nir Soffer has uploaded a new change for review. Change subject: network: Use new concurrent.thread() utility ...................................................................... network: Use new concurrent.thread() utility This patch updates the networking subsystem to use the new utility. Behavior changes: - dhclient.DhcpClient threads are protected from silent failures - configurators/ifcfg._ifup threads are proected from silent failures. Change-Id: I62e80bbbb9354d3173cce631ed5579532cf7cdcb Relates-To: https://bugzilla.redhat.com/1141422 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/network/configurators/dhclient.py M vdsm/network/configurators/ifcfg.py M vdsm/network/sourceroutethread.py 3 files changed, 8 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/45553/1 diff --git a/vdsm/network/configurators/dhclient.py b/vdsm/network/configurators/dhclient.py index 181c302..a25ae8f 100644 --- a/vdsm/network/configurators/dhclient.py +++ b/vdsm/network/configurators/dhclient.py @@ -23,8 +23,8 @@ import logging import os import signal -import threading +from vdsm import concurrent from vdsm import cmdutils from vdsm import ipwrapper from vdsm import netinfo @@ -76,9 +76,8 @@ rc, _, _ = self._dhclient() return rc else: - t = threading.Thread(target=self._dhclient, name='vdsm-dhclient-%s' - % self.iface) - t.daemon = True + t = concurrent.thread(self._dhclient, + name='vdsm-dhclient-%s' % self.iface) t.start() def shutdown(self): diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py index e1d3e94..f676f83 100644 --- a/vdsm/network/configurators/ifcfg.py +++ b/vdsm/network/configurators/ifcfg.py @@ -28,11 +28,11 @@ import re import selinux import shutil -import threading from libvirt import libvirtError, VIR_ERR_NO_NETWORK from vdsm.config import config +from vdsm import concurrent from vdsm import cmdutils from vdsm import constants from vdsm import ipwrapper @@ -782,9 +782,8 @@ if not iface.blockingdhcp and (iface.ipv4.bootproto == 'dhcp' or iface.ipv6.dhcpv6): # wait for dhcp in another thread, so vdsm won't get stuck (BZ#498940) - t = threading.Thread(target=_exec_ifup, name='ifup-waiting-on-dhcp', - args=(iface.name, cgroup)) - t.daemon = True + t = concurrent.thread(_exec_ifup, name='ifup-waiting-on-dhcp', + args=(iface.name, cgroup)) t.start() else: _exec_ifup(iface.name, cgroup) diff --git a/vdsm/network/sourceroutethread.py b/vdsm/network/sourceroutethread.py index 0a49760..042e5bd 100644 --- a/vdsm/network/sourceroutethread.py +++ b/vdsm/network/sourceroutethread.py @@ -19,12 +19,11 @@ from __future__ import absolute_import import logging import os -import threading import pyinotify from vdsm.constants import P_VDSM_RUN -from vdsm import utils +from vdsm import concurrent from .configurators.iproute2 import Iproute2 from .sourceroute import DynamicSourceRoute @@ -68,13 +67,10 @@ def start(): - thread = threading.Thread(target=_subscribeToInotifyLoop, - name='sourceRoute') - thread.daemon = True + thread = concurrent.thread(_subscribeToInotifyLoop, name='sourceRoute') thread.start() -(a)utils.traceback() def _subscribeToInotifyLoop(): logging.debug("sourceRouteThread.subscribeToInotifyLoop started") -- To view, visit https://gerrit.ovirt.org/45553 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I62e80bbbb9354d3173cce631ed5579532cf7cdcb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 9

Change in vdsm[master]: libvirtconnection: Replace assert with AssertionError
by Nir Soffer 25 Sep '16

25 Sep '16

Nir Soffer has uploaded a new change for review. Change subject: libvirtconnection: Replace assert with AssertionError ...................................................................... libvirtconnection: Replace assert with AssertionError The code wrongly assumed that assert always exists. When running in optimized mode, the check would be skipped, and instead of getting an AssertionError, which is the expected error for programmer error (starting the eventloop twice), we could get a confusing RuntimeException or RuntimeError from Thread.start (depending on Python version). RuntimeError misused in the standard library for all kinds of errors that do not have builtin errors. It is particularry bad option when used for usage error. Change-Id: Icf1564f81f4c1fbf77ccaff6d93c047a02d946da Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M lib/vdsm/libvirtconnection.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/64/34364/1 diff --git a/lib/vdsm/libvirtconnection.py b/lib/vdsm/libvirtconnection.py index 5430c82..009f8b7 100644 --- a/lib/vdsm/libvirtconnection.py +++ b/lib/vdsm/libvirtconnection.py @@ -37,7 +37,8 @@ self.__thread = None def start(self): - assert not self.run + if self.run: + raise AssertionError("EventLoop is running") self.__thread = threading.Thread(target=self.__run, name="libvirtEventLoop") self.__thread.setDaemon(True) -- To view, visit http://gerrit.ovirt.org/34364 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf1564f81f4c1fbf77ccaff6d93c047a02d946da Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

6 8

Change in vdsm[master]: cache: Add caching decorator with invalidation
by Nir Soffer 18 Sep '16

18 Sep '16

Nir Soffer has uploaded a new change for review. Change subject: cache: Add caching decorator with invalidation ...................................................................... cache: Add caching decorator with invalidation The new cache.memoized extends utils.memoized, adding invalidation support. Features added: - An optional "validate" argument. This is a callable invoked each time the memoized function is called. When the callable returns False, the cache is invalidated. - Memoized functions have an "invalidate" method, used to invalidate the cache during testing. - file_validator - invalidates the cache when a file changes. Example usage: from vdsm.cache import memoized, file_validator @memoized(file_validator('/bigfile')) def parse_bigfile(): # Expensive code processing '/bigfile' contents Change-Id: I6dd8fb29d94286e3e3a3e29b8218501cbdc5c018 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M lib/vdsm/Makefile.am A lib/vdsm/cache.py M tests/Makefile.am A tests/cacheTests.py 4 files changed, 366 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/34709/1 diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index b862e71..6f0040d 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -23,6 +23,7 @@ dist_vdsmpylib_PYTHON = \ __init__.py \ + cache.py \ compat.py \ define.py \ exception.py \ diff --git a/lib/vdsm/cache.py b/lib/vdsm/cache.py new file mode 100644 index 0000000..9806e40 --- /dev/null +++ b/lib/vdsm/cache.py @@ -0,0 +1,98 @@ +# +# Copyright 2014 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 +import os +import functools + + +def memoized(validate=None): + """ + Return a caching decorator supporting invalidation. + + The decorator accepts an optional validate callable, called each time the + memoized function is called. If the validate callable return True, the + memoized function will use the cache. If the validate callable return + False, the memoized cache is cleared. + + The memoized function may accept multiple positional arguments. The + cache store the result for each combination of arguments. Functions with + kwargs are not supported. + + Memoized functions have an "invalidate" method, used to invalidate the + memoized cache during testing. + + To invalidate the cache when a file changes, use the file_validator from + this module. + + Example usage: + + from vdsm.cache import memoized, file_validator + + @memoized(file_validator('/bigfile')) + def parse_bigfile(): + # Expensive code processing '/bigfile' contents + + """ + def decorator(f): + cache = {} + + @functools.wraps(f) + def wrapper(*args): + if validate is not None and not validate(): + cache.clear() + try: + value = cache[args] + except KeyError: + value = cache[args] = f(*args) + return value + + wrapper.invalidate = cache.clear + return wrapper + + return decorator + + +class file_validator(object): + """ + I'm a validator returning False when a file has changed since the last + validation. + """ + + UNKNOWN = 0 + MISSING = 1 + + def __init__(self, path): + self.path = path + self.stats = self.UNKNOWN + + def __call__(self): + try: + stats = os.stat(self.path) + except OSError as e: + if e.errno != errno.ENOENT: + raise + stats = self.MISSING + else: + stats = stats.st_ino, stats.st_size, stats.st_mtime + if stats != self.stats: + self.stats = stats + return False + return True diff --git a/tests/Makefile.am b/tests/Makefile.am index 36a1cdd..6fa7e64 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -26,6 +26,7 @@ alignmentScanTests.py \ blocksdTests.py \ bridgeTests.py \ + cacheTests.py \ cPopenTests.py \ capsTests.py \ clientifTests.py \ diff --git a/tests/cacheTests.py b/tests/cacheTests.py new file mode 100644 index 0000000..8927b39 --- /dev/null +++ b/tests/cacheTests.py @@ -0,0 +1,266 @@ +# +# Copyright 2014 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 os +from vdsm.cache import memoized +from vdsm.cache import file_validator +from testlib import VdsmTestCase +from testlib import namedTemporaryDir + + +class Validator(object): + """ I'm a callable returning a boolean value (self.valid) """ + + def __init__(self): + self.valid = True + self.count = 0 + + def __call__(self): + self.count += 1 + return self.valid + + +class Accessor(object): + """ I'm recording how many times a dict was accessed. """ + + def __init__(self, d): + self.d = d + self.count = 0 + + def get(self, key): + self.count += 1 + return self.d[key] + + +class MemoizedTests(VdsmTestCase): + + def setUp(self): + self.values = {'a': 0, 'b': 10, ('a',): 20, ('a', 'b'): 30} + + def test_no_args(self): + accessor = Accessor(self.values) + + @memoized() + def func(key): + return accessor.get(key) + + # Fill the cache + self.assertEqual(func('a'), self.values['a']) + self.assertEqual(func('b'), self.values['b']) + self.assertEqual(accessor.count, 2) + + # Values served now from the cache + self.assertEqual(func('a'), self.values['a']) + self.assertEqual(func('b'), self.values['b']) + self.assertEqual(accessor.count, 2) + + def test_validation(self): + accessor = Accessor(self.values) + validator = Validator() + + @memoized(validator) + def func(key): + return accessor.get(key) + + # Fill the cache + self.assertEqual(func('a'), self.values['a']) + self.assertEqual(func('b'), self.values['b']) + self.assertEqual(accessor.count, 2) + self.assertEqual(validator.count, 2) + + # Values served now from the cache + self.assertEqual(func('a'), self.values['a']) + self.assertEqual(func('b'), self.values['b']) + self.assertEqual(accessor.count, 2) + self.assertEqual(validator.count, 4) + + # Values has changed + self.values['a'] += 1 + self.values['b'] += 1 + + # Next call should clear the cache + validator.valid = False + self.assertEqual(func('a'), self.values['a']) + self.assertEqual(accessor.count, 3) + self.assertEqual(validator.count, 5) + + # Next call should add next value to cache + validator.valid = True + self.assertEqual(func('b'), self.values['b']) + self.assertEqual(accessor.count, 4) + self.assertEqual(validator.count, 6) + + # Values served now from the cache + self.assertEqual(func('a'), self.values['a']) + self.assertEqual(func('b'), self.values['b']) + self.assertEqual(accessor.count, 4) + self.assertEqual(validator.count, 8) + + def test_raise_errors_in_memoized_func(self): + accessor = Accessor(self.values) + validator = Validator() + + @memoized(validator) + def func(key): + return accessor.get(key) + + # First run should fail, second shold fill the cache + self.assertRaises(KeyError, func, 'no such key') + self.assertEqual(func('a'), self.values['a']) + self.assertEqual(accessor.count, 2) + self.assertEqual(validator.count, 2) + + def test_multiple_args(self): + accessor = Accessor(self.values) + + @memoized() + def func(*args): + return accessor.get(args) + + # Fill the cache + self.assertEqual(func('a'), self.values[('a',)]) + self.assertEqual(func('a', 'b'), self.values[('a', 'b')]) + self.assertEqual(accessor.count, 2) + + # Values served now from the cache + self.assertEqual(func('a'), self.values[('a',)]) + self.assertEqual(func('a', 'b'), self.values[('a', 'b')]) + self.assertEqual(accessor.count, 2) + + def test_kwargs_not_supported(self): + @memoized() + def func(a=None, b=None): + pass + self.assertRaises(TypeError, func, a=1, b=2) + + def test_invalidate(self): + accessor = Accessor(self.values) + + @memoized() + def func(key): + return accessor.get(key) + + self.assertEqual(func('a'), self.values['a']) + self.assertEqual(accessor.count, 1) + + func.invalidate() + + self.assertEqual(func('a'), self.values['a']) + self.assertEqual(accessor.count, 2) + + +class FileValidatorTests(VdsmTestCase): + + def test_no_file(self): + with namedTemporaryDir() as tempdir: + path = os.path.join(tempdir, 'data') + validator = file_validator(path) + + # Must be False so memoise call the decorated function + self.assertEqual(validator(), False) + + # Since file state did not change, must remain True + self.assertEqual(validator(), True) + + def test_file_created(self): + with namedTemporaryDir() as tempdir: + path = os.path.join(tempdir, 'data') + validator = file_validator(path) + + self.assertEqual(validator(), False) + self.assertEqual(validator(), True) + + with open(path, 'w') as f: + f.write('data') + + self.assertEqual(validator(), False) + self.assertEqual(validator(), True) + + def test_file_removed(self): + with namedTemporaryDir() as tempdir: + path = os.path.join(tempdir, 'data') + validator = file_validator(path) + + with open(path, 'w') as f: + f.write('data') + + self.assertEqual(validator(), False) + self.assertEqual(validator(), True) + + os.unlink(path) + + self.assertEqual(validator(), False) + self.assertEqual(validator(), True) + + def test_size_changed(self): + with namedTemporaryDir() as tempdir: + path = os.path.join(tempdir, 'data') + validator = file_validator(path) + data = 'old data' + with open(path, 'w') as f: + f.write(data) + + self.assertEqual(validator(), False) + self.assertEqual(validator(), True) + + with open(path, 'w') as f: + f.write(data + ' new data') + + self.assertEqual(validator(), False) + self.assertEqual(validator(), True) + + def test_mtime_changed(self): + with namedTemporaryDir() as tempdir: + path = os.path.join(tempdir, 'data') + validator = file_validator(path) + data = 'old data' + with open(path, 'w') as f: + f.write(data) + + self.assertEqual(validator(), False) + self.assertEqual(validator(), True) + + # Fake timestamp change, as timestamp resolution may not be good + # enough when comparing changes during the test. + atime = mtime = os.path.getmtime(path) + 1 + os.utime(path, (atime, mtime)) + + self.assertEqual(validator(), False) + self.assertEqual(validator(), True) + + def test_ino_changed(self): + with namedTemporaryDir() as tempdir: + path = os.path.join(tempdir, 'data') + validator = file_validator(path) + data = 'old data' + with open(path, 'w') as f: + f.write(data) + + self.assertEqual(validator(), False) + self.assertEqual(validator(), True) + + tmp = path + '.tmp' + with open(tmp, 'w') as f: + f.write(data) + os.rename(tmp, path) + + self.assertEqual(validator(), False) + self.assertEqual(validator(), True) -- To view, visit http://gerrit.ovirt.org/34709 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6dd8fb29d94286e3e3a3e29b8218501cbdc5c018 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

9 40

Change in vdsm[master]: fencing: Make getHostLeaseStatus API public
by Nir Soffer 18 Sep '16

18 Sep '16

Nir Soffer has uploaded a new change for review. Change subject: fencing: Make getHostLeaseStatus API public ...................................................................... fencing: Make getHostLeaseStatus API public Getting host lease status will allow engine to make smarter decisions when a host is non-responsive by using a proxy host to get the non-responsive host status. See http://pastebin.com/KqqeAdSu for example output from this API. Change-Id: I415c1fee6256bf8d4e03ee542cc58e193162e9b8 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M client/vdsClient.py M vdsm/API.py M vdsm/rpc/BindingXMLRPC.py M vdsm/rpc/Bridge.py M vdsm/rpc/vdsmapi-schema.json 5 files changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/57/29157/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 2c09b28..aea1503 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -1760,6 +1760,18 @@ status = self.s.stopMonitoringDomain(sdUUID) return status['status']['code'], status['status']['message'] + def getHostLeaseStatus(self, args): + domains = {} + for pair in args: + sdUUID, hostId = pair.split('=', 1) + domains[sdUUID] = int(hostId) + response = self.s.getHostLeaseStatus(domains) + if response['status']['code']: + print "Cannot get host storage liveliness" + return response['status']['code'], response['status']['message'] + pp.pprint(response['domains']) + return 0, '' + def snapshot(self, args): vmUUID, sdUUID, imgUUID, baseVolUUID, volUUID = args @@ -2579,6 +2591,11 @@ ('<sdUUID>', 'Stop monitoring SD: sdUUID' )), + 'getHostLeaseStatus': (serv.getHostLeaseStatus, + ('<sdUUID>=<hostId> [<sdUUID>=<hostId>] ...', + 'Returns host lease status for hostId on ' + 'each domain.' + )), 'snapshot': (serv.snapshot, ('<vmId> <sdUUID> <imgUUID> <baseVolUUID> <volUUID>', 'Take a live snapshot' diff --git a/vdsm/API.py b/vdsm/API.py index e739294..0b44459 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1497,6 +1497,9 @@ def stopMonitoringDomain(self, sdUUID): return self._irs.stopMonitoringDomain(sdUUID) + def getHostLeaseStatus(self, domains): + return self._irs.getHostLeaseStatus(domains) + def getLVMVolumeGroups(self, storageType=None): return self._irs.getVGList(storageType) diff --git a/vdsm/rpc/BindingXMLRPC.py b/vdsm/rpc/BindingXMLRPC.py index c1c7490..a06a3b4 100644 --- a/vdsm/rpc/BindingXMLRPC.py +++ b/vdsm/rpc/BindingXMLRPC.py @@ -917,6 +917,10 @@ api = API.Global() return api.stopMonitoringDomain(sdUUID) + def getHostLeaseStatus(self, domains, options=None): + api = API.Global() + return api.getHostLeaseStatus(domains) + def vgsGetList(self, storageType=None, options=None): api = API.Global() return api.getLVMVolumeGroups(storageType) @@ -1070,6 +1074,7 @@ (self.storageRepoGetStats, 'repoStats'), (self.startMonitoringDomain, 'startMonitoringDomain'), (self.stopMonitoringDomain, 'stopMonitoringDomain'), + (self.getHostLeaseStatus, 'getHostLeaseStatus'), (self.vgsGetList, 'getVGList'), (self.devicesGetList, 'getDeviceList'), (self.devicesGetVisibility, 'getDevicesVisibility'), diff --git a/vdsm/rpc/Bridge.py b/vdsm/rpc/Bridge.py index 7e898de..ba700d1 100644 --- a/vdsm/rpc/Bridge.py +++ b/vdsm/rpc/Bridge.py @@ -349,6 +349,7 @@ 'Host_getStorageRepoStats': {'ret': Host_getStorageRepoStats_Ret}, 'Host_startMonitoringDomain': {}, 'Host_stopMonitoringDomain': {}, + 'Host_getHostLeaseStatus': {'ret': 'domains'}, 'Host_getVMList': {'call': Host_getVMList_Call, 'ret': Host_getVMList_Ret}, 'Host_getVMFullList': {'call': Host_getVMFullList_Call, 'ret': 'vmList'}, 'Host_getAllVmStats': {'ret': 'statsList'}, diff --git a/vdsm/rpc/vdsmapi-schema.json b/vdsm/rpc/vdsmapi-schema.json index 0c8a6f6..7617185 100644 --- a/vdsm/rpc/vdsmapi-schema.json +++ b/vdsm/rpc/vdsmapi-schema.json @@ -2052,6 +2052,42 @@ 'returns': ''} ## +# @HostIdMap: +# +# A mapping of hostId indexed by domain UUID. +# +# Since: 4.15.0 +## +{'map': 'HostIdMap', + 'key': 'UUID', 'value': 'int'} + +## +# @HostLeaseStatusMap: +# +# A mapping of status codes indexed by domain UUID. +# +# Since: 4.15.0 +## +{'map': 'HostLeaseStatusMap', + 'key': 'UUID', 'value': 'str'} + +## +# @Host.getHostLeaseStatus: +# +# Returns host status for for specified domains +# +# @domains: A mapping of hostId indexed by domain UUID +# +# Returns: +# Host status code for each domain +# +# Since: 4.15.0 +## +{'command': {'class': 'Host', 'name': 'getHostLeaseStatus'}, + 'data': {'domains': 'HostIdMap'} + 'returns': {'domains': 'HostLeaseStatusMap'}} + +## # @VmStatus: # # An enumeration of possible virtual machine statuses. -- To view, visit http://gerrit.ovirt.org/29157 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I415c1fee6256bf8d4e03ee542cc58e193162e9b8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 14

Change in vdsm[master]: sdc: Rename method to make it less confusing
by Nir Soffer 18 Sep '16

18 Sep '16

Nir Soffer has uploaded a new change for review. Change subject: sdc: Rename method to make it less confusing ...................................................................... sdc: Rename method to make it less confusing StorageCache.refresh() does not do any refresh, but clearing the domain cahce and invlidating lvm cache (actually clearing it). Rename to clear() to reflect what it does. Change-Id: I2c67ae0ddc98857e406fec62be0cbcf817213236 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/sdc.py M vdsm/storage/sp.py 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/16/47916/1 diff --git a/vdsm/storage/sdc.py b/vdsm/storage/sdc.py index ecb9708..a26c05a 100644 --- a/vdsm/storage/sdc.py +++ b/vdsm/storage/sdc.py @@ -181,7 +181,7 @@ return uuids - def refresh(self): + def clear(self): with self._syncroot: lvm.invalidateCache() self.__domainCache.clear() diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index b8fd8f3..6ecaf8d 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -627,7 +627,7 @@ self.id = hostID # Make sure SDCache doesn't have stale data (it can be in case of FC) sdCache.invalidateStorage() - sdCache.refresh() + sdCache.clear() # Rebuild whole Pool self.__rebuild(msdUUID=msdUUID, masterVersion=masterVersion) self.__createMailboxMonitor() @@ -1245,7 +1245,7 @@ 'msdUUID' - master storage domain UUID """ sdCache.invalidateStorage() - sdCache.refresh() + sdCache.clear() self.__rebuild(msdUUID=msdUUID, masterVersion=masterVersion) def updateVM(self, vmList, sdUUID): -- To view, visit https://gerrit.ovirt.org/47916 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c67ae0ddc98857e406fec62be0cbcf817213236 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 7

Change in vdsm[master]: scsi: Scan only the required domain type
by Nir Soffer 18 Sep '16

18 Sep '16

Nir Soffer has uploaded a new change for review. Change subject: scsi: Scan only the required domain type ...................................................................... scsi: Scan only the required domain type We used to perform both iSCSI and FCP rescan when creating or editing a storage domain, connecting to storage server, getting vg and storage domain list and more. The unneeded rescan is typically fast, but if a storage server or device is not accessible, a SCSI rescan may block for couple of minutes, leading to unwanted blocking of unrelated storage threads. This is particularly bad when you are interested only in one domain type, but the host get stuck scanning the other type. To improve storage domain isolation, we use the specified storage type to perform a rescan only of the relevant type. If storage type was not specified, we scan both ISCSI and FCP keeping the old behavior. Change-Id: Ic32cd683020e94df016dd77b19ae3eb7317c5554 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/hsm.py M vdsm/storage/multipath.py M vdsm/storage/sdc.py 3 files changed, 25 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/24/45824/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 1b8c064..541b699 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -1984,15 +1984,16 @@ return dict(devList=devices) def _getDeviceList(self, storageType=None, guids=(), checkStatus=True): - sdCache.refreshStorage() - typeFilter = lambda dev: True - if storageType: - if sd.storageType(storageType) == sd.type2name(sd.ISCSI_DOMAIN): - typeFilter = \ - lambda dev: multipath.devIsiSCSI(dev.get("devtype")) - elif sd.storageType(storageType) == sd.type2name(sd.FCP_DOMAIN): - typeFilter = \ - lambda dev: multipath.devIsFCP(dev.get("devtype")) + domType = sd.storageType(storageType) if storageType else None + + sdCache.refreshStorage(domType) + + if domType == sd.ISCSI_DOMAIN: + typeFilter = lambda dev: multipath.devIsiSCSI(dev.get("devtype")) + elif domType == sd.FCP_DOMAIN: + typeFilter = lambda dev: multipath.devIsFCP(dev.get("devtype")) + else: + typeFilter = lambda dev: True devices = [] pvs = {} @@ -2470,7 +2471,7 @@ # while the VDSM was not connected, we need to # call refreshStorage. if domType in (sd.FCP_DOMAIN, sd.ISCSI_DOMAIN): - sdCache.refreshStorage() + sdCache.refreshStorage(domType) try: doms = self.__prefetchDomains(domType, conObj) except: @@ -2864,7 +2865,8 @@ """ vars.task.setDefaultException( se.StorageDomainActionError("spUUID: %s" % spUUID)) - sdCache.refreshStorage() + domType = sd.storageType(storageType) if storageType else None + sdCache.refreshStorage(domType) if spUUID and spUUID != volume.BLANK_UUID: domList = self.getPool(spUUID).getDomains() domains = domList.keys() @@ -2925,7 +2927,8 @@ :rtype: dict """ vars.task.setDefaultException(se.VolumeGroupActionError()) - sdCache.refreshStorage() + domType = sd.storageType(storageType) if storageType else None + sdCache.refreshStorage(domType) # getSharedLock(connectionsResource...) vglist = [] vgs = self.__getVGsInfo() diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py index ad81d2d..32deb98 100644 --- a/vdsm/storage/multipath.py +++ b/vdsm/storage/multipath.py @@ -39,6 +39,7 @@ import misc import iscsi import devicemapper +import sd DEV_ISCSI = "iSCSI" DEV_FCP = "FCP" @@ -61,7 +62,7 @@ """ multipath operation failed """ -def rescan(): +def rescan(domType=None): """ Forces multipath daemon to rescan the list of available devices and refresh the mapping table. New devices can be found under /dev/mapper @@ -70,8 +71,12 @@ """ # First rescan iSCSI and FCP connections - iscsi.rescan() - hba.rescan() + + if domType in (None, sd.ISCSI_DOMAIN): + iscsi.rescan() + + if domType in (None, sd.FCP_DOMAIN): + hba.rescan() # Now let multipath daemon pick up new devices misc.execCmd([constants.EXT_MULTIPATH], sudo=True) diff --git a/vdsm/storage/sdc.py b/vdsm/storage/sdc.py index ecb9708..273c5c0 100644 --- a/vdsm/storage/sdc.py +++ b/vdsm/storage/sdc.py @@ -77,10 +77,10 @@ self.__staleStatus = self.STORAGE_STALE @misc.samplingmethod - def refreshStorage(self): + def refreshStorage(self, domType=None): self.__staleStatus = self.STORAGE_REFRESHING - multipath.rescan() + multipath.rescan(domType) multipath.resize_devices() lvm.invalidateCache() -- To view, visit https://gerrit.ovirt.org/45824 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic32cd683020e94df016dd77b19ae3eb7317c5554 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 7

Change in vdsm[master]: cache: Replace utils.memoized with cache.memoized()
by Nir Soffer 18 Sep '16

18 Sep '16

Nir Soffer has uploaded a new change for review. Change subject: cache: Replace utils.memoized with cache.memoized() ...................................................................... cache: Replace utils.memoized with cache.memoized() Repalce users of utils.memoized with cache.memoized() and remove utils.memoized. No behavior change is expected. Change-Id: I12e2f2919cf92ff7d0758d70e2ed40523d66174f Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M lib/vdsm/netinfo.py M lib/vdsm/utils.py M tests/vmApiTests.py M vdsm/caps.py M vdsm/dmidecodeUtil.py M vdsm/ppc64HardwareInfo.py M vdsm/supervdsmServer M vdsm/virt/sampling.py 8 files changed, 30 insertions(+), 51 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/34710/1 diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index d2ef90b..8c56863 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -43,7 +43,7 @@ from .ipwrapper import routeShowGateways from . import libvirtconnection from .netconfpersistence import RunningConfig -from .utils import memoized +from .cache import memoized from .netlink import link as nl_link from .netlink import addr as nl_addr from .netlink import route as nl_route @@ -395,7 +395,7 @@ return paddr -@memoized +@memoized() def _getAllDefaultBondingOptions(): """ Return default options per mode, in a dictionary of dictionaries. All keys @@ -405,7 +405,7 @@ return json.loads(defaults.read()) -@memoized +@memoized() def _getDefaultBondingOptions(mode=None): """ Return default options for the given mode. If it is None, return options diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py index feb4079..131145c 100644 --- a/lib/vdsm/utils.py +++ b/lib/vdsm/utils.py @@ -51,6 +51,7 @@ import vdsm.infra.zombiereaper as zombiereaper from cpopen import CPopen +from . import cache from . import constants # Buffsize is 1K because I tested it on some use cases and 1K was fastest. If @@ -828,32 +829,6 @@ fcntl.fcntl(fd, fcntl.F_SETFD, old | fcntl.FD_CLOEXEC) -class memoized(object): - """ - Decorator that caches a function's return value each time it is called. - If called later with the same arguments, the cached value is returned, and - not re-evaluated. There is no support for uncachable arguments. - - Adaptation from http://wiki.python.org/moin/PythonDecoratorLibrary#Memoize - """ - def __init__(self, func): - self.func = func - self.cache = {} - functools.update_wrapper(self, func) - - def __call__(self, *args): - try: - return self.cache[args] - except KeyError: - value = self.func(*args) - self.cache[args] = value - return value - - def __get__(self, obj, objtype): - """Support instance methods.""" - return functools.partial(self.__call__, obj) - - def validateMinimalKeySet(dictionary, reqParams): if not all(key in dictionary for key in reqParams): raise ValueError @@ -993,7 +968,7 @@ sys.exit(-3) -@memoized +(a)cache.memoized() def isOvirtNode(): return (os.path.exists('/etc/rhev-hypervisor-release') or bool(glob.glob('/etc/ovirt-node-*-release'))) diff --git a/tests/vmApiTests.py b/tests/vmApiTests.py index eb89fb1..4f940cf 100644 --- a/tests/vmApiTests.py +++ b/tests/vmApiTests.py @@ -25,14 +25,14 @@ from virt import vmexitreason from vdsm import define from testlib import VdsmTestCase as TestCaseBase -from vdsm import utils +from vdsm import cache from rpc import vdsmapi import vmfakelib as fake class TestSchemaCompliancyBase(TestCaseBase): - @utils.memoized + @cache.memoized() def _getAPI(self): testPath = os.path.realpath(__file__) dirName = os.path.split(testPath)[0] diff --git a/vdsm/caps.py b/vdsm/caps.py index dba9b5b..6e261d8 100644 --- a/vdsm/caps.py +++ b/vdsm/caps.py @@ -40,6 +40,7 @@ import dsaversion from vdsm import netinfo import hooks +from vdsm import cache from vdsm import utils import storage.hba from network.configurators import qos @@ -218,12 +219,12 @@ ENABLED = 1 -(a)utils.memoized +(a)cache.memoized() def _getCapsXMLStr(): return libvirtconnection.get().getCapabilities() -(a)utils.memoized +(a)cache.memoized() def _getCpuTopology(capabilities): if capabilities is None: capabilities = _getCapsXMLStr() @@ -277,7 +278,7 @@ return None -(a)utils.memoized +(a)cache.memoized() def _getLiveSnapshotSupport(arch, capabilities=None): if capabilities is None: capabilities = _getCapsXMLStr() @@ -294,7 +295,7 @@ return None -(a)utils.memoized +(a)cache.memoized() def getLiveMergeSupport(): """ Determine if libvirt provides the necessary features to enable live merge. @@ -318,7 +319,7 @@ return True -(a)utils.memoized +(a)cache.memoized() def getNumaTopology(): capabilities = _getCapsXMLStr() caps = minidom.parseString(capabilities) @@ -369,7 +370,7 @@ return memDict -(a)utils.memoized +(a)cache.memoized() def getNumaNodeDistance(): nodeDistance = {} retcode, out, err = utils.execCmd(['numactl', '--hardware']) @@ -385,7 +386,7 @@ return nodeDistance -(a)utils.memoized +(a)cache.memoized() def getAutoNumaBalancingInfo(): retcode, out, err = utils.execCmd(['sysctl', '-n', '-e', 'kernel.numa_balancing']) @@ -399,7 +400,7 @@ return AutoNumaBalancingStatus.UNKNOWN -(a)utils.memoized +(a)cache.memoized() def _getEmulatedMachines(arch, capabilities=None): if capabilities is None: capabilities = _getCapsXMLStr() @@ -461,7 +462,7 @@ return allModels -(a)utils.memoized +(a)cache.memoized() def _getCompatibleCpuModels(): c = libvirtconnection.get() allModels = _getAllCpuModels() @@ -532,7 +533,7 @@ return kdumpStatus -(a)utils.memoized +(a)cache.memoized() def getos(): if os.path.exists('/etc/rhev-hypervisor-release'): return OSName.RHEVH @@ -550,7 +551,7 @@ return OSName.UNKNOWN -(a)utils.memoized +(a)cache.memoized() def osversion(): version = release = '' @@ -700,7 +701,7 @@ return info -(a)utils.memoized +(a)cache.memoized() def _getVersionInfo(): if not hasattr(libvirt, 'VIR_MIGRATE_ABORT_ON_ERROR'): return _dropVersion('3.4', diff --git a/vdsm/dmidecodeUtil.py b/vdsm/dmidecodeUtil.py index add2526..f0c72fa 100644 --- a/vdsm/dmidecodeUtil.py +++ b/vdsm/dmidecodeUtil.py @@ -18,7 +18,7 @@ # Refer to the README and COPYING files for full details of the license # -from vdsm import utils +from vdsm import cache # This function gets dict and returns new dict that includes only string @@ -35,7 +35,7 @@ return ret -(a)utils.memoized +(a)cache.memoized() def getAllDmidecodeInfo(): import dmidecode @@ -45,7 +45,7 @@ return myLeafDict -(a)utils.memoized +(a)cache.memoized() def getHardwareInfoStructure(): dmiInfo = getAllDmidecodeInfo() sysStruct = {} diff --git a/vdsm/ppc64HardwareInfo.py b/vdsm/ppc64HardwareInfo.py index 23f7388..1a89639 100644 --- a/vdsm/ppc64HardwareInfo.py +++ b/vdsm/ppc64HardwareInfo.py @@ -16,6 +16,7 @@ # Refer to the README and COPYING files for full details of the license # +from vdsm import cache from vdsm import utils import os @@ -31,7 +32,7 @@ return 'unavailable' -(a)utils.memoized +(a)cache.memoized() def getHardwareInfoStructure(): infoStructure = {'systemSerialNumber': 'unavailable', 'systemFamily': 'unavailable', @@ -59,7 +60,7 @@ return infoStructure -(a)utils.memoized +(a)cache.memoized() def getCpuTopology(capabilities): topology = {} diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer index c6c139b..aba32fb 100755 --- a/vdsm/supervdsmServer +++ b/vdsm/supervdsmServer @@ -51,6 +51,7 @@ except ImportError: _glusterEnabled = False +from vdsm import cache from vdsm import utils from vdsm.tool import restore_nets from parted_utils import getDevicePartedInfo as _getDevicePartedInfo @@ -378,7 +379,7 @@ raise OSError(errno.EINVAL, "Could not reload-rules for device " "%s" % guid) - @utils.memoized + @cache.memoized() def __udevVersion(self): cmd = [EXT_UDEVADM, '--version'] rc, out, err = utils.execCmd(cmd) diff --git a/vdsm/virt/sampling.py b/vdsm/virt/sampling.py index 6bb4211..b1c3db6 100644 --- a/vdsm/virt/sampling.py +++ b/vdsm/virt/sampling.py @@ -30,6 +30,7 @@ import errno import re +from vdsm import cache from vdsm import utils from vdsm import netinfo from vdsm.ipwrapper import getLinks @@ -524,7 +525,7 @@ if not self._stopEvent.isSet(): self._log.error("Error while sampling stats", exc_info=True) - @utils.memoized + @cache.memoized() def _boot_time(self): # Try to get boot time only once, if N/A just log the error and never # include it in the response. -- To view, visit http://gerrit.ovirt.org/34710 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12e2f2919cf92ff7d0758d70e2ed40523d66174f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

6 18

Change in vdsm[master]: [WIP]fencenode: split fenceNode into its own module
by ykaplan＠redhat.com 18 Sep '16

18 Sep '16

Yeela Kaplan has uploaded a new change for review. Change subject: [WIP]fencenode: split fenceNode into its own module ...................................................................... [WIP]fencenode: split fenceNode into its own module Change-Id: I7bd5e7246cf6da21e355849014a8fc71d5edbde6 Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com> --- M debian/vdsm-python.install M lib/vdsm/Makefile.am A lib/vdsm/fencenode.py M vdsm.spec.in M vdsm/API.py 5 files changed, 120 insertions(+), 80 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/43597/1 diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install index d9402c3..901edb6 100644 --- a/debian/vdsm-python.install +++ b/debian/vdsm-python.install @@ -10,6 +10,7 @@ ./usr/lib/python2.7/dist-packages/vdsm/exception.py ./usr/lib/python2.7/dist-packages/vdsm/executor.py ./usr/lib/python2.7/dist-packages/vdsm/ipwrapper.py +./usr/lib/python2.7/dist-packages/vdsm/fencenode.py ./usr/lib/python2.7/dist-packages/vdsm/jsonrpcvdscli.py ./usr/lib/python2.7/dist-packages/vdsm/libvirtconnection.py ./usr/lib/python2.7/dist-packages/vdsm/netconfpersistence.py diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index 95e236f..875507c 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -30,6 +30,7 @@ exception.py \ executor.py \ ipwrapper.py \ + fencenode.py \ jsonrpcvdscli.py \ libvirtconnection.py \ netconfpersistence.py \ diff --git a/lib/vdsm/fencenode.py b/lib/vdsm/fencenode.py new file mode 100644 index 0000000..3456b2f --- /dev/null +++ b/lib/vdsm/fencenode.py @@ -0,0 +1,100 @@ +# +# Copyright 2015 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 logging +import os +import signal + +import utils +import constants +from define import doneCode, errCode + + +(a)utils.traceback(on=logging.name) +def fence(script, data): + # non-status actions are sent asyncronously. deathSignal is set to + # make sure that no stray fencing scripts are left behind if Vdsm + # crashes. + rc, out, err = utils.execCmd( + [script], deathSignal=signal.SIGTERM, data=data) + logging.debug('rc %s data %s out %s err %s', rc, + hidePasswd(data), out, err) + return rc, out, err + + +def hidePasswd(text): + cleantext = '' + for line in text.splitlines(True): + if line.startswith('passwd='): + line = 'passwd=XXXX\n' + cleantext += line + return cleantext + + +def fenceNode(addr, port, agent, username, password, action, + secure=False, options='', policy=None): + + logging.debug('fenceNode(addr=%s,port=%s,agent=%s,user=%s,passwd=%s,' + 'action=%s,secure=%s,options=%s,policy=%s)', + addr, port, agent, username, password, action, secure, + options, policy) + + if action not in ('status', 'on', 'off', 'reboot'): + raise ValueError('illegal action ' + action) + + script = constants.EXT_FENCE_PREFIX + agent + + data = ('agent=fence_%s\nipaddr=%s\nlogin=%s\naction=%s\n' + 'passwd=%s\n') % (agent, addr, username, action, password.value) + if port != '': + data += 'port=%s\n' % (port,) + if utils.tobool(secure): + data += 'secure=yes\n' + data += options + + try: + rc, out, err = fence(script, data) + except OSError as e: + if e.errno == os.errno.ENOENT: + return errCode['fenceAgent'] + raise + + logging.debug('rc %s data %s out %s err %s', + rc, hidePasswd(data), out, err) + + if not 0 <= rc <= 2: + return {'status': {'code': 1, + 'message': out + err}} + + message = doneCode['message'] + if action == 'status': + if rc == 0: + power = 'on' + elif rc == 2: + power = 'off' + else: + power = 'unknown' + message = out + err + return {'status': {'code': 0, 'message': message}, + 'power': power} + if rc != 0: + message = out + err + return {'status': {'code': rc, 'message': message}, + 'power': 'unknown', 'operationStatus': 'initiated'} diff --git a/vdsm.spec.in b/vdsm.spec.in index 966a974..9e69162 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1071,6 +1071,7 @@ %{python_sitelib}/%{vdsm_name}/exception.py* %{python_sitelib}/%{vdsm_name}/executor.py* %{python_sitelib}/%{vdsm_name}/ipwrapper.py* +%{python_sitelib}/%{vdsm_name}/fencenode.py* %{python_sitelib}/%{vdsm_name}/jsonrpcvdscli.py* %{python_sitelib}/%{vdsm_name}/libvirtconnection.py* %{python_sitelib}/%{vdsm_name}/netinfo.py* diff --git a/vdsm/API.py b/vdsm/API.py index 0a93d2a..0719926 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -21,8 +21,6 @@ # pylint: disable=R0904 from contextlib import contextmanager -import os -import signal import six import sys import time @@ -38,6 +36,7 @@ from clientIF import clientIF from vdsm import netinfo from vdsm import constants +from vdsm import fencenode import storage.misc import storage.clusterlock import storage.volume @@ -1187,6 +1186,11 @@ APIBase.__init__(self) # General Host functions + def ping(self): + "Ping the server. Useful for tests" + updateTimestamp() + return {'status': doneCode} + def fenceNode(self, addr, port, agent, username, password, action, secure=False, options='', policy=None): """Send a fencing command to a remote node. @@ -1194,44 +1198,24 @@ agent is one of (rsa, ilo, drac5, ipmilan, etc) action can be one of (status, on, off, reboot).""" - @utils.traceback(on=self.log.name) - def fence(script, inp): - # non-status actions are sent asyncronously. deathSignal is set to - # make sure that no stray fencing scripts are left behind if Vdsm - # crashes. - rc, out, err = utils.execCmd( - [script], deathSignal=signal.SIGTERM, - data=inp) - self.log.debug('rc %s inp %s out %s err %s', rc, - hidePasswd(inp), out, err) - return rc, out, err - - def hidePasswd(text): - cleantext = '' - for line in text.splitlines(True): - if line.startswith('passwd='): - line = 'passwd=XXXX\n' - cleantext += line - return cleantext - def should_fence(policy): # skip fence execution if map of storage domains with host id is # entered and at least one storage domain connection from host is # alive if policy is None: - self.log.debug('No policy specified') + logging.debug('No policy specified') return True hostIdMap = policy.get('storageDomainHostIdMap') if not hostIdMap: - self.log.warning('Invalid policy specified') + logging.warning('Invalid policy specified') return True result = self._irs.getHostLeaseStatus(hostIdMap) - if result['status']['code'] != 0: - self.log.error( - "Error getting host lease status, error code '%s'", - result['status']['code']) + rc = result['status']['code'] + if rc != 0: + logging.error( + "Error getting host lease status, error code '%s'", rc) return True # HOST_STATUS_LIVE means that host renewed its lease in last 80 @@ -1239,65 +1223,18 @@ # fencing, even when it's unreachable from engine for sd, status in result['domains'].iteritems(): if status == storage.clusterlock.HOST_STATUS_LIVE: - self.log.debug("Host has live lease on '%s'", sd) + logging.debug("Host has live lease on '%s'", sd) return False - self.log.debug("Host doesn't have any live lease") + logging.debug("Host doesn't have any live lease") return True - self.log.debug('fenceNode(addr=%s,port=%s,agent=%s,user=%s,passwd=%s,' - 'action=%s,secure=%s,options=%s,policy=%s)', - addr, port, agent, username, password, action, secure, - options, policy) - - if action not in ('status', 'on', 'off', 'reboot'): - raise ValueError('illegal action ' + action) - if action != 'status' and not should_fence(policy): - self.log.debug("Skipping execution of action '%s'", action) + logging.debug("Skipping execution of action '%s'", action) return {'status': doneCode, 'operationStatus': 'skipped'} - script = constants.EXT_FENCE_PREFIX + agent - - inp = ('agent=fence_%s\nipaddr=%s\nlogin=%s\naction=%s\n' - 'passwd=%s\n') % (agent, addr, username, action, password.value) - if port != '': - inp += 'port=%s\n' % (port,) - if utils.tobool(secure): - inp += 'secure=yes\n' - inp += options - - try: - rc, out, err = fence(script, inp) - except OSError as e: - if e.errno == os.errno.ENOENT: - return errCode['fenceAgent'] - raise - self.log.debug('rc %s in %s out %s err %s', rc, - hidePasswd(inp), out, err) - if not 0 <= rc <= 2: - return {'status': {'code': 1, - 'message': out + err}} - message = doneCode['message'] - if action == 'status': - if rc == 0: - power = 'on' - elif rc == 2: - power = 'off' - else: - power = 'unknown' - message = out + err - return {'status': {'code': 0, 'message': message}, - 'power': power} - if rc != 0: - message = out + err - return {'status': {'code': rc, 'message': message}, - 'power': 'unknown', 'operationStatus': 'initiated'} - - def ping(self): - "Ping the server. Useful for tests" - updateTimestamp() - return {'status': doneCode} + return fencenode.fenceNode(addr, port, agent, username, password, + action, secure, options, policy) def getCapabilities(self): """ -- To view, visit https://gerrit.ovirt.org/43597 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bd5e7246cf6da21e355849014a8fc71d5edbde6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>

4 5

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches November 2015