vdsm-patches December 2013

vdsm-patches@lists.fedorahosted.org

48 participants
493 discussions

Change in vdsm[master]: vmDevices: add __slots__ to devices
by mpoledni＠redhat.com 11 Feb '14

11 Feb '14

Martin Polednik has uploaded a new change for review. Change subject: vmDevices: add __slots__ to devices ...................................................................... vmDevices: add __slots__ to devices VDSM devices are created using setattr over **kwargs, making the initialization implicit. Implementing __slots__ does define which attributes does the device accept and also improves memory footprint. Change-Id: I6e8dadabdd02d3b44606f215c4bc7b7e306a591a Signed-off-by: Martin Polednik <mpoledni(a)redhat.com> --- M vdsm/vm.py 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/21036/1 diff --git a/vdsm/vm.py b/vdsm/vm.py index 796735f..7e4483f 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -1166,7 +1166,10 @@ class VmDevice(object): + __slots__ = ['deviceType', 'device', 'alias', 'specParams', 'deviceId'] + def __init__(self, conf, log, **kwargs): + self.specParams = {} for attr, value in kwargs.iteritems(): try: setattr(self, attr, value) @@ -1215,6 +1218,7 @@ class ControllerDevice(VmDevice): + __slots__ = ['model', 'address'] def getXML(self): """ @@ -1229,6 +1233,7 @@ class VideoDevice(VmDevice): + __slots__ = ['address'] def getXML(self): """ @@ -1245,6 +1250,7 @@ class SoundDevice(VmDevice): + __slots__ = ['address', 'alias'] def getXML(self): """ @@ -1256,6 +1262,8 @@ class NetworkInterfaceDevice(VmDevice): + __slots__ = ['nicModel', 'macAddr', 'network', 'bootOrder', 'address', + 'linkActive', 'spotMirroring', 'custom'] def __init__(self, conf, log, **kwargs): # pyLint can't tell that the Device.__init__() will @@ -1348,6 +1356,11 @@ class Drive(VmDevice): + __slots__ = ['iface', 'path', 'readonly', 'bootOrder', 'domainID', + 'poolID', 'imageID', 'UUID', 'volumeID', 'format', + 'propagateErrors', 'address', 'apparentsize', + 'index', 'name', 'optional', 'shared', 'truesize', + 'volumeChain', 'baseVolumeID'] VOLWM_CHUNK_MB = config.getint('irs', 'volume_utilization_chunk_mb') VOLWM_FREE_PCT = 100 - config.getint('irs', 'volume_utilization_percent') VOLWM_CHUNK_REPLICATE_MULT = 2 # Chunk multiplier during replication @@ -1646,6 +1659,7 @@ class BalloonDevice(VmDevice): + __slots__ = ['address'] def getXML(self): """ @@ -1662,6 +1676,8 @@ class WatchdogDevice(VmDevice): + __slots__ = ['address'] + def __init__(self, *args, **kwargs): super(WatchdogDevice, self).__init__(*args, **kwargs) @@ -1684,6 +1700,8 @@ class SmartCardDevice(VmDevice): + __slots__ = ['address'] + def getXML(self): """ Add smartcard section to domain xml @@ -1701,6 +1719,8 @@ class RedirDevice(VmDevice): + __slots__ = ['address'] + def getXML(self): """ Create domxml for a redir device. @@ -1713,6 +1733,8 @@ class ConsoleDevice(VmDevice): + __slots__ = [] + def getXML(self): """ Create domxml for a console device. -- To view, visit http://gerrit.ovirt.org/21036 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e8dadabdd02d3b44606f215c4bc7b7e306a591a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com>

6 39

Change in vdsm[master]: cleanup: ifcfg configurator static methods and list handling
by asegurap＠redhat.com 10 Feb '14

10 Feb '14

Antoni Segura Puimedon has uploaded a new change for review. Change subject: cleanup: ifcfg configurator static methods and list handling ...................................................................... cleanup: ifcfg configurator static methods and list handling Change-Id: I83051a07d3b907ba31a01f75e64f01f3f2e7a165 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M vdsm/netconf/ifcfg.py 1 file changed, 26 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/20536/1 diff --git a/vdsm/netconf/ifcfg.py b/vdsm/netconf/ifcfg.py index cf198ef..c0a4144 100644 --- a/vdsm/netconf/ifcfg.py +++ b/vdsm/netconf/ifcfg.py @@ -193,7 +193,8 @@ self._setNewMtu(nic, _netinfo.getVlanDevsForIface(nic.name)) ifup(nic.name) - def _getFilePath(self, fileType, device): + @staticmethod + def _getFilePath(fileType, device): return os.path.join(netinfo.NET_CONF_DIR, '%s-%s' % (fileType, device)) def _removeSourceRouteFile(self, fileType, device): @@ -361,7 +362,8 @@ confFile.write(content) logging.info('Restored %s', confFilePath) - def _devType(self, content): + @staticmethod + def _devType(content): if re.search('^TYPE=Bridge$', content, re.MULTILINE): return "Bridge" elif re.search('^VLAN=yes$', content, re.MULTILINE): @@ -371,7 +373,8 @@ else: return "Other" - def _sortDeviceIfcfgs(self, deviceIfcfgs): + @classmethod + def _sortDeviceIfcfgs(cls, deviceIfcfgs): devdict = {'Bridge': [], 'Vlan': [], 'Slave': [], @@ -380,7 +383,8 @@ if not confFile.startswith(netinfo.NET_CONF_PREF): continue try: - content = file(confFile).read() + with open(confFile) as confFileObj: + content = confFileObj.read() except IOError as e: if e.errno == os.errno.ENOENT: continue @@ -388,15 +392,17 @@ raise dev = confFile[len(netinfo.NET_CONF_PREF):] - devdict[self._devType(content)].append(dev) + devdict[cls._devType(content)].append(dev) return devdict['Other'] + devdict['Vlan'] + devdict['Bridge'] - def _stopDevices(self, deviceIfcfgs): + @staticmethod + def _stopDevices(deviceIfcfgs): for dev in reversed(deviceIfcfgs): ifdown(dev) - def _startDevices(self, deviceIfcfgs): + @staticmethod + def _startDevices(deviceIfcfgs): for dev in deviceIfcfgs: try: ifup(dev) @@ -504,8 +510,8 @@ return ports def writeConfFile(self, fileName, configuration): - '''Backs up the previous contents of the file referenced by fileName - writes the new configuration and sets the specified access mode.''' + """Backs up the previous contents of the file referenced by fileName + writes the new configuration and sets the specified access mode.""" self._backup(fileName) logging.debug('Writing to file %s configuration:\n%s' % (fileName, configuration)) @@ -533,20 +539,20 @@ pipes.quote(onboot)) cfg += conf if ipconfig.ipaddr: - cfg = cfg + 'IPADDR=%s\n' % pipes.quote(ipconfig.ipaddr) - cfg = cfg + 'NETMASK=%s\n' % pipes.quote(ipconfig.netmask) + cfg += 'IPADDR=%s\n' % pipes.quote(ipconfig.ipaddr) + cfg += 'NETMASK=%s\n' % pipes.quote(ipconfig.netmask) if ipconfig.gateway: - cfg = cfg + 'GATEWAY=%s\n' % pipes.quote(ipconfig.gateway) + cfg += 'GATEWAY=%s\n' % pipes.quote(ipconfig.gateway) # According to manual the BOOTPROTO=none should be set # for static IP - cfg = cfg + 'BOOTPROTO=none\n' + cfg += 'BOOTPROTO=none\n' elif ipconfig.bootproto: - cfg = cfg + 'BOOTPROTO=%s\n' % pipes.quote(ipconfig.bootproto) + cfg += 'BOOTPROTO=%s\n' % pipes.quote(ipconfig.bootproto) if mtu: - cfg = cfg + 'MTU=%d\n' % mtu + cfg += 'MTU=%d\n' % mtu if ipconfig.defaultRoute: - cfg = cfg + 'DEFROUTE=%s\n' % ipconfig.defaultRoute + cfg += 'DEFROUTE=%s\n' % ipconfig.defaultRoute cfg += 'NM_CONTROLLED=no\n' if ipconfig.ipv6addr or ipconfig.ipv6autoconf or ipconfig.dhcpv6: cfg += 'IPV6INIT=yes\n' @@ -675,7 +681,8 @@ self._backup(netinfo.NET_CONF_PREF + bridge) self._removeFile(netinfo.NET_CONF_PREF + bridge) - def _getConfigValue(self, conffile, entry): + @staticmethod + def _getConfigValue(conffile, entry): """ Get value from network configuration file @@ -729,13 +736,13 @@ def ifdown(iface): - "Bring down an interface" + """Bring down an interface""" rc, out, err = utils.execCmd([constants.EXT_IFDOWN, iface], raw=True) return rc def ifup(iface, async=False): - "Bring up an interface" + """Bring up an interface""" def _ifup(netIf): rc, out, err = utils.execCmd([constants.EXT_IFUP, netIf], raw=False) -- To view, visit http://gerrit.ovirt.org/20536 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83051a07d3b907ba31a01f75e64f01f3f2e7a165 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

4 5

Change in vdsm[master]: vdsm: Adding guest agent API versioning support
by Vinzenz Feenstra 08 Feb '14

08 Feb '14

Vinzenz Feenstra has uploaded a new change for review. Change subject: vdsm: Adding guest agent API versioning support ...................................................................... vdsm: Adding guest agent API versioning support With the increasing complexity on different version of the guest agent and vdsm we're now introducing API versioning, so only supported messages are exchanged between guest agent and vdsm. Change-Id: I9095b528c2c910f12d5f170088a458bf11c71910 Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M vdsm/guestIF.py 1 file changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/17004/1 diff --git a/vdsm/guestIF.py b/vdsm/guestIF.py index dae4c3b..02e44d9 100644 --- a/vdsm/guestIF.py +++ b/vdsm/guestIF.py @@ -26,6 +26,8 @@ import supervdsm import unicodedata +_MAX_SUPPORTED_API_VERSION = 0 + __REPLACEMENT_CHAR = u'\ufffd' __RESTRICTED_CHARS = set(range(8 + 1)). \ union(set(range(0xB, 0xC + 1))). \ @@ -97,6 +99,7 @@ def __init__(self, socketName, channelListener, log, user='Unknown', ips='', connect=True): + self.apiVersion = 0 self.log = log self._socketName = socketName self._stopped = True @@ -126,6 +129,26 @@ self._onChannelTimeout, self) + def _setAPIVersion(self, version): + try: + version = int(version) + except ValueError: + self.log.error("Received invalid version value: %s", version) + + if version > _MAX_SUPPORTED_API_VERSION: + # This actually is not supposed to happen, as the guest agent + # is not supposed to send a higher version than requested. + # We'll just for our highest version. + version = _MAX_SUPPORTED_API_VERSION + + if version < 0: + version = 0 + + if self.apiVersion != version: + self.log.info("Guest API version changed from %d to %d", + self.apiVersion, version) + self.apiVersion = version + def _prepare_socket(self): supervdsm.getProxy().prepareVmChannel(self._socketName) @@ -148,7 +171,8 @@ self.log.debug("Connected to %s", self._socketName) self._messageState = MessageState.NORMAL self._clearReadBuffer() - self._forward('refresh') + self._forward('refresh', + args={'apiVersion': _MAX_SUPPORTED_API_VERSION}) self._stopped = False ret = True else: @@ -183,6 +207,8 @@ self.guestInfo['guestName'] = args['name'] elif message == 'os-version': self.guestInfo['guestOs'] = args['version'] + elif message == 'api-version': + self._setAPIVersion(args['apiVersion']) elif message == 'network-interfaces': interfaces = [] old_ips = '' -- To view, visit http://gerrit.ovirt.org/17004 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9095b528c2c910f12d5f170088a458bf11c71910 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

9 55

Change in vdsm[master]: get max_tasks and thread_pool_size from config by getint()
by shaohef＠linux.vnet.ibm.com 08 Feb '14

08 Feb '14

ShaoHe Feng has uploaded a new change for review. Change subject: get max_tasks and thread_pool_size from config by getint() ...................................................................... get max_tasks and thread_pool_size from config by getint() It is OK to get max_tasks and thread_pool_size by getfloat() The max_tasks will be passed to the Queue as maxsize and the thread_pool_size is the thread number of the task thread pool. So int is more reasonable than float Change-Id: I9fc719b1b4238b0df2d9c882777cb75d7a27d4df Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- M vdsm/storage/storage_mailbox.py M vdsm/storage/taskManager.py 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/9035/1 diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py index c537883..1c8700d 100644 --- a/vdsm/storage/storage_mailbox.py +++ b/vdsm/storage/storage_mailbox.py @@ -208,9 +208,9 @@ def __init__(self, inbox, outbox, hostID, queue, monitorInterval): # Save arguments - tpSize = config.getfloat('irs', 'thread_pool_size') / 2 + tpSize = config.getint('irs', 'thread_pool_size') / 2 waitTimeout = 3 - maxTasks = config.getfloat('irs', 'max_tasks') + maxTasks = config.getint('irs', 'max_tasks') self.tp = ThreadPool(tpSize, waitTimeout, maxTasks) self._stop = False self._flush = False @@ -466,9 +466,9 @@ self._stopped = False self._poolID = str(pool.spUUID) self._spmStorageDir = pool.storage_repository - tpSize = config.getfloat('irs', 'thread_pool_size') / 2 + tpSize = config.getint('irs', 'thread_pool_size') / 2 waitTimeout = 3 - maxTasks = config.getfloat('irs', 'max_tasks') + maxTasks = config.getint('irs', 'max_tasks') self.tp = ThreadPool(tpSize, waitTimeout, maxTasks) # *** IMPORTANT NOTE: The SPM's inbox is the HSMs' outbox and vice versa *** # self._inbox = os.path.join(self._spmStorageDir, self._poolID, "mastersd", sd.DOMAIN_META_DATA, "inbox") diff --git a/vdsm/storage/taskManager.py b/vdsm/storage/taskManager.py index 3bc12f3..f7a5da2 100644 --- a/vdsm/storage/taskManager.py +++ b/vdsm/storage/taskManager.py @@ -31,9 +31,9 @@ log = logging.getLogger('TaskManager') def __init__(self, - tpSize=config.getfloat('irs', 'thread_pool_size'), + tpSize=config.getint('irs', 'thread_pool_size'), waitTimeout=3, - maxTasks=config.getfloat('irs', 'max_tasks')): + maxTasks=config.getint('irs', 'max_tasks')): self.storage_repository = config.get('irs', 'repository') self.tp = ThreadPool(tpSize, waitTimeout, maxTasks) self._tasks = {} -- To view, visit http://gerrit.ovirt.org/9035 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9fc719b1b4238b0df2d9c882777cb75d7a27d4df Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>

8 16

Change in vdsm[ovirt-3.3]: domainMonitor: tag pool monitored domains
by Federico Simoncelli 06 Feb '14

06 Feb '14

Hello Ayal Baron, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/21357 to review the following change. Change subject: domainMonitor: tag pool monitored domains ...................................................................... domainMonitor: tag pool monitored domains As part of the monitoring implementation: 7b1cc6a Adding [start|stop]MonitoringDomain() updateMonitoringThreads has been modified to assume that the list of the monitored domains is the same as the list of the attached domains: + poolDoms = self.getDomains() ... - for sdUUID in monitoredDomains: + for sdUUID in poolDoms: if sdUUID not in activeDomains: try: self.domainMonitor.stopMonitoring(sdUUID) This assumption is not valid when we are detaching a storage domain (as it won't be listed by getDomains anymore). The resulting issue is that the monitor domain thread is not stopped and the host id is left acquired (ids file/device kept open by sanlock). This patch reverts the updateMonitoringThreads changes and adds a tag mechanism for the pool monitored domains. Label: DOWNSTREAM ONLY Change-Id: I71714b24b7c8bbb437cbb2e8e254690215df020a Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> Reviewed-on: http://gerrit.ovirt.org/21165 Reviewed-by: Ayal Baron <abaron(a)redhat.com> Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/storage/domainMonitor.py M vdsm/storage/hsm.py M vdsm/storage/sp.py 3 files changed, 17 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/57/21357/1 diff --git a/vdsm/storage/domainMonitor.py b/vdsm/storage/domainMonitor.py index a998f80..4f4b823 100644 --- a/vdsm/storage/domainMonitor.py +++ b/vdsm/storage/domainMonitor.py @@ -84,12 +84,20 @@ def monitoredDomains(self): return self._domains.keys() - def startMonitoring(self, sdUUID, hostId): - if sdUUID in self._domains: + @property + def poolMonitoredDomains(self): + return [k for k, v in self._domains.iteritems() if v.poolDomain] + + def startMonitoring(self, sdUUID, hostId, poolDomain=True): + domainThread = self._domains.get(sdUUID) + + if domainThread is not None: + domainThread.poolDomain |= poolDomain return domainThread = DomainMonitorThread(weakref.proxy(self), sdUUID, hostId, self._interval) + domainThread.poolDomain = poolDomain domainThread.start() # The domain should be added only after it succesfully started self._domains[sdUUID] = domainThread diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index bb89d94..7481064 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -3699,7 +3699,7 @@ def startMonitoringDomain(self, sdUUID, hostID, options=None): with rmanager.acquireResource(STORAGE, HSM_DOM_MON_LOCK, rm.LockType.exclusive): - self.domainMonitor.startMonitoring(sdUUID, int(hostID)) + self.domainMonitor.startMonitoring(sdUUID, int(hostID), False) @deprecated @public diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index cae84b3..cf12d35 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -142,7 +142,7 @@ return self.spmRole, self.getSpmLver(), self.getSpmId() def __del__(self): - if len(self.domainMonitor.monitoredDomains) > 0: + if len(self.domainMonitor.poolMonitoredDomains) > 0: threading.Thread(target=self.stopMonitoringDomains).start() @unsecured @@ -1541,15 +1541,13 @@ @unsecured @misc.samplingmethod def updateMonitoringThreads(self): - # getDomains() returns a dict of {sdUUID:status} - # {sdUUID1: status1, sdUUID2: status2, ...} + # domain list it's list of sdUUID:status + # sdUUID1:status1,sdUUID2:status2,... self.invalidateMetadata() - poolDoms = self.getDomains() - activeDomains = tuple(sdUUID for sdUUID in poolDoms - if poolDoms[sdUUID] == sd.DOM_ACTIVE_STATUS) - monitoredDomains = self.domainMonitor.monitoredDomains + activeDomains = self.getDomains(activeOnly=True) + monitoredDomains = self.domainMonitor.poolMonitoredDomains - for sdUUID in poolDoms: + for sdUUID in monitoredDomains: if sdUUID not in activeDomains: try: self.domainMonitor.stopMonitoring(sdUUID) -- To view, visit http://gerrit.ovirt.org/21357 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I71714b24b7c8bbb437cbb2e8e254690215df020a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>

4 4

Change in vdsm[ovirt-3.3]: hsm: fix isoprefix KeyError for inactive domains
by Federico Simoncelli 06 Feb '14

06 Feb '14

Hello Dan Kenigsberg, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/20300 to review the following change. Change subject: hsm: fix isoprefix KeyError for inactive domains ...................................................................... hsm: fix isoprefix KeyError for inactive domains In a recent change f9cf58b (Make getRepoStats() a hsm method) a new regression was introduced that causes a KeyError on isoprefix for inactive domains. In this patch: * fix the isoprefix KeyError for inactive domains * fix indentation for a related block of code Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1020543 Change-Id: Ice78a4d652d495aff8672524fcd80b7306013928 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> Reviewed-on: http://gerrit.ovirt.org/20250 Reviewed-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/storage/hsm.py 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/20300/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index a432fe9..b38b0b0 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -2555,8 +2555,8 @@ domInfo = self._getDomsStats(pool.domainMonitor, doms) for sdUUID in doms.iterkeys(): if domInfo[sdUUID]['isoprefix']: - poolInfo['isoprefix'] = domInfo[sdUUID]['isoprefix'] - break + poolInfo['isoprefix'] = domInfo[sdUUID]['isoprefix'] + break else: poolInfo['isoprefix'] = '' # No ISO domain found @@ -3583,7 +3583,8 @@ for sdUUID, sdStatus in doms.iteritems(): # Return statistics for active domains only - domInfo[sdUUID] = {'status': sdStatus, 'alerts': []} + domInfo[sdUUID] = {'status': sdStatus, 'alerts': [], + 'isoprefix': ''} if sdStatus != sd.DOM_ACTIVE_STATUS or sdUUID not in repoStats: continue @@ -3615,9 +3616,8 @@ repoStats[sdUUID]['mdasize'], repoStats[sdUUID]['mdafree']) - isoprefix = repoStats[sdUUID]['isoprefix'] - domInfo[sdUUID]['isoprefix'] = \ - isoprefix if isoprefix is not None else '' + if repoStats[sdUUID]['isoprefix'] is not None: + domInfo[sdUUID]['isoprefix'] = repoStats[sdUUID]['isoprefix'] return domInfo -- To view, visit http://gerrit.ovirt.org/20300 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice78a4d652d495aff8672524fcd80b7306013928 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>

2 2

Change in vdsm[ovirt-3.3]: Adding [start|stop]MonitoringDomain().
by Federico Simoncelli 06 Feb '14

06 Feb '14

Hello Sandro Bonazzola, Dan Kenigsberg, Eduardo, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/20194 to review the following change. Change subject: Adding [start|stop]MonitoringDomain(). ...................................................................... Adding [start|stop]MonitoringDomain(). startMonitoringDomain() is added for monitoring a storage domain without being connected to the pool and geting and ID for such SD lockspace. stopMonitoringDomain() stops the monitoring and releases the ID. Monitoring results are gathered with repoStats(). Caveat Emptor: SDs added to the monitor using startMonitoringDomain() should not be part of the pool! i.e. the pool domain set and the added SDs set should be disjoint. Making repoStats pool independent. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1019273 Change-Id: I983d49b0a42cc06428ec75b7795d23abaa6ab84c Signed-off-by: Eduardo Warszawski <ewarszaw(a)redhat.com> Reviewed-on: http://gerrit.ovirt.org/19762 Tested-by: Sandro Bonazzola <sbonazzo(a)redhat.com> Reviewed-by: Dan Kenigsberg <danken(a)redhat.com> --- M client/vdsClient.py M vdsm/API.py M vdsm/BindingXMLRPC.py M vdsm/storage/hsm.py M vdsm/storage/sp.py M vdsm_api/Bridge.py M vdsm_api/vdsmapi-schema.json 7 files changed, 123 insertions(+), 32 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/20194/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 1087f32..e727b49 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -1692,6 +1692,16 @@ print 'Domain %s %s' % (d, str(stats[d])) return 0, '' + def startMonitoringDomain(self, args): + sdUUID, hostID = args + status = self.s.startMonitoringDomain(sdUUID, hostID) + return status['status']['code'], status['status']['message'] + + def stopMonitoringDomain(self, args): + sdUUID, = args + status = self.s.stopMonitoringDomain(sdUUID) + return status['status']['code'], status['status']['message'] + def snapshot(self, args): vmUUID, sdUUID, imgUUID, baseVolUUID, volUUID = args @@ -2466,8 +2476,16 @@ )), 'repoStats': (serv.repoStats, ('', - 'Get the the health status of the active domains' + 'Get the health status of the monitored domains' )), + 'startMonitoringDomain': (serv.startMonitoringDomain, + ('<sdUUID> <hostID>', + 'Start SD: sdUUID monitoring with hostID' + )), + 'stopMonitoringDomain': (serv.stopMonitoringDomain, + ('<sdUUID>', + 'Stop monitoring SD: sdUUID' + )), 'snapshot': (serv.snapshot, ('<vmId> <sdUUID> <imgUUID> <baseVolUUID> <volUUID>', 'Take a live snapshot' diff --git a/vdsm/API.py b/vdsm/API.py index 37bb908..fa9a3ab 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1396,6 +1396,12 @@ def getStorageRepoStats(self): return self._irs.repoStats() + def startMonitoringDomain(self, sdUUID, hostID): + return self._irs.startMonitoringDomain(sdUUID, hostID) + + def stopMonitoringDomain(self, sdUUID): + return self._irs.stopMonitoringDomain(sdUUID) + def getLVMVolumeGroups(self, storageType=None): return self._irs.getVGList(storageType) diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py index 20aaee1..48ced76 100644 --- a/vdsm/BindingXMLRPC.py +++ b/vdsm/BindingXMLRPC.py @@ -787,6 +787,14 @@ api = API.Global() return api.getStorageRepoStats() + def startMonitoringDomain(self, sdUUID, hostID, options=None): + api = API.Global() + return api.startMonitoringDomain(sdUUID, hostID) + + def stopMonitoringDomain(self, sdUUID, options=None): + api = API.Global() + return api.stopMonitoringDomain(sdUUID) + def vgsGetList(self, storageType=None, options=None): api = API.Global() return api.getLVMVolumeGroups(storageType) @@ -937,6 +945,8 @@ (self.domainsGetList, 'getStorageDomainsList'), (self.poolsGetConnectedList, 'getConnectedStoragePoolsList'), (self.storageRepoGetStats, 'repoStats'), + (self.startMonitoringDomain, 'startMonitoringDomain'), + (self.stopMonitoringDomain, 'stopMonitoringDomain'), (self.vgsGetList, 'getVGList'), (self.devicesGetList, 'getDeviceList'), (self.devicesGetVisibility, 'getDevicesVisibility'), diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index d73d0f7..0744ae8 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -40,6 +40,7 @@ from vdsm.config import config import sp +import domainMonitor import sd import blockSD import nfsSD @@ -93,6 +94,8 @@ STORAGE_CONNECTION_DIR = os.path.join(constants.P_VDSM_LIB, "connections/") QEMU_READABLE_TIMEOUT = 30 + +HSM_DOM_MON_LOCK = "HsmDomainMonitorLock" def public(f=None, **kwargs): @@ -398,6 +401,9 @@ name="storageRefresh") storageRefreshThread.daemon = True storageRefreshThread.start() + + monitorInterval = config.getint('irs', 'sd_health_check_delay') + self.domainMonitor = domainMonitor.DomainMonitor(monitorInterval) @public def registerDomainStateChangeCallback(self, callbackFunc): @@ -971,9 +977,8 @@ for dom in sorted(domList): vars.task.getExclusiveLock(STORAGE, dom) - return sp.StoragePool( - spUUID, self.taskMng).create(poolName, masterDom, domList, - masterVersion, leaseParams) + return sp.StoragePool(spUUID, self.domainMonitor, self.taskMng).create( + poolName, masterDom, domList, masterVersion, leaseParams) @public def connectStoragePool(self, spUUID, hostID, scsiKey, @@ -1003,8 +1008,10 @@ "spUUID=%s, msdUUID=%s, masterVersion=%s, hostID=%s, " "scsiKey=%s" % (spUUID, msdUUID, masterVersion, hostID, scsiKey))) - return self._connectStoragePool(spUUID, hostID, scsiKey, msdUUID, - masterVersion, options) + with rmanager.acquireResource(STORAGE, HSM_DOM_MON_LOCK, + rm.LockType.exclusive): + return self._connectStoragePool(spUUID, hostID, scsiKey, msdUUID, + masterVersion, options) def _connectStoragePool(self, spUUID, hostID, scsiKey, msdUUID, masterVersion, options=None): @@ -1048,7 +1055,7 @@ masterVersion=masterVersion) return - pool = sp.StoragePool(spUUID, self.taskMng) + pool = sp.StoragePool(spUUID, self.domainMonitor, self.taskMng) if not hostID or not scsiKey or not msdUUID or not masterVersion: hostID, scsiKey, msdUUID, masterVersion = pool.getPoolParams() res = pool.connect(hostID, scsiKey, msdUUID, masterVersion) @@ -1103,8 +1110,10 @@ def _disconnectPool(self, pool, hostID, scsiKey, remove): self.validateNotSPM(pool.spUUID) - res = pool.disconnect() - del self.pools[pool.spUUID] + with rmanager.acquireResource(STORAGE, HSM_DOM_MON_LOCK, + rm.LockType.exclusive): + res = pool.disconnect() + del self.pools[pool.spUUID] return res @public @@ -1854,7 +1863,7 @@ try: pool = self.getPool(spUUID) except se.StoragePoolUnknown: - pool = sp.StoragePool(spUUID, self.taskMng) + pool = sp.StoragePool(spUUID, self.domainMonitor, self.taskMng) else: raise se.StoragePoolConnected(spUUID) @@ -3482,14 +3491,12 @@ if self.pools[spUUID].hsmMailer: self.pools[spUUID].hsmMailer.stop() - # Stop repoStat threads - for pool in self.pools.values(): - try: - pool.stopMonitoringDomains() - except Exception: - self.log.warning("Failed to stop RepoStats thread", - exc_info=True) - continue + # Stop repoStat threads + try: + self.domainMonitor.close() + except Exception: + self.log.warning("Failed to stop RepoStats thread", + exc_info=True) self.taskMng.prepareForShutdown() except: @@ -3662,10 +3669,23 @@ """ result = {} - for p in self.pools.values(): - repo_stats = self._getRepoStats(p.domainMonitor) + repo_stats = self._getRepoStats(self.domainMonitor) - for d in repo_stats: - result[d] = repo_stats[d]['result'] + for d in repo_stats: + result[d] = repo_stats[d]['result'] return result + + @deprecated + @public + def startMonitoringDomain(self, sdUUID, hostID, options=None): + with rmanager.acquireResource(STORAGE, HSM_DOM_MON_LOCK, + rm.LockType.exclusive): + self.domainMonitor.startMonitoring(sdUUID, int(hostID)) + + @deprecated + @public + def stopMonitoringDomain(self, sdUUID, options=None): + with rmanager.acquireResource(STORAGE, HSM_DOM_MON_LOCK, + rm.LockType.exclusive): + self.domainMonitor.stopMonitoring(sdUUID) diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index e0559bd..cae84b3 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -51,7 +51,6 @@ import resourceManager as rm import volume import mount -from domainMonitor import DomainMonitor POOL_MASTER_DOMAIN = 'mastersd' @@ -112,9 +111,8 @@ storage_repository = config.get('irs', 'repository') _poolsTmpDir = config.get('irs', 'pools_data_dir') lvExtendPolicy = config.get('irs', 'vol_extend_policy') - monitorInterval = config.getint('irs', 'sd_health_check_delay') - def __init__(self, spUUID, taskManager): + def __init__(self, spUUID, domainMonitor, taskManager): Securable.__init__(self) self._formatConverter = DefaultFormatConverter() @@ -131,7 +129,7 @@ self.spmMailer = None self.masterDomain = None self.spmRole = SPM_FREE - self.domainMonitor = DomainMonitor(self.monitorInterval) + self.domainMonitor = domainMonitor self._upgradeCallback = partial(StoragePool._upgradePoolDomain, proxy(self)) @@ -702,7 +700,8 @@ @unsecured def stopMonitoringDomains(self): - self.domainMonitor.close() + for sdUUID in self.getDomains(): + self.domainMonitor.stopMonitoring(sdUUID) return True @unsecured @@ -1542,13 +1541,15 @@ @unsecured @misc.samplingmethod def updateMonitoringThreads(self): - # domain list it's list of sdUUID:status - # sdUUID1:status1,sdUUID2:status2,... + # getDomains() returns a dict of {sdUUID:status} + # {sdUUID1: status1, sdUUID2: status2, ...} self.invalidateMetadata() - activeDomains = self.getDomains(activeOnly=True) + poolDoms = self.getDomains() + activeDomains = tuple(sdUUID for sdUUID in poolDoms + if poolDoms[sdUUID] == sd.DOM_ACTIVE_STATUS) monitoredDomains = self.domainMonitor.monitoredDomains - for sdUUID in monitoredDomains: + for sdUUID in poolDoms: if sdUUID not in activeDomains: try: self.domainMonitor.stopMonitoring(sdUUID) diff --git a/vdsm_api/Bridge.py b/vdsm_api/Bridge.py index 76fd908..b9fdaf8 100644 --- a/vdsm_api/Bridge.py +++ b/vdsm_api/Bridge.py @@ -291,6 +291,8 @@ 'Host_getStats': {'ret': 'info'}, 'Host_getStorageDomains': {'ret': 'domlist'}, 'Host_getStorageRepoStats': {'ret': Host_getStorageRepoStats_Ret}, + 'Host_startMonitoringDomain': {}, + 'Host_stopMonitoringDomain': {}, 'Host_getVMList': {'call': Host_getVMList_Call, 'ret': Host_getVMList_Ret}, 'Image_delete': {'ret': 'uuid'}, 'Image_deleteVolumes': {'ret': 'uuid'}, diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 898ab5c..e9f23f0 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -1716,7 +1716,7 @@ ## # @Host.getStorageRepoStats: # -# Get statistics and liveness of currently attached Storage Domains. +# Get statistics and liveness of currently monitored Storage Domains. # # Returns: # Statistics for all storage domains @@ -1727,6 +1727,40 @@ 'returns': 'StorageDomainVitalsMap'} ## +# @Host.startMonitoringDomain: +# +# Start SD monitoring with hostID +# +# @SdUUID: The Storage Domain UUID +# +# @HostID: A host ID number in the Storage Domain Lockspace +# +# Returns: +# None +# +# Since: 4.12.2 +## +{'command': {'class': 'Host', 'name': 'startMonitoringDomain'}, + 'data': {'SdUUID': 'UUID', 'HostID': 'int' } + 'returns': ''} + +## +# @Host.stopMonitoringDomain: +# +# Stop SD monitoring with hostID +# +# @SdUUID: The Storage Domain UUID +# +# Returns: +# None +# +# Since: 4.12.2 +## +{'command': {'class': 'Host', 'name': 'stopMonitoringDomain'}, + 'data': {'SdUUID': 'UUID' } + 'returns': ''} + +## # @VmStatus: # # An enumeration of possible virtual machine statuses. -- To view, visit http://gerrit.ovirt.org/20194 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I983d49b0a42cc06428ec75b7795d23abaa6ab84c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>

4 9

Change in vdsm[ovirt-3.3]: stats: return domain lockspace status
by Federico Simoncelli 06 Feb '14

06 Feb '14

Hello Ayal Baron, Sandro Bonazzola, Sergey Gotliv, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/20193 to review the following change. Change subject: stats: return domain lockspace status ...................................................................... stats: return domain lockspace status Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1019273 Change-Id: I7069781f9945b4e4637b769a22562de30a6d681d Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> Reviewed-on: http://gerrit.ovirt.org/20099 Reviewed-by: Ayal Baron <abaron(a)redhat.com> Reviewed-by: Sergey Gotliv <sgotliv(a)redhat.com> Tested-by: Sandro Bonazzola <sbonazzo(a)redhat.com> --- M vdsm/sampling.py M vdsm/storage/hsm.py M vdsm_api/vdsmapi-schema.json 3 files changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/20193/1 diff --git a/vdsm/sampling.py b/vdsm/sampling.py index dd446c4..0a0ab9c 100644 --- a/vdsm/sampling.py +++ b/vdsm/sampling.py @@ -518,11 +518,14 @@ self._imagesStatus._refreshStorageDomains() now = time.time() for sd, d in self._imagesStatus.storageDomains.iteritems(): - stats['storageDomains'][sd] = {'code': d['code'], - 'delay': d['delay'], - 'lastCheck': d['lastCheck'], - 'valid': d['valid'], - 'version': d['version']} + stats['storageDomains'][sd] = { + 'code': d['code'], + 'delay': d['delay'], + 'lastCheck': d['lastCheck'], + 'valid': d['valid'], + 'version': d['version'], + 'acquired': d['acquired'], + } stats['elapsedTime'] = int(now - self.startTime) if len(self._samples) < 2: return stats diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 01edb44..d73d0f7 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -3629,6 +3629,8 @@ 'delay': str(domStatus.readDelay), 'valid': (domStatus.error is None), 'version': domStatus.version, + # domStatus.hasHostId can also be None + 'acquired': domStatus.hasHostId is True, }, 'disktotal': disktotal, diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 60b4bd5..898ab5c 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -1449,12 +1449,16 @@ # # @version: Indicates the Storage Domain version # +# @acquired: Indicates if the lockspace on the Storage Domain has been +# acquired and therefore if it's possible to run (sanlock) +# protected VMs +# # Since: 4.10.0 # XXX: Add an enum for return codes and their meanings ## {'type': 'StorageDomainVitals', 'data': {'code': 'int', 'delay': 'float', 'lastCheck': 'float', - 'valid': 'bool', 'version': 'int'}} + 'valid': 'bool', 'version': 'int', 'acquired': 'bool'}} ## # @PathStats: -- To view, visit http://gerrit.ovirt.org/20193 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7069781f9945b4e4637b769a22562de30a6d681d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com>

3 4

Change in vdsm[ovirt-3.3]: Make getRepoStats() a hsm method.
by Federico Simoncelli 06 Feb '14

06 Feb '14

Hello Dan Kenigsberg, Eduardo, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/20192 to review the following change. Change subject: Make getRepoStats() a hsm method. ...................................................................... Make getRepoStats() a hsm method. Making repoStats pool independent. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1019273 Change-Id: I0273611a23f29b5c6be0354a4c6b2d6526a9b574 Signed-off-by: Eduardo <ewarszaw(a)redhat.com> Reviewed-on: http://gerrit.ovirt.org/14673 Reviewed-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/storage/hsm.py M vdsm/storage/sp.py 2 files changed, 108 insertions(+), 98 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/20192/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index ace6634..01edb44 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -2540,7 +2540,18 @@ vars.task.setDefaultException( se.StoragePoolActionError("spUUID=%s" % spUUID)) vars.task.getSharedLock(STORAGE, spUUID) - return self.getPool(spUUID).getInfo() + pool = self.getPool(spUUID) + poolInfo = pool.getInfo() + doms = pool.getDomains() + domInfo = self._getDomsStats(pool.domainMonitor, doms) + for sdUUID in doms.iterkeys(): + if domInfo[sdUUID]['isoprefix']: + poolInfo['isoprefix'] = domInfo[sdUUID]['isoprefix'] + break + else: + poolInfo['isoprefix'] = '' # No ISO domain found + + return dict(info=poolInfo, dominfo=domInfo) @public def createStorageDomain(self, storageType, sdUUID, domainName, @@ -3547,6 +3558,97 @@ pool._upgradePool(targetDomVersion) return {"upgradeStatus": "started"} + def _getDomsStats(self, domainMonitor, doms): + domInfo = {} + repoStats = self._getRepoStats(domainMonitor) + + for sdUUID, sdStatus in doms.iteritems(): + # Return statistics for active domains only + domInfo[sdUUID] = {'status': sdStatus, 'alerts': []} + + if sdStatus != sd.DOM_ACTIVE_STATUS or sdUUID not in repoStats: + continue + + domInfo[sdUUID]['version'] = repoStats[sdUUID]['result']['version'] + + # For unreachable domains repoStats will return disktotal and + # diskfree as None. + if (repoStats[sdUUID]['disktotal'] is not None + and repoStats[sdUUID]['diskfree'] is not None): + domInfo[sdUUID]['disktotal'] = repoStats[sdUUID]['disktotal'] + domInfo[sdUUID]['diskfree'] = repoStats[sdUUID]['diskfree'] + + if not repoStats[sdUUID]['mdavalid']: + domInfo[sdUUID]['alerts'].append({ + 'code': se.SmallVgMetadata.code, + 'message': se.SmallVgMetadata.message, + }) + self.log.warning("VG %s's metadata size too small %s", + sdUUID, repoStats[sdUUID]['mdasize']) + + if not repoStats[sdUUID]['mdathreshold']: + domInfo[sdUUID]['alerts'].append({ + 'code': se.VgMetadataCriticallyFull.code, + 'message': se.VgMetadataCriticallyFull.message, + }) + self.log.warning("VG %s's metadata size exceeded critical " + "size: mdasize=%s mdafree=%s", sdUUID, + repoStats[sdUUID]['mdasize'], + repoStats[sdUUID]['mdafree']) + + isoprefix = repoStats[sdUUID]['isoprefix'] + domInfo[sdUUID]['isoprefix'] = \ + isoprefix if isoprefix is not None else '' + + return domInfo + + def _getRepoStats(self, domainMonitor): + repoStats = {} + statsGenTime = time.time() + + for sdUUID in domainMonitor.monitoredDomains: + domStatus = domainMonitor.getStatus(sdUUID) + + if domStatus.error is None: + code = 0 + elif isinstance(domStatus.error, se.StorageException): + code = domStatus.error.code + else: + code = se.StorageException.code + + disktotal, diskfree = domStatus.diskUtilization + vgmdtotal, vgmdfree = domStatus.vgMdUtilization + lastcheck = '%.1f' % (statsGenTime - domStatus.lastCheck) + + repoStats[sdUUID] = { + 'finish': domStatus.lastCheck, + + 'result': { + 'code': code, + 'lastCheck': lastcheck, + 'delay': str(domStatus.readDelay), + 'valid': (domStatus.error is None), + 'version': domStatus.version, + }, + + 'disktotal': disktotal, + 'diskfree': diskfree, + + 'mdavalid': domStatus.vgMdHasEnoughFreeSpace, + 'mdathreshold': domStatus.vgMdFreeBelowThreashold, + 'mdasize': vgmdtotal, + 'mdafree': vgmdfree, + + 'masterValidate': { + 'mount': domStatus.masterMounted, + 'valid': domStatus.masterValid + }, + + 'isoprefix': domStatus.isoPrefix, + } + + return repoStats + @public def repoStats(self, options=None): """ @@ -3559,7 +3661,7 @@ result = {} for p in self.pools.values(): - repo_stats = p.getRepoStats() + repo_stats = self._getRepoStats(p.domainMonitor) for d in repo_stats: result[d] = repo_stats[d]['result'] diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 7dab69d..e0559bd 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -19,7 +19,6 @@ # import os -import time from glob import iglob, glob import logging import threading @@ -1434,66 +1433,16 @@ return self.getMetaParam(PMDK_SPM_ID) @unsecured - def getRepoStats(self): - #FIXME : this should actually be built in HSM - repoStats = {} - statsGenTime = time.time() - - for sdUUID in self.domainMonitor.monitoredDomains: - domStatus = self.domainMonitor.getStatus(sdUUID) - - if domStatus.error is None: - code = 0 - elif isinstance(domStatus.error, se.StorageException): - code = domStatus.error.code - else: - code = se.StorageException.code - - disktotal, diskfree = domStatus.diskUtilization - vgmdtotal, vgmdfree = domStatus.vgMdUtilization - lastcheck = '%.1f' % (statsGenTime - domStatus.lastCheck) - - repoStats[sdUUID] = { - 'finish': domStatus.lastCheck, - - 'result': { - 'code': code, - 'lastCheck': lastcheck, - 'delay': str(domStatus.readDelay), - 'valid': (domStatus.error is None), - 'version': domStatus.version, - }, - - 'disktotal': disktotal, - 'diskfree': diskfree, - - 'mdavalid': domStatus.vgMdHasEnoughFreeSpace, - 'mdathreshold': domStatus.vgMdFreeBelowThreashold, - 'mdasize': vgmdtotal, - 'mdafree': vgmdfree, - - 'masterValidate': { - 'mount': domStatus.masterMounted, - 'valid': domStatus.masterValid - }, - - 'isoprefix': domStatus.isoPrefix, - } - - return repoStats - - @unsecured def getInfo(self): """ Get storage pool info. """ - msdUUID = self.masterDomain.sdUUID - try: msdInfo = self.masterDomain.getInfo() except Exception: self.log.error("Couldn't read from master domain", exc_info=True) - raise se.StoragePoolMasterNotFound(self.spUUID, msdUUID) + raise se.StoragePoolMasterNotFound(self.spUUID, + self.masterDomain.sdUUID) try: pmd = self._getPoolMD(self.masterDomain) @@ -1512,50 +1461,9 @@ 'pool_status': 'uninitialized', 'version': str(msdInfo['version']), 'isoprefix': '', + 'pool_status': 'connected', } - - domInfo = {} - repoStats = self.getRepoStats() - - for sdUUID, sdStatus in pmd[PMDK_DOMAINS].iteritems(): - # Return statistics for active domains only - domInfo[sdUUID] = {'status': sdStatus, 'alerts': []} - - if sdStatus != sd.DOM_ACTIVE_STATUS or sdUUID not in repoStats: - continue - - if repoStats[sdUUID]['isoprefix']: - poolInfo['isoprefix'] = repoStats[sdUUID]['isoprefix'] - - domInfo[sdUUID]['version'] = repoStats[sdUUID]['result']['version'] - - # For unreachable domains repoStats will return disktotal and - # diskfree as None. - if (repoStats[sdUUID]['disktotal'] is not None - and repoStats[sdUUID]['diskfree'] is not None): - domInfo[sdUUID]['disktotal'] = repoStats[sdUUID]['disktotal'] - domInfo[sdUUID]['diskfree'] = repoStats[sdUUID]['diskfree'] - - if not repoStats[sdUUID]['mdavalid']: - domInfo[sdUUID]['alerts'].append({ - 'code': se.SmallVgMetadata.code, - 'message': se.SmallVgMetadata.message, - }) - self.log.warning("VG %s's metadata size too small %s", - sdUUID, repoStats[sdUUID]['mdasize']) - - if not repoStats[sdUUID]['mdathreshold']: - domInfo[sdUUID]['alerts'].append({ - 'code': se.VgMetadataCriticallyFull.code, - 'message': se.VgMetadataCriticallyFull.message, - }) - self.log.warning("VG %s's metadata size exceeded critical " - "size: mdasize=%s mdafree=%s", sdUUID, - repoStats[sdUUID]['mdasize'], - repoStats[sdUUID]['mdafree']) - - poolInfo["pool_status"] = "connected" - return dict(info=poolInfo, dominfo=domInfo) + return poolInfo @unsecured def getIsoDomain(self): -- To view, visit http://gerrit.ovirt.org/20192 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0273611a23f29b5c6be0354a4c6b2d6526a9b574 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>

1 1

Change in vdsm[ovirt-3.3]: Read pool metadata once in StoragePool.getInfo()
by Federico Simoncelli 06 Feb '14

06 Feb '14

Hello Dan Kenigsberg, Eduardo, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/20191 to review the following change. Change subject: Read pool metadata once in StoragePool.getInfo() ...................................................................... Read pool metadata once in StoragePool.getInfo() The behavioural change of spm_id should be safe since StoragePool.getInfo() call in hsm.getStoragePoolInfo() is under the (shared) pool lock making startSpm block in this host when the info is retrieved. Making repoStats pool independent. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1019273 Change-Id: I41a79662a4bd01fc310aa5554c38a16f3f8ba546 Signed-off-by: Eduardo <ewarszaw(a)redhat.com> Reviewed-on: http://gerrit.ovirt.org/14672 Reviewed-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 15 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/91/20191/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 8bab500..7dab69d 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1496,26 +1496,28 @@ raise se.StoragePoolMasterNotFound(self.spUUID, msdUUID) try: - poolInfo = { - 'type': msdInfo['type'], - 'name': self.getDescription(), - 'domains': domainListEncoder(self.getDomains()), - 'master_uuid': msdUUID, - 'master_ver': self.getMasterVersion(), - 'lver': self.getMetaParam(PMDK_LVER), - 'spm_id': self.getSpmId(), - 'pool_status': 'uninitialized', - 'version': str(self.getVersion()), - 'isoprefix': '', - } + pmd = self._getPoolMD(self.masterDomain) except Exception: self.log.error("Pool metadata error", exc_info=True) raise se.StoragePoolActionError(self.spUUID) + poolInfo = { + 'type': msdInfo['type'], + 'name': pmd[PMDK_POOL_DESCRIPTION], + 'domains': domainListEncoder(pmd[PMDK_DOMAINS]), + 'master_uuid': self.masterDomain.sdUUID, + 'master_ver': pmd[PMDK_MASTER_VER], + 'lver': pmd[PMDK_LVER], + 'spm_id': pmd[PMDK_SPM_ID], + 'pool_status': 'uninitialized', + 'version': str(msdInfo['version']), + 'isoprefix': '', + } + domInfo = {} repoStats = self.getRepoStats() - for sdUUID, sdStatus in self.getDomains().iteritems(): + for sdUUID, sdStatus in pmd[PMDK_DOMAINS].iteritems(): # Return statistics for active domains only domInfo[sdUUID] = {'status': sdStatus, 'alerts': []} -- To view, visit http://gerrit.ovirt.org/20191 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I41a79662a4bd01fc310aa5554c38a16f3f8ba546 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>

1 1

← Newer
1
...
17
18
19
20
21
22
23
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches December 2013