November 2012 - vdsm-patches - Fedora mailing-lists

Change in vdsm[master]: Remove rhev/rhevm from vdsm_reg
by Ryan Harper 02 Jan '13

02 Jan '13

Ryan Harper has uploaded a new change for review. Change subject: Remove rhev/rhevm from vdsm_reg ...................................................................... Remove rhev/rhevm from vdsm_reg Change-Id: I5366b674c88a75243ef701e94f4adbcb1d2e48b5 Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com> --- M vdsm_reg/deployUtil.py.in M vdsm_reg/engine.py M vdsm_reg/vdsm-complete M vdsm_reg/vdsm-config M vdsm_reg/vdsm-gen-cert M vdsm_reg/vdsm-reg-cmdline M vdsm_reg/vdsm-reg-setup.in M vdsm_reg/vdsm-reg.8 M vdsm_reg/vdsm-reg.conf.in M vdsm_reg/vdsm-upgrade 10 files changed, 90 insertions(+), 90 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/3292/1 -- To view, visit http://gerrit.ovirt.org/3292 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5366b674c88a75243ef701e94f4adbcb1d2e48b5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>

2 3

Change in vdsm[master]: Move libvirt username into config
by Ryan Harper 02 Jan '13

02 Jan '13

Ryan Harper has uploaded a new change for review. Change subject: Move libvirt username into config ...................................................................... Move libvirt username into config Removed hardcoded username string from specfile and source Created a new 'auth' config section in config.py.in - define a new variable 'libvirt_user' Update configure.ac to contain a default value without 'rhev' in the name Update libvirtconnection.py to use the configuration variable Change-Id: Ibacef5ab3c1a6320086bf6d5c694ec060a6b7bbe Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com> --- M configure.ac M vdsm.spec.in M vdsm/config.py.in M vdsm/libvirtconnection.py 4 files changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/91/3291/1 -- To view, visit http://gerrit.ovirt.org/3291 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibacef5ab3c1a6320086bf6d5c694ec060a6b7bbe Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>

2 2

Change in vdsm[master]: More RHEV -> oVirt conversion
by Ryan Harper 02 Jan '13

02 Jan '13

Ryan Harper has uploaded a new change for review. Change subject: More RHEV -> oVirt conversion ...................................................................... More RHEV -> oVirt conversion Change-Id: I5f54b4daca62f560023e8535dc578e4c62edc4a1 Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com> --- M vdsm/vdsmd.init.in 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/3290/1 -- To view, visit http://gerrit.ovirt.org/3290 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f54b4daca62f560023e8535dc578e4c62edc4a1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>

5 10

Change in vdsm[master]: Change RHEV to oVirt in guestIF.py
by Ryan Harper 02 Jan '13

02 Jan '13

Ryan Harper has uploaded a new change for review. Change subject: Change RHEV to oVirt in guestIF.py ...................................................................... Change RHEV to oVirt in guestIF.py Change-Id: I238e8451ea4a402713b6216e1231f670132742a0 Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com> --- M vdsm/guestIF.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/3289/1 -- To view, visit http://gerrit.ovirt.org/3289 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I238e8451ea4a402713b6216e1231f670132742a0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>

4 4

Change in vdsm[master]: Remove rhevm from vds_bootstrap/
by Ryan Harper 02 Jan '13

02 Jan '13

Ryan Harper has uploaded a new change for review. Change subject: Remove rhevm from vds_bootstrap/ ...................................................................... Remove rhevm from vds_bootstrap/ sed -e 's,RHEVM,OVIRT,g' -e 's,RHEV,oVirt,g' Change-Id: Ib28617f0fa45ff867fcd85eeb7bd49d8d5220d4d Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com> --- M vds_bootstrap/vds_bootstrap.py M vds_bootstrap/vds_bootstrap_complete.py 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/3287/1 -- To view, visit http://gerrit.ovirt.org/3287 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib28617f0fa45ff867fcd85eeb7bd49d8d5220d4d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>

3 7

Change in vdsm[master]: Change vmchannel name to remove rhevm
by Ryan Harper 02 Jan '13

02 Jan '13

Ryan Harper has uploaded a new change for review. Change subject: Change vmchannel name to remove rhevm ...................................................................... Change vmchannel name to remove rhevm Change-Id: I95b44512052bdb5fed8c8c1486eafc41b85b5f13 Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com> --- M vdsm/libvirtvm.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/3288/1 -- To view, visit http://gerrit.ovirt.org/3288 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95b44512052bdb5fed8c8c1486eafc41b85b5f13 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>

3 4

Change in vdsm[master]: Change vdsmrepo to something non-rhev specific
by Ryan Harper 02 Jan '13

02 Jan '13

Ryan Harper has uploaded a new change for review. Change subject: Change vdsmrepo to something non-rhev specific ...................................................................... Change vdsmrepo to something non-rhev specific Instead of /rhevm use something more distro agnostic for storage repo path. Model this after libvirt (/var/lib/libvirt/images). Change-Id: I080a161f6338d341c986e0aaa2270a90be10891f Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com> --- M configure.ac M vdsm.spec.in 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/86/3286/1 -- To view, visit http://gerrit.ovirt.org/3286 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I080a161f6338d341c986e0aaa2270a90be10891f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>

6 14

Change in vdsm[master]: VDSM: Fix VDSM error message.
by Maor Lipchuk 01 Jan '13

01 Jan '13

Maor Lipchuk has uploaded a new change for review. Change subject: VDSM: Fix VDSM error message. ...................................................................... VDSM: Fix VDSM error message. Rephrase VDSM error message. Change-Id: I8ee2f8c9bbeecb589267b7fdaca8442210debfbb Signed-off-by: Maor Lipchuk <mlipchuk(a)redhat.com> --- M vdsm/storage/storage_exception.py 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/9355/1 diff --git a/vdsm/storage/storage_exception.py b/vdsm/storage/storage_exception.py index 54e64e6..8721e90 100644 --- a/vdsm/storage/storage_exception.py +++ b/vdsm/storage/storage_exception.py @@ -1184,8 +1184,7 @@ class StorageServerConnectionRefIdDoesNotExist(StorageException): code = 479 - message = ("Connection Reference ID was not " - "in the registered with this VDSM") + message = "Connection Reference ID was not registered" ################################################# -- To view, visit http://gerrit.ovirt.org/9355 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ee2f8c9bbeecb589267b7fdaca8442210debfbb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com>

8 12

Change in vdsm[master]: [RFE] Integrate Smartcard support
by tjelinek＠redhat.com 01 Jan '13

01 Jan '13

Tomas Jelinek has uploaded a new change for review. Change subject: [RFE] Integrate Smartcard support ...................................................................... [RFE] Integrate Smartcard support This patch is a VDSM part of the following BZs: https://bugzilla.redhat.com/588481 https://bugzilla.redhat.com/802736 This VDSM part integrates the smartcard in a supported way, not just as an unsupported custom hook. It also removes the smartcard hook itself. Change-Id: I7cdaef420c8381d588f6215e66e6a80dd9d2e44b Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com> --- M configure.ac M vdsm.spec.in M vdsm/libvirtvm.py M vdsm_hooks/Makefile.am M vdsm_hooks/README D vdsm_hooks/smartcard/Makefile.am D vdsm_hooks/smartcard/README D vdsm_hooks/smartcard/before_vm_start.py 8 files changed, 15 insertions(+), 72 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/8450/1 diff --git a/configure.ac b/configure.ac index 450f714..1136239 100644 --- a/configure.ac +++ b/configure.ac @@ -206,7 +206,6 @@ vdsm_hooks/qos/Makefile vdsm_hooks/qemucmdline/Makefile vdsm_hooks/scratchpad/Makefile - vdsm_hooks/smartcard/Makefile vdsm_hooks/smbios/Makefile vdsm_hooks/sriov/Makefile vdsm_hooks/vhostmd/Makefile diff --git a/vdsm.spec.in b/vdsm.spec.in index 716489a..536aa4f 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -318,14 +318,6 @@ the disk will be erased when the VM destroyed. VM cannot be migrated when using scratchpad hook -%package hook-smartcard -Summary: Smartcard support for Spice protocol in VDSM -BuildArch: noarch - -%description hook-smartcard -Smartcard hook add support for spice in VDSM. -Smartcard hook enable user to use its smartcard inside virtual machines. - %package hook-smbios Summary: Adding custom smbios entries to libvirt domain via VDSM BuildArch: noarch @@ -863,10 +855,6 @@ %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_scratchpad %{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_source/50_scratchpad %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy/50_scratchpad - -%files hook-smartcard -%defattr(-, root, root, -) -%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_smartcard %files hook-smbios %defattr(-, root, root, -) diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index 64a3b6b..bd1de6d 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -782,6 +782,18 @@ input.setAttribute('bus', 'ps2') self._devices.appendChild(input) + def appendSmartcard(self): + """ + Add smartcard section to domain xml + + <smartcard mode='passthrough' type='spicevmc'/> + """ + if self.conf['is_smartcard_enabled'] == 'true': + card = self.doc.createElement('smartcard') + card.setAttribute('mode', 'passthrough') + card.setAttribute('type', 'spicevmc') + self._devices.appendChild(card) + def appendGraphics(self): """ Add graphics section to domain xml. @@ -1240,6 +1252,7 @@ _QEMU_GA_DEVICE_NAME) domxml.appendInput() domxml.appendGraphics() + domxml.appendSmartcard() domxml.appendConsole() for devType in self._devices: diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am index e6a8280..56f714f 100644 --- a/vdsm_hooks/Makefile.am +++ b/vdsm_hooks/Makefile.am @@ -36,7 +36,6 @@ promisc \ qos \ scratchpad \ - smartcard \ smbios \ sriov \ vmdisk diff --git a/vdsm_hooks/README b/vdsm_hooks/README index b45b93e..1659610 100644 --- a/vdsm_hooks/README +++ b/vdsm_hooks/README @@ -24,7 +24,7 @@ If you want to enable more then one custom hook use the semicolon as a separator: - # rhevm-config -s UserDefinedVMProperties='pincpu=^[0-9]+$;smartcard=^(true|false)$' --cver=3.0 + # rhevm-config -s UserDefinedVMProperties='pincpu=^[0-9]+$;sap_agent=^(true|false)$' --cver=3.0 The convention is [hook name]=[value], the value is evaluate with regular expression, If you find regular expression too complex, you can always use the following command: @@ -47,7 +47,7 @@ pincpu=1 if you want to use more then on hook and you did enable it with the rhevm-config tool, you can use the semicolon as a separator: - pincpu=1;smartcard=true + pincpu=1;sap_agent=true b. Another option is to use "Run Once" dialog which mean that you add a custom property only this time to the VM, next time that you run the VM it will run without the custom property that you provided. diff --git a/vdsm_hooks/smartcard/Makefile.am b/vdsm_hooks/smartcard/Makefile.am deleted file mode 100644 index dfefff5..0000000 --- a/vdsm_hooks/smartcard/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2008 Red Hat, Inc. and/or its affiliates. -# -# Licensed to you under 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. See the files README and -# LICENSE_GPL_v2 which accompany this distribution. -# - -EXTRA_DIST = \ - before_vm_start.py - -install-data-local: - $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/before_vm_start - $(INSTALL_SCRIPT) $(srcdir)/before_vm_start.py \ - $(DESTDIR)$(vdsmhooksdir)/before_vm_start/50_smartcard - -uninstall-local: - $(RM) $(DESTDIR)$(vdsmhooksdir)/before_vm_start/50_smartcard diff --git a/vdsm_hooks/smartcard/README b/vdsm_hooks/smartcard/README deleted file mode 100644 index bd376bf..0000000 --- a/vdsm_hooks/smartcard/README +++ /dev/null @@ -1,9 +0,0 @@ -smartcard hook: -=============== -add smartcard support for spice - -syntax: -smartcard: smartcard=true - -libvirt xml: -<smartcard mode='passthrough' type='spicevmc'/> diff --git a/vdsm_hooks/smartcard/before_vm_start.py b/vdsm_hooks/smartcard/before_vm_start.py deleted file mode 100755 index 07e52e7..0000000 --- a/vdsm_hooks/smartcard/before_vm_start.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/python - -import os -import sys -import hooking -import traceback - -''' -smartcard vdsm hook -adding to domain xml -<smartcard mode='passthrough' type='spicevmc'/> -''' - -if os.environ.has_key('smartcard'): - try: - sys.stderr.write('smartcard: adding smartcard support\n') - domxml = hooking.read_domxml() - - devices = domxml.getElementsByTagName('devices')[0] - card = domxml.createElement('smartcard') - card.setAttribute('mode', 'passthrough') - card.setAttribute('type', 'spicevmc') - - devices.appendChild(card) - - hooking.write_domxml(domxml) - except: - sys.stderr.write('smartcard: [unexpected error]: %s\n' % traceback.format_exc()) - sys.exit(2) -- To view, visit http://gerrit.ovirt.org/8450 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7cdaef420c8381d588f6215e66e6a80dd9d2e44b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjelinek(a)redhat.com>

12 68

Change in vdsm[master]: Fix PEP8 violations in vm.py
by smizrahi＠redhat.com 27 Dec '12

27 Dec '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Fix PEP8 violations in vm.py ...................................................................... Fix PEP8 violations in vm.py Change-Id: I369a1dbfcf49cf1a8b1ac61fe88dd2fe3ea93b8e Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M Makefile.am M vdsm/vm.py 2 files changed, 118 insertions(+), 69 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/7449/1 diff --git a/Makefile.am b/Makefile.am index 611fec4..7a07608c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,6 +90,7 @@ vdsm/storage/volume.py \ vdsm/supervdsm.py \ vdsm/supervdsmServer.py \ + vdsm/vm.py \ vdsm_cli \ vdsm_hooks/fileinject/before_vm_start.py \ vdsm_hooks/promisc/after_vm_start.py \ diff --git a/vdsm/vm.py b/vdsm/vm.py index 949a3ee..549eb8f 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -20,7 +20,9 @@ import os import time -import threading, logging +import threading +import logging +import math from vdsm import constants import tempfile import pickle @@ -50,6 +52,7 @@ A module containing classes needed for VM communication. """ + def isVdsmImage(drive): return all(k in drive.keys() for k in ('volumeID', 'domainID', 'imageID', 'poolID')) @@ -67,13 +70,17 @@ if not a.startswith('__')] return " ".join(attrs) -class _MigrationError(RuntimeError): pass + +class _MigrationError(RuntimeError): + pass + class MigrationSourceThread(threading.Thread): """ A thread that takes care of migration on the source vdsm. """ _ongoingMigrations = threading.BoundedSemaphore(1) + @classmethod def setMaxOutgoingMigrations(cls, n): """Set the initial value of the _ongoingMigrations semaphore. @@ -81,8 +88,8 @@ must not be called after any vm has been run.""" cls._ongoingMigrations = threading.BoundedSemaphore(n) - def __init__ (self, vm, dst='', dstparams='', - mode='remote', method='online', **kwargs): + def __init__(self, vm, dst='', dstparams='', mode='remote', + method='online', **kwargs): self.log = vm.log self._vm = vm self._dst = dst @@ -92,19 +99,23 @@ self._machineParams = {} self._downtime = kwargs.get('downtime') or \ config.get('vars', 'migration_downtime') - self.status = {'status': {'code': 0, 'message': 'Migration in process'}, 'progress': 0} + self.status = {'status': { + 'code': 0, + 'message': 'Migration in process'}, 'progress': 0 + } threading.Thread.__init__(self) self._preparingMigrationEvt = False self._migrationCanceledEvt = False - def getStat (self): + def getStat(self): """ Get the status of the migration. """ return self.status def _setupVdsConnection(self): - if self._mode == 'file': return + if self._mode == 'file': + return self.remoteHost = self._dst.split(':')[0] # FIXME: The port will depend on the binding being used. # This assumes xmlrpc @@ -188,7 +199,11 @@ def _finishSuccessfully(self): if self._mode != 'file': self._vm.setDownStatus(NORMAL, "Migration succeeded") - self.status = {'status': {'code': 0, 'message': 'Migration done'}, 'progress': 100} + self.status = { + 'status': { + 'code': 0, + 'message': 'Migration done'}, + 'progress': 100} else: # don't pickle transient params for ignoreParam in ('displayIp', 'display', 'pid'): @@ -203,7 +218,11 @@ self._vm.cif.teardownVolumePath(self._dstparams) self._vm.setDownStatus(NORMAL, "SaveState succeeded") - self.status = {'status': {'code': 0, 'message': 'SaveState done'}, 'progress': 100} + self.status = { + 'status': { + 'code': 0, + 'message': 'SaveState done'}, + 'progress': 100} def run(self): try: @@ -240,12 +259,15 @@ def __str__(self): return "Bad volume specification " + RuntimeError.__str__(self) -class DoubleDownError(RuntimeError): pass + +class DoubleDownError(RuntimeError): + pass VALID_STATES = ('Down', 'Migration Destination', 'Migration Source', 'Paused', 'Powering down', 'RebootInProgress', 'Restoring state', 'Saving State', 'Up', 'WaitForLaunch') + class Vm(object): """ @@ -271,7 +293,7 @@ self.conf = {'pid': '0'} self.conf.update(params) self.cif = cif - self.log = SimpleLogAdapter(self.log, {"vmId" : self.conf['vmId']}) + self.log = SimpleLogAdapter(self.log, {"vmId": self.conf['vmId']}) self.destroyed = False self._recoveryFile = constants.P_VDSM_RUN + str( self.conf['vmId']) + '.recovery' @@ -304,7 +326,7 @@ self._startTime = time.time() - float( self.conf.pop('elapsedTimeOffset', 0)) - self._usedIndices = {} #{'ide': [], 'virtio' = []} + self._usedIndices = {} # {'ide': [], 'virtio' = []} self._volumesPrepared = False self._pathsPreparedEvent = threading.Event() self._devices = {DISK_DEVICES: [], NIC_DEVICES: [], @@ -312,9 +334,15 @@ CONTROLLER_DEVICES: [], GENERAL_DEVICES: [], BALLOON_DEVICES: [], REDIR_DEVICES: []} + self.volumeUtilizationChunk = \ + config.getint('irs', 'volume_utilization_chunk_mb') + self.systemShutdownTimeout = \ + config.getint('vars', 'sys_shutdown_timeout') + def _get_lastStatus(self): SHOW_PAUSED_STATES = ('Powering down', 'RebootInProgress', 'Up') - if not self._guestCpuRunning and self._lastStatus in SHOW_PAUSED_STATES: + if (not self._guestCpuRunning and + self._lastStatus in SHOW_PAUSED_STATES): return 'Paused' return self._lastStatus @@ -344,7 +372,7 @@ def _normalizeVdsmImg(self, drv): drv['needExtend'] = False drv['reqsize'] = drv.get('reqsize', '0') - if not drv.has_key('device'): + if not 'device' in drv: drv['device'] = 'disk' if drv['device'] == 'disk': @@ -358,22 +386,26 @@ drv['apparentsize'] = 0 def __legacyDrives(self): - """ - Backward compatibility for qa scripts that specify direct paths. - """ - legacies = [] - for index, linuxName in ((0, 'hda'), (1, 'hdb'), (2, 'hdc'), (3, 'hdd')): - path = self.conf.get(linuxName) - if path: - legacies.append({'type': DISK_DEVICES, 'device': 'disk', - 'path': path, 'iface': 'ide', 'index': index, - 'truesize': 0}) - return legacies + """ + Backward compatibility for qa scripts that specify direct paths. + """ + legacies = [] + for index, linuxName in enumerate(('hda', 'hdb', 'hdc', 'hdd')): + path = self.conf.get(linuxName) + if path: + legacies.append({'type': DISK_DEVICES, 'device': 'disk', + 'path': path, 'iface': 'ide', 'index': index, + 'truesize': 0}) + return legacies def __removableDrives(self): - removables = [{'type': DISK_DEVICES, 'device': 'cdrom', 'iface': 'ide', - 'path': self.conf.get('cdrom', ''), 'index': 2, - 'truesize': 0}] + removables = [{ + 'type': DISK_DEVICES, + 'device': 'cdrom', + 'iface': 'ide', + 'path': self.conf.get('cdrom', ''), + 'index': 2, + 'truesize': 0}] floppyPath = self.conf.get('floppy') if floppyPath: removables.append({'type': DISK_DEVICES, 'device': 'floppy', @@ -440,14 +472,16 @@ """ controllers = [] # For now we create by default only 'virtio-serial' controller - controllers.append({'type': CONTROLLER_DEVICES, 'device': 'virtio-serial'}) + controllers.append({ + 'type': CONTROLLER_DEVICES, + 'device': 'virtio-serial'}) return controllers def getConfVideo(self): """ Normalize video device provided by conf. """ - vcards =[] + vcards = [] if self.conf.get('display') == 'vnc': devType = 'cirrus' elif self.conf.get('display') == 'qxl': @@ -480,9 +514,12 @@ macs = self.conf.get('macAddr', '').split(',') models = self.conf.get('nicModel', '').split(',') bridges = self.conf.get('bridge', DEFAULT_BRIDGE).split(',') - if macs == ['']: macs = [] - if models == ['']: models = [] - if bridges == ['']: bridges = [] + if macs == ['']: + macs = [] + if models == ['']: + models = [] + if bridges == ['']: + bridges = [] if len(models) < len(macs) or len(models) < len(bridges): raise ValueError('Bad nic specification') if models and not (macs or bridges): @@ -495,17 +532,20 @@ for mac, model, bridge in zip(macs, models, bridges): if model == 'pv': model = 'virtio' - nics.append({'type': NIC_DEVICES, 'macAddr': mac, 'nicModel': model, - 'network': bridge, 'device': 'bridge'}) + nics.append({ + 'type': NIC_DEVICES, + 'macAddr': mac, + 'nicModel': model, + 'network': bridge, + 'device': 'bridge'}) return nics def getConfDrives(self): """ Normalize drives provided by conf. """ - # FIXME - # Will be better to change the self.conf but this implies an API change. - # Remove this when the API parameters will be consistent. + # FIXME: Will be better to change the self.conf but this implies an API + # change. Remove this when the API parameters will be consistent. confDrives = self.conf['drives'] if self.conf.get('drives') else [] if not confDrives: confDrives.extend(self.__legacyDrives()) @@ -536,7 +576,7 @@ drives = [(order, drv) for order, drv in enumerate(confDrives)] indexed = [] for order, drv in drives: - if not self._usedIndices.has_key(drv['iface']): + if drv['iface'] not in self._usedIndices: self._usedIndices[drv['iface']] = [] idx = drv.get('index') if idx is not None: @@ -556,8 +596,8 @@ """ Reserve the required memory for this VM. """ - self.memCommitted = 2**20 * (int(self.conf['memSize']) + - config.getint('vars', 'guest_ram_overhead')) + self.memCommitted = ((2 ** 20) * (int(self.conf['memSize'])) + + config.getint('vars', 'guest_ram_overhead')) def _startUnderlyingVm(self): self.log.debug("Start") @@ -653,7 +693,7 @@ load = len(self.cif.vmContainer) return base * (doubler + load) / doubler - def saveState (self): + def saveState(self): if self.destroyed: return toSave = deepcopy(self.status()) @@ -666,7 +706,8 @@ toSave['guestIPs'] = "" if 'sysprepInf' in toSave: del toSave['sysprepInf'] - if 'floppy' in toSave: del toSave['floppy'] + if 'floppy' in toSave: + del toSave['floppy'] for drive in toSave.get('drives', []): for d in self._devices[DISK_DEVICES]: if d.isVdsmImage() and drive.get('volumeID') == d.volumeID: @@ -675,11 +716,11 @@ with tempfile.NamedTemporaryFile(dir=constants.P_VDSM_RUN, delete=False) as f: - pickle.dump(toSave, f) + pickle.dump(toSave, f) os.rename(f.name, self._recoveryFile) - def onReboot (self, withRelaunch): + def onReboot(self, withRelaunch): try: self.log.debug('reboot event') self._startTime = time.time() @@ -695,7 +736,7 @@ except: self.log.error("Reboot event failed", exc_info=True) - def onShutdown (self): + def onShutdown(self): self.log.debug('onShutdown() event') self.user_destroy = True @@ -719,12 +760,13 @@ def _lvExtend(self, block_dev, newsize=None): volID = None for d in self._devices[DISK_DEVICES]: - if not d.blockDev: continue - if d.name != block_dev: continue + if not d.blockDev: + continue + if d.name != block_dev: + continue if newsize is None: - newsize = config.getint('irs', - 'volume_utilization_chunk_mb') + (d.apparentsize + 2**20 - - 1) / 2**20 + apperantSizeMB = int(math.ceil(d.apparentsize / (2.0 ** 20.0))) + newsize = self.volumeUtilizationChunk + apperantSizeMB # TODO cap newsize by max volume size volDict = {'poolID': d.poolID, 'domainID': d.domainID, 'imageID': d.imageID, 'volumeID': d.volumeID, @@ -732,11 +774,11 @@ d.needExtend = True d.reqsize = newsize # sendExtendMsg expects size in bytes - self.cif.irs.sendExtendMsg(d.poolID, volDict, newsize * 2**20, + self.cif.irs.sendExtendMsg(d.poolID, volDict, newsize * (2 ** 20), self._afterLvExtend) self.log.debug('%s/%s (%s): apparentsize %s req %s', d.domainID, - d.volumeID, d.name, d.apparentsize / constants.MEGAB, - newsize) #in MiB + d.volumeID, d.name, d.apparentsize / constants.MEGAB, + newsize) # in MiB volID = d.volumeID break @@ -778,8 +820,8 @@ apparentsize = int(res['apparentsize']) truesize = int(res['truesize']) self.log.debug('_afterLvExtend apparentsize %s req size %s', - apparentsize / constants.MEGAB, d.reqsize) # MiB - if apparentsize >= d.reqsize * constants.MEGAB: #in Bytes + apparentsize / constants.MEGAB, d.reqsize) # MiB + if apparentsize >= d.reqsize * constants.MEGAB: # in Bytes d.needExtend = False try: self.cont() @@ -821,8 +863,8 @@ self._acquireCpuLockWithTimeout() try: if self.lastStatus in ('Migration Source', 'Saving State', 'Down'): - self.log.error('cannot cont while %s', self.lastStatus) - return errCode['unexpected'] + self.log.error('cannot cont while %s', self.lastStatus) + return errCode['unexpected'] self._underlyingCont() if hasattr(self, 'updateGuestCpuRunning'): self.updateGuestCpuRunning() @@ -860,7 +902,7 @@ self._guestEvent = 'Powering down' self.log.debug('guestAgent shutdown called') self.guestAgent.desktopShutdown(timeout, message) - agent_timeout = int(timeout) + config.getint('vars', 'sys_shutdown_timeout') + agent_timeout = int(timeout) + self.systemShutdownTimeout timer = threading.Timer(agent_timeout, self._timedShutdown) timer.start() elif utils.tobool(self.conf.get('acpiEnable', 'true')): @@ -869,8 +911,10 @@ self._acpiShutdown() # No tools, no ACPI else: - return {'status': {'code': errCode['exist']['status']['code'], - 'message': 'VM without ACPI or active SolidICE tools. Try Forced Shutdown.'}} + return {'status': { + 'code': errCode['exist']['status']['code'], + 'message': 'VM without ACPI or active SolidICE tools. ' + 'Try Forced Shutdown.'}} except: self.log.error("Shutdown failed", exc_info=True) return {'status': {'code': doneCode['code'], @@ -912,7 +956,7 @@ utils.rmFile(self._guestSocketFile) utils.rmFile(self._recoveryFile) - def setDownStatus (self, code, reason): + def setDownStatus(self, code, reason): try: self.lastStatus = 'Down' self.conf['exitCode'] = code @@ -972,7 +1016,7 @@ 'network': {}, 'disks': {}, 'monitorResponse': str(self._monitorResponse), 'nice': self._nice, - 'elapsedTime' : str(int(time.time() - self._startTime)), + 'elapsedTime': str(int(time.time() - self._startTime)), } if 'cdrom' in self.conf: stats['cdrom'] = self.conf['cdrom'] @@ -998,12 +1042,15 @@ try: stats['disks'][var] = {} for value in decStats[var]: - stats['disks'][var][value] = utils.convertToStr(decStats[var][value]) + stats['disks'][var][value] = \ + utils.convertToStr(decStats[var][value]) except: - self.log.error("Error setting vm disk stats", exc_info=True) + self.log.error("Error setting vm disk stats", + exc_info=True) - - if self.lastStatus in ('Saving State', 'Restoring state', 'Migration Source', 'Migration Destination', 'Paused'): + if self.lastStatus in ('Saving State', + 'Restoring state', 'Migration Source', + 'Migration Destination', 'Paused'): stats['status'] = self.lastStatus elif self.isMigrating(): if self._migrationSourceThread._mode == 'file': @@ -1026,8 +1073,9 @@ memUsage = 0 realMemUsage = int(stats['memUsage']) if realMemUsage != 0: - memUsage = 100 - float(realMemUsage) / int(self.conf['memSize']) * 100 - stats['memUsage'] = utils.convertToStr(int(memUsage)) + memUsage = 1 - (float(realMemUsage) / int(self.conf['memSize'])) + + stats['memUsage'] = utils.convertToStr(int(memUsage * 100)) return stats def isMigrating(self): -- To view, visit http://gerrit.ovirt.org/7449 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I369a1dbfcf49cf1a8b1ac61fe88dd2fe3ea93b8e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

5 10

Change in vdsm[master]: Adding system information to getCapabilities
by ybronhei＠redhat.com 27 Dec '12

27 Dec '12

Yaniv Bronhaim has uploaded a new change for review. Change subject: Adding system information to getCapabilities ...................................................................... Adding system information to getCapabilities Using dmidecode to get system info and return it by getCaps api Change-Id: Ic429ef101fcf9047c4b552405314dc7ba9ba07a0 Bug-Id: https://bugzilla.redhat.com/show_bug.cgi?id=867543 Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M Makefile.am M vdsm.spec.in M vdsm/Makefile.am M vdsm/caps.py A vdsm/dmidecode_util.py M vdsm/supervdsmServer.py 6 files changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/58/9258/1 diff --git a/Makefile.am b/Makefile.am index e15d709..da86c25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,6 +61,7 @@ vdsm/constants.py.in \ vdsm/debugPluginClient.py \ vdsm/define.py \ + vdsm/dmidecode_util.py \ vdsm/exception.py \ vdsm/gluster \ vdsm/guestIF.py \ diff --git a/vdsm.spec.in b/vdsm.spec.in index 20ad1dc..57a61cd 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -623,6 +623,7 @@ %{_datadir}/%{vdsm_name}/blkid.py* %{_datadir}/%{vdsm_name}/caps.py* %{_datadir}/%{vdsm_name}/clientIF.py* +%{_datadir}/%{vdsm_name}/dmidecode_util.py* %{_datadir}/%{vdsm_name}/API.py* %{_datadir}/%{vdsm_name}/hooking.py* %{_datadir}/%{vdsm_name}/hooks.py* diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 76a81c6..a7601f1 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -31,6 +31,7 @@ clientIF.py \ configNetwork.py \ debugPluginClient.py \ + dmidecode_util.py \ guestIF.py \ hooking.py \ hooks.py \ diff --git a/vdsm/caps.py b/vdsm/caps.py index cfe4caf..8e5b558 100644 --- a/vdsm/caps.py +++ b/vdsm/caps.py @@ -29,6 +29,7 @@ import itertools import linecache import glob +import supervdsm import libvirt import rpm @@ -254,6 +255,9 @@ cpuInfo = CpuInfo() cpuTopology = CpuTopology() + + caps['SystemInfo'] = supervdsm.getProxy().getSystemInfo() + if config.getboolean('vars', 'report_host_threads_as_cores'): caps['cpuCores'] = str(cpuTopology.threads()) else: diff --git a/vdsm/dmidecode_util.py b/vdsm/dmidecode_util.py new file mode 100644 index 0000000..f009116 --- /dev/null +++ b/vdsm/dmidecode_util.py @@ -0,0 +1,49 @@ +# +# Copyright 2012 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 dmidecode + + +def getSystemInfo(): + systemInfo = dmidecode.system() + data = None + for info in systemInfo: + try: + if systemInfo[info]['data']['Version'] is not None: + data = systemInfo[info]['data'] + break + except: + continue + + if data is None: + raise OSError("could not get system information") + + try: + retData = {} + retData['Manufacturer'] = data['Manufacturer'] + retData['Product Name'] = data['Product Name'] + retData['Version'] = data['Version'] + retData['Serial Number'] = data['Serial Number'] + retData['UUID'] = data['UUID'] + retData['Family'] = data['Family'] + except: + raise OSError("full system information is missing") + + return retData diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index 34fefdb..47d9eb0 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -38,6 +38,7 @@ _glusterEnabled = False from parted_utils import getDevicePartedInfo as _getDevicePartedInfo from md_utils import getMdDeviceUuidMap as _getMdDeviceUuidMap +from dmidecode_util import getSystemInfo as _getSystemInfo from lsblk import getLsBlk as _getLsBlk from storage.multipath import getScsiSerial as _getScsiSerial from storage.iscsi import forceIScsiScan as _forceIScsiScan @@ -106,6 +107,10 @@ return _getLsBlk(*args, **kwargs) @logDecorator + def getSystemInfo(self): + return _getSystemInfo() + + @logDecorator def readMultipathConf(self): with open(MPATH_CONF) as f: return [x.strip("\n") for x in f.readlines()] -- To view, visit http://gerrit.ovirt.org/9258 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic429ef101fcf9047c4b552405314dc7ba9ba07a0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

10 76

Change in vdsm[master]: Attempt to name created threads appropriately.
by peter.portante＠redhat.com 26 Dec '12

26 Dec '12

Peter Portante has uploaded a new change for review. Change subject: Attempt to name created threads appropriately. ...................................................................... Attempt to name created threads appropriately. When debugging leaked threads, or just trying to understand what threads are executing at a given point in time, it is helpful to have names for the threads that relate back to the purpose and/or individual object they are related to. Some of the threads had names, but were not directly tied back to the objects they were related to. Change-Id: I8131f4cf0ef907ad7abed24065523da9a42bb0d2 Signed-off-by: Peter Portante <peter.portante(a)redhat.com> --- M vdsm/API.py M vdsm/clientIF.py M vdsm/ksm.py M vdsm/libvirtvm.py M vdsm/storage/domainMonitor.py M vdsm/storage/hsm.py M vdsm/storage/misc.py M vdsm/storage/processPool.py M vdsm/storage/resourceManager.py M vdsm/storage/sd.py M vdsm/storage/sp.py M vdsm/storage/storageServer.py M vdsm/storage/storage_mailbox.py M vdsm/storage/sync.py M vdsm/storage/task.py M vdsm/storage/taskManager.py M vdsm/storage/threadPool.py M vdsm/supervdsmServer.py M vdsm/ut/ivdsm.py M vdsm/utils.py M vdsm/vdsmDebugPlugin.py M vdsm/vm.py 22 files changed, 95 insertions(+), 43 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/3517/1 -- To view, visit http://gerrit.ovirt.org/3517 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8131f4cf0ef907ad7abed24065523da9a42bb0d2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter Portante <peter.portante(a)redhat.com>

3 9

Change in vdsm[master]: Let enable-hooks controll all hook packages
by Jarod.w 26 Dec '12

26 Dec '12

Jarod.w has uploaded a new change for review. Change subject: Let enable-hooks controll all hook packages ...................................................................... Let enable-hooks controll all hook packages If we don't add --enable-hooks when configuring the package, it still builds hook rpm packages(vdsm-hook-faqemu, vdsm-hook-vhostmd, vdsm-hook-qemucmdline). It seems abnormal. The patch can let enable-hooks controll all hook packages, and it doesn't build any hook packages when we don't add this configuration. Change-Id: I552d6da620a200a051c22c43aa1697664e8ad131 Signed-off-by: jarod.w <work.iec23801(a)gmail.com> --- M vdsm.spec.in M vdsm_hooks/Makefile.am 2 files changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/78/7978/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 56a42b4..3c051e9 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -738,6 +738,7 @@ %{_datadir}/%{vdsm_name}/tests/tc_filter_show.out %{_datadir}/%{vdsm_name}/tests/functional/*.py* +%if 0%{?with_hooks} %files hook-vhostmd %defattr(-, root, root, -) %doc COPYING @@ -752,7 +753,6 @@ %doc COPYING %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_qemucmdline -%if 0%{?with_hooks} %files hook-directlun %defattr(-, vdsm, kvm, -) %attr (440,root,root) %{_sysconfdir}/sudoers.d/50_vdsm_hook_directlun @@ -827,6 +827,12 @@ %attr (755,vdsm,kvm) %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy/50_sriov %attr (755,vdsm,kvm) %{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_source/50_sriov +%files hook-faqemu +%defattr(-, root, root, -) +%doc COPYING +%{_libexecdir}/%{vdsm_name}/vdsm-faqemu +%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/10_faqemu + %files hook-vmdisk %defattr(-, vdsm, kvm, -) %attr (755,vdsm,kvm) %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_vmdisk @@ -899,12 +905,6 @@ %defattr(-, %{vdsm_user}, %{vdsm_group},-) %dir %{_var}/log/%{vdsm_reg} - -%files hook-faqemu -%defattr(-, root, root, -) -%doc COPYING -%{_libexecdir}/%{vdsm_name}/vdsm-faqemu -%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/10_faqemu %files gluster %defattr(-, root, root, -) diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am index e6a8280..0af4d71 100644 --- a/vdsm_hooks/Makefile.am +++ b/vdsm_hooks/Makefile.am @@ -18,13 +18,14 @@ # Refer to the README and COPYING files for full details of the license # -SUBDIRS = faqemu vhostmd qemucmdline - include $(top_srcdir)/build-aux/Makefile.subs # Additional hooks if HOOKS -SUBDIRS += \ +SUBDIRS = \ + faqemu \ + vhostmd \ + qemucmdline \ directlun \ fileinject \ floppy \ -- To view, visit http://gerrit.ovirt.org/7978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I552d6da620a200a051c22c43aa1697664e8ad131 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Jarod.w <work.iec23801(a)gmail.com>

1 2

Change in vdsm[master]: Move IOUSER from misc.py to constants.py
by Xu He Jie 26 Dec '12

26 Dec '12

Xu He Jie has uploaded a new change for review. Change subject: Move IOUSER from misc.py to constants.py ...................................................................... Move IOUSER from misc.py to constants.py Move IOUSER from misc.py to constants.py and add it to configure.ac. make it configurable. Change-Id: Id5d20317ac5a38d8ddd74b26272cd870aa4702b9 --- M configure.ac M vdsm/constants.py.in M vdsm/storage/misc.py M vdsm/storage/safelease.py 4 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/3362/1 -- To view, visit http://gerrit.ovirt.org/3362 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5d20317ac5a38d8ddd74b26272cd870aa4702b9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xu He Jie <xuhj(a)linux.vnet.ibm.com>

3 4

Change in vdsm[master]: [WIP]Add text-based console support
by Xu He Jie 26 Dec '12

26 Dec '12

Xu He Jie has uploaded a new change for review. Change subject: [WIP]Add text-based console support ...................................................................... [WIP]Add text-based console support This patch use ssh protocol providing a text-based console for user. User can have another choice except spice and vnc. Text-based console consumes less bandwidth and generic ssh client can connect it. This patch try to keep same behaviour as vnc. Two new params for VM creation: consoleEnable: if true, it will enable console support for this VM consolePort: the port used by ssh server. if -1 specified, the port will be allocated automatically. The allocated port will show at getVmStats(). setVmTicket: password: used to connect this console. ttl: after expired, the console will be closed. existingConnAction: if 'disconnect' specified, the current connection will be closed, and reopen with new params. TODO: * Make console sharable. Current console only can connect by only one user * setTicket will be used by vnc and console seperately Change-Id: I69904bf7aafd4f764a256d4075c9bf71d988e7c5 Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- M vdsm.spec.in M vdsm/Makefile.am A vdsm/consoleServer.py M vdsm/constants.py.in M vdsm/libvirtvm.py M vdsm/supervdsmServer.py M vdsm/utils.py M vdsm/vm.py 8 files changed, 377 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/65/7165/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index bf8684a..33c8d6f 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -545,6 +545,7 @@ %{_datadir}/%{vdsm_name}/blkid.py* %{_datadir}/%{vdsm_name}/caps.py* %{_datadir}/%{vdsm_name}/clientIF.py* +%{_datadir}/%{vdsm_name}/consoleServer.py* %{_datadir}/%{vdsm_name}/API.py* %{_datadir}/%{vdsm_name}/hooking.py* %{_datadir}/%{vdsm_name}/hooks.py* diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 80befdb..dbb4dc3 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -31,6 +31,7 @@ caps.py \ clientIF.py \ configNetwork.py \ + consoleServer.py \ debugPluginClient.py \ guestIF.py \ hooking.py \ diff --git a/vdsm/consoleServer.py b/vdsm/consoleServer.py new file mode 100755 index 0000000..172fcae --- /dev/null +++ b/vdsm/consoleServer.py @@ -0,0 +1,279 @@ +#! /usr/bin/python +# +# Copyright (C) 2012, IBM Corporation +# +# 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 sys +import logging +import logging.config +import socket +import select +import os +import subprocess + +import paramiko + +from vdsm import constants +from vdsm import utils + + +class PortAllocator(): + + def __init__(self, minPort, maxPort): + self._minPort = minPort + self._maxPort = maxPort + self._bitmap = utils.Bitmap(self._maxPort - self._minPort) + self._addrs = {} + + def getPort(self): + for i in range(0, self._maxPort - self._minPort): + if self._bitmap[i] == 0x0: + servSock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + servSock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + + try: + servSock.bind(("", i + self._minPort)) + except socket.error: + continue + finally: + servSock.close() + + self._bitmap[i] = 0x1 + return i + self._minPort + + raise Exception("Can not free port on address: %s", addr) + + def freePort(self, port): + print("free", port - self._minPort) + self._bitmap[port - self._minPort] = 0x0 + +portAllocator = PortAllocator(constants.SSH_CONSOLE_MIN_PORT, + constants.SSH_CONSOLE_MAX_PORT) + + +class SSHConsole(object): + AUTO_PORT = -1 + logger = logging.getLogger("console") + + def __init__(self, pty="", addr="", port=AUTO_PORT, + passwd="", timeout=-1, hostKeyFile="", + portAlloc=portAllocator): + self._prog = None + self._pty = pty + self._addr = addr + + self._portAlloc = portAllocator + self._port = port + if self._port == self.AUTO_PORT: + self._port = self._portAlloc.getPort() + + self._passwd = passwd + self._hostKeyFile = hostKeyFile + self._timeout = timeout + + def setPty(self, pty): + self._pty = pty + + def setPasswd(self, passwd): + self._passwd = passwd + + def setTimeout(self, timeout): + self._timeout = timeout + + def getPort(self): + return self._port + + def open(self): + self.logger.info("open console with: %s", {"pty": self._pty, + "addr": self._addr, + "port": self._port, + "timeout": self._timeout, + "hostKeyFile": self._hostKeyFile}) + f = open(self._pty, "rwa+") + self._prog = subprocess.Popen([constants.EXT_PYTHON, + os.path.join(constants.P_VDSM, __file__), + self._addr, + str(self._port), + self._passwd, + str(self._timeout), + self._hostKeyFile], + stdin=f, + stdout=f, + stderr=subprocess.STDOUT) + + def close(self): + if self._prog: + self._prog.kill() + self._prog.wait() + self._portAlloc.freePort(self._port) + + def isOpen(self): + return self._prog != None and self._prog.poll() == None + + +class ParamikoServerInf(paramiko.ServerInterface): + + def __init__(self, passwd): + self._passwd = passwd + + def check_channel_request(self, kind, chanid): + if kind == 'session': + return paramiko.OPEN_SUCCEEDED + return paramiko.OPEN_FAILED_UNKNOWN_CHANNEL_TYPE + + def check_auth_password(self, username, password): + if password != self._passwd: + return paramiko.AUTH_FAILED + return paramiko.AUTH_SUCCESSFUL + + def check_channel_shell_request(self, channel): + return True + + def check_channel_pty_request(self, channel, term, width, height, + pixelwidth, pixelheight, modes): + return True + + def check_auth_none(self, username): + return paramiko.AUTH_FAILED + + +class SSHConsoleServer(object): + + def __init__(self, logger, inputf, outputf, + addr, port, passwd, timeout, hostKeyFile): + self._logger = logger + self._output = outputf + self._input = inputf + self._addr = addr + self._port = port + self._passwd = passwd + self._timeout = timeout + self._hostKeyFile = hostKeyFile + + def start(self): + try: + hostKey = paramiko.RSAKey(filename=self._hostKeyFile) + except (paramiko.SSHException, IOError) as e: + self._logger.error("Can not load key from %s", + self._hostKeyFile, + exc_info=True) + return + + try: + servSock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + servSock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + except socket.error as e: + self._logger.error("create socket failed: %s", + e.message, exc_info=True) + return + + try: + servSock.bind((self._addr, self._port)) + servSock.listen(1) + except socket.error as e: + self._logger.error("failed binding address on %s:%s", + self._addr, self._port, exc_info=True) + servSock.close() + return + + while True: + self._logger.info("ssh console server waiting for connection") + + rd, wr, er = select.select([servSock, self._input], + [], [], self._timeout) + + if len(rd) == 0: + self._logger.info("connection timeout") + break + elif self._input in rd: + # if 0 returned means input was closed + if len(self._input.read()) == 0: + self._logger.info("console closed") + break + + clientSock, addr = servSock.accept() + self._logger.info("accept connection from %s", addr) + + trans = paramiko.Transport(clientSock) + trans.add_server_key(hostKey) + serverInf = ParamikoServerInf(self._passwd) + + try: + trans.start_server(server=serverInf) + except (paramiko.SSHException, EOFError) as e: + self._logger.error("start ssh server failed: %s", e.message) + clientSock.close() + continue + + chan = trans.accept() + + if chan is None: + self._logger.error("get SSH channel failed") + continue + + while True: + try: + rd, wr, er = select.select([chan, self._output], [], []) + + if chan in rd: + buf = chan.recv(1024) + + if len(buf) == 0: + self._logger.info("ssh channel closed") + break + + os.write(self._input.fileno(), buf) + elif self._output in rd: + buf = os.read(self._output.fileno(), 1) + + if chan.send(buf) == 0: + self._logger.info("ssh channel closed") + break + else: + self._logger.error("could not be happened", + exc_info=True) + + except IOError as e: + self._logger.error("got io error", exc_info=True) + break + + self._logger.info("ssh closed") + chan.close() + clientSock.close() + trans.close() + + servSock.close() + +if __name__ == '__main__': + logging.config.fileConfig(constants.P_VDSM_CONF + 'logger.conf') + logger = logging.getLogger("consoleServer") + + try: + addr = sys.argv[1] + port = int(sys.argv[2]) + passwd = sys.argv[3] + timeout = int(sys.argv[4]) + hostKey = sys.argv[5] + + logger.info("start a ssh server") + s = SSHConsoleServer(logger, sys.stdin, sys.stdout, + addr, port, passwd, timeout, hostKey) + s.start() + except Exception as e: + logger.error("ssh server failed: %s: %s", e.message, type(e)) diff --git a/vdsm/constants.py.in b/vdsm/constants.py.in index 3a5fdce..53ae56f 100644 --- a/vdsm/constants.py.in +++ b/vdsm/constants.py.in @@ -167,3 +167,9 @@ max_fds 4096 } """ + +# +# ssh console server port constants +# +SSH_CONSOLE_MAX_PORT = 65535 +SSH_CONSOLE_MIN_PORT = 12200 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index ddd030e..ea3b1b8 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -24,6 +24,7 @@ import time import threading import json +import os.path import vm from vdsm.define import ERROR, doneCode, errCode @@ -37,6 +38,7 @@ import caps from vdsm import netinfo import supervdsm +import consoleServer _VMCHANNEL_DEVICE_NAME = 'com.redhat.rhevm.vdsm' @@ -1232,6 +1234,7 @@ self._getUnderlyingVideoDeviceInfo() self._getUnderlyingControllerDeviceInfo() self._getUnderlyingBalloonDeviceInfo() + self._getUnderlyingConsoleDeviceInfo() # Obtain info of all unknown devices. Must be last! self._getUnderlyingUnknownDeviceInfo() @@ -1260,6 +1263,23 @@ self.guestAgent = guestIF.GuestAgent(self._guestSocketFile, self.cif.channelListener, self.log, connect=utils.tobool(self.conf.get('vmchannel', 'true'))) + + if utils.tobool(self.conf.get("enableConsole", False)): + self.log.info("vm console enabled") + + supervdsm.getProxy().changePtyOwner( + int(os.path.basename(self.conf["consolePath"]))) + + self._console = consoleServer.SSHConsole( + self.conf['consolePath'], + "", + int(self.conf.get("consolePort", -1)), + "", + -1, + os.path.join( + constants.P_VDSM_KEYS, 'vdsmkey.pem')) + + self.conf["consolePort"] = self._console.getPort() self._guestCpuRunning = self._dom.info()[0] == libvirt.VIR_DOMAIN_RUNNING if self.lastStatus not in ('Migration Destination', @@ -1931,6 +1951,21 @@ graphics.setAttribute('passwdValidTo', validto) if graphics.getAttribute('type') == 'spice': graphics.setAttribute('connected', connAct) + + if self._console: + self.log.debug("setticket for console") + if connAct == "disconnect": + if self._console.isOpen(): + self._console.close() + self._console.setPasswd(otp) + self._console.setTimeout(seconds) + self._console.open() + else: + if not self._console.isOpen(): + self._console.setPasswd(otp) + self._console.setTimeout(seconds) + self._console.open() + hooks.before_vm_set_ticket(self._lastXMLDesc, self.conf, params) self._dom.updateDeviceFlags(graphics.toxml(), 0) hooks.after_vm_set_ticket(self._lastXMLDesc, self.conf, params) @@ -2041,6 +2076,8 @@ self._vmStats.stop() if self.guestAgent: self.guestAgent.stop() + if self._console: + self._console.close() if self._dom: try: self._dom.destroyFlags(libvirt.VIR_DOMAIN_DESTROY_GRACEFUL) @@ -2219,6 +2256,17 @@ dev['address'] = address dev['alias'] = alias + def _getUnderlyingConsoleDeviceInfo(self): + """ + Obtain console device info from libvirt + """ + consolexml = xml.dom.minidom.parseString(self._lastXMLDesc) \ + .childNodes[0].getElementsByTagName('devices')[0] \ + .getElementsByTagName('console')[0] + + self.conf["consolePath"] = str(consolexml.getElementsByTagName( + 'source')[0].getAttribute('path')) + def _getUnderlyingVideoDeviceInfo(self): """ Obtain video devices info from libvirt. diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index 8d9ada4..e3966be 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -43,8 +43,8 @@ from supervdsm import _SuperVdsmManager, PIDFILE, ADDRESS from storage.fileUtils import chown, resolveGid, resolveUid from storage.fileUtils import validateAccess as _validateAccess -from vdsm.constants import METADATA_GROUP, METADATA_USER, EXT_UDEVADM, \ - DISKIMAGE_USER, DISKIMAGE_GROUP, P_LIBVIRT_VMCHANNELS +from vdsm.constants import METADATA_GROUP, METADATA_USER, EXT_CHOWN, \ + EXT_UDEVADM, DISKIMAGE_USER, DISKIMAGE_GROUP, P_LIBVIRT_VMCHANNELS from storage.devicemapper import _removeMapping, _getPathsStatus import storage.misc import configNetwork @@ -268,6 +268,18 @@ def removeFs(self, path): return mkimage.removeFs(path) + @logDecorator + def changePtyOwner(self, ptyNum): + if type(ptyNum) != int: + raise TypeError("ptyNum must be integer") + + cmd = [EXT_CHOWN, "vdsm:kvm", "/dev/pts/" + str(ptyNum)] + rc, out, err = storage.misc.execCmd(cmd, sudo=False) + if rc: + raise OSError(errno.EINVAL, "can not change own of /dev/pts/%d, " \ + "out: %s\nerr: %s" % + (ptyNum, out, err)) + def __pokeParent(parentPid): try: diff --git a/vdsm/utils.py b/vdsm/utils.py index 5e2d4e5..f0ebf79 100644 --- a/vdsm/utils.py +++ b/vdsm/utils.py @@ -36,6 +36,7 @@ import fcntl import functools import stat +from array import array import ethtool @@ -829,3 +830,27 @@ def __unicode__(self): return unicode(self.cmd) + + +class Bitmap(object): + + def __init__(self, size): + self._size = size + self._array = array('B', [0] * ((size / 8) + 1)) + + def __len__(self): + return self._size + + def __getitem__(self, key): + if key >= self._size or key < 0: + raise IndexError + return (self._array[key / 8] >> (key % 8)) & 0x1 + + def __setitem__(self, key, value): + if key >= self._size or key < 0: + raise IndexError + p = key / 8 + if value == 0x1: + self._array[p] = self._array[p] | (0x1 << (key % 8)) + else: + self._array[p] = self._array[p] & ~(0x1 << (key % 8)) \ No newline at end of file diff --git a/vdsm/vm.py b/vdsm/vm.py index 44796c3..f2b8e04 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -311,6 +311,7 @@ SOUND_DEVICES: [], VIDEO_DEVICES: [], CONTROLLER_DEVICES: [], GENERAL_DEVICES: [], BALLOON_DEVICES: [], REDIR_DEVICES: []} + self._console = None def _get_lastStatus(self): SHOW_PAUSED_STATES = ('Powering down', 'RebootInProgress', 'Up') @@ -971,6 +972,8 @@ stats['cdrom'] = self.conf['cdrom'] if 'boot' in self.conf: stats['boot'] = self.conf['boot'] + if utils.tobool(self.conf.get('enableConsole', False)): + stats['consolePort'] = self.conf['consolePort'] decStats = {} try: -- To view, visit http://gerrit.ovirt.org/7165 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I69904bf7aafd4f764a256d4075c9bf71d988e7c5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xu He Jie <xuhj(a)linux.vnet.ibm.com>

8 19

Change in vdsm[master]: move Global api to clientif
by Xu He Jie 26 Dec '12

26 Dec '12

Xu He Jie has uploaded a new change for review. Change subject: move Global api to clientif ...................................................................... move Global api to clientif Change-Id: I02338ed41b5d200fd0ffd9b96499ae449060f235 Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- M vdsm/API.py M vdsm/clientIF.py 2 files changed, 446 insertions(+), 355 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/27/5527/1 -- To view, visit http://gerrit.ovirt.org/5527 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I02338ed41b5d200fd0ffd9b96499ae449060f235 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xu He Jie <xuhj(a)linux.vnet.ibm.com>

2 3

Change in vdsm[master]: move the implement of storage related api to hsm
by Xu He Jie 26 Dec '12

26 Dec '12

Xu He Jie has uploaded a new change for review. Change subject: move the implement of storage related api to hsm ...................................................................... move the implement of storage related api to hsm Change-Id: Iff7969ac4aa17d52741a5b46c00efd62fc0f9dc6 Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- M vdsm/API.py M vdsm/storage/hsm.py 2 files changed, 469 insertions(+), 178 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/5526/1 -- To view, visit http://gerrit.ovirt.org/5526 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff7969ac4aa17d52741a5b46c00efd62fc0f9dc6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xu He Jie <xuhj(a)linux.vnet.ibm.com>

2 3

Change in vdsm[master]: move VM api implement to vmm module
by Xu He Jie 26 Dec '12

26 Dec '12

Xu He Jie has uploaded a new change for review. Change subject: move VM api implement to vmm module ...................................................................... move VM api implement to vmm module Create a vmm module to manage vm stuff. clientIF will instance VMM and VMM will regist it's API implement to API layer. After all API implement move to submodule, we don't need passing clientIF to anywhere and any global object. * create vmm module to manager vm * move VM api implement to vmm module Change-Id: Ib27a0e9300b55f25fa81d66d1055688122bb33db Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- M vdsm.spec.in M vdsm/API.py M vdsm/BindingXMLRPC.py M vdsm/Makefile.am M vdsm/clientIF.py A vdsm/vmm.py 6 files changed, 854 insertions(+), 598 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/5525/1 -- To view, visit http://gerrit.ovirt.org/5525 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib27a0e9300b55f25fa81d66d1055688122bb33db Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xu He Jie <xuhj(a)linux.vnet.ibm.com>

2 3

Change in vdsm[master]: add api registeration mechanism
by Xu He Jie 26 Dec '12

26 Dec '12

Xu He Jie has uploaded a new change for review. Change subject: add api registeration mechanism ...................................................................... add api registeration mechanism add registAPI method, then other modules can implement the api and regist their implement to API.py. *add api registeration mechanism *add Base class for add ABCMeta as metaclass *add class decorator for add abstractmethod for every public method. this can limit people to implement the api as interface. *add PartialProxy it similar as functools.partial, but this can access class member Change-Id: I8eabbec2526041e548591b62252d754b1f5934b5 Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- A tests/apiTests.py M vdsm/API.py 2 files changed, 119 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/24/5524/1 -- To view, visit http://gerrit.ovirt.org/5524 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8eabbec2526041e548591b62252d754b1f5934b5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xu He Jie <xuhj(a)linux.vnet.ibm.com>

3 4

Change in vdsm[master]: Bug 852956 - 3.1 - prepareForShutdown is not called when con...
by michal.skrivanek＠redhat.com 25 Dec '12

25 Dec '12

Michal Skrivanek has uploaded a new change for review. Change subject: Bug 852956 - 3.1 - prepareForShutdown is not called when connection to libvirt is broken with event: libvirtError: internal error client socket is closed add few more error codes from libvirt's virsh code ...................................................................... Bug 852956 - 3.1 - prepareForShutdown is not called when connection to libvirt is broken with event: libvirtError: internal error client socket is closed add few more error codes from libvirt's virsh code Change-Id: Ic1d9a2cd9bfd7da9118d643d0e50106e5e759590 Bug-Id: https://bugzilla.redhat.com/show_bug.cgi?id=852956 Signed-off-by: Michal Skrivanek <michal.skrivanek(a)redhat.com> --- M vdsm/libvirtconnection.py 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/8283/1 diff --git a/vdsm/libvirtconnection.py b/vdsm/libvirtconnection.py index e525996..01c6db1 100644 --- a/vdsm/libvirtconnection.py +++ b/vdsm/libvirtconnection.py @@ -87,7 +87,10 @@ setattr(ret, name, wrapMethod(method)) return ret except libvirt.libvirtError, e: - if (e.get_error_domain() in (libvirt.VIR_FROM_REMOTE, libvirt.VIR_FROM_RPC) + if (e.get_error_domain() in (libvirt.VIR_FROM_REMOTE, + libvirt.VIR_FROM_RPC, + libvirt.VIR_ERR_NO_CONNECT, + libvirt.VIR_ERR_INVALID_CONN) and e.get_error_code() == libvirt.VIR_ERR_SYSTEM_ERROR): cif.log.error('connection to libvirt broken. ' 'taking vdsm down.') -- To view, visit http://gerrit.ovirt.org/8283 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1d9a2cd9bfd7da9118d643d0e50106e5e759590 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Michal Skrivanek <michal.skrivanek(a)redhat.com>

5 17

Change in vdsm[master]: Improvement of the GuestAgent class memory usage
by Vinzenz Feenstra 24 Dec '12

24 Dec '12

Vinzenz Feenstra has uploaded a new change for review. Change subject: Improvement of the GuestAgent class memory usage ...................................................................... Improvement of the GuestAgent class memory usage Introduction of a new configuration option guest_agent_max_allowed_message_size which defines the maximum length of a message coming from the guest agent. The default value has been set to 1 MiB. Change in the implementation of reading and handling messages from the guest agent. Every 64KiB the newly arrived content is checked for a newline character and all messages are handled immediately before it continues to read. If the received data do not contain a new line character the data is appended to the buffer list and the _buffer_size variable increased by the size of all stored buffers in the list. If _buffer_size exceeds the defined threshold, defined in 'guest_agent_max_allowed_message_size', the buffer list will be discarded and _buffer_size will be reset to 0. If there is a started message which will be finished afterwards it will have an invalid format and therefore be discarded. This change has been done to improve the amount of memory consumed by instances of the GuestAgent class. Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> Change-Id: Ibf6274bb10c9e3b80962b69c5df316f03ee21214 --- M vdsm/config.py.in M vdsm/guestIF.py 2 files changed, 39 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/9239/1 diff --git a/vdsm/config.py.in b/vdsm/config.py.in index 8e7c6e8..fc35c71 100644 --- a/vdsm/config.py.in +++ b/vdsm/config.py.in @@ -89,6 +89,9 @@ 'Grace period (seconds) to let guest user close his ' 'applications before shutdown.'), + ('guest_agent_max_allowed_message_size', '1048576', + 'Maximum allowed size for guest agent messages.'), + ('guest_agent_timeout', '30', 'Time (in sec) to wait for guest agent.'), diff --git a/vdsm/guestIF.py b/vdsm/guestIF.py index 96c421b..1b188a4 100644 --- a/vdsm/guestIF.py +++ b/vdsm/guestIF.py @@ -23,6 +23,7 @@ import socket import json import supervdsm +from vdsm.config import config __RESTRICTED_CHARS = set(range(8 + 1)).union( set(range(0xB, 0xC + 1))).union( @@ -52,6 +53,8 @@ class GuestAgent (): def __init__(self, socketName, channelListener, log, user='Unknown', ips='', connect=True): + self.MAX_MESSAGE_SIZE = \ + config.getint('vars', 'guest_agent_max_allowed_message_size') self.log = log self._sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) # Save the socket's fileno because a call to fileno() fails if the @@ -95,7 +98,7 @@ self.log.debug("Attempting connection to %s", self._socketName) if self._sock.connect_ex(self._socketName) == 0: self.log.debug("Connected to %s", self._socketName) - self._buffer = '' + self._clear_read_buffer() self._forward('refresh') self._stopped = False ret = True @@ -259,23 +262,45 @@ self.log.log(logging.TRACE, "Guest connection timed out") self.guestStatus = None + def _clear_read_buffer(self): + self._buffer = [] + self._buffer_size = 0 + + def _process_message(self, line): + try: + (message, args) = self._parseLine(line) + self._agentTimestamp = time.time() + self._handleMessage(message, args) + except ValueError as err: + self.log.error("%s: %s" % (err, repr(line))) + + def _handle_data(self, data): + while '\n' in data: + line, data = data.split('\n', 1) + line = ''.join(self._buffer) + line + self._clear_read_buffer() + self._process_message(line) + + self._buffer.append(data) + self._buffer_size += len(data) + + if self._buffer_size >= self.MAX_MESSAGE_SIZE: + self.log.error("[GuestAgent._handle_data] Discarding buffer with " + "size: %d because the message reached maximum size " + "of %d bytes before message end was reached." % + (self._buffer_size, self.MAX_MESSAGE_SIZE)) + self._clear_read_buffer() + @staticmethod def _onChannelRead(self): try: - while True: - self._buffer += self._sock.recv(2 ** 16) + while (not self._stopped): + data = self._sock.recv(2 ** 16) + self._handle_data(data) except socket.error as err: if err.errno == 11: # Nothing more to receive (Resource temporarily unavailable). pass - while (not self._stopped) and (self._buffer.find('\n') >= 0): - line, self._buffer = self._buffer.split('\n', 1) - try: - (message, args) = self._parseLine(line) - self._agentTimestamp = time.time() - self._handleMessage(message, args) - except ValueError as err: - self.log.error("%s: %s" % (err, repr(line))) def _parseLine(self, line): args = json.loads(line.decode('utf8')) -- To view, visit http://gerrit.ovirt.org/9239 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf6274bb10c9e3b80962b69c5df316f03ee21214 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

6 45

Change in vdsm[master]: Allow to remove NIC if it not in use
by Igor Lvovsky 24 Dec '12

24 Dec '12

Igor Lvovsky has uploaded a new change for review. Change subject: Allow to remove NIC if it not in use ...................................................................... Allow to remove NIC if it not in use Change-Id: Ifb8e5fce14fc38c3df9c0b12dc4077726436807e Signed-off-by: Igor Lvovsky <ilvovsky(a)redhat.com> --- M vdsm/configNetwork.py 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/9508/1 diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 09d70ac..b188860 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -1133,12 +1133,12 @@ configWriter.removeBonding(bonding) iface = None if bonding == iface else iface - for nic in nics: - if not nicOtherUsers(network, vlan, bonding, nic): - ifdown(nic) - configWriter.removeNic(nic) - ifup(nic) - iface = None if nic == iface else iface + for nic in nics: + if not nicOtherUsers(network, vlan, bonding, nic): + ifdown(nic) + configWriter.removeNic(nic) + ifup(nic) + iface = None if nic == iface else iface # Now we can restart changed interface if iface: -- To view, visit http://gerrit.ovirt.org/9508 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb8e5fce14fc38c3df9c0b12dc4077726436807e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>

5 38

Change in vdsm[master]: Related to BZ#843387 - Payload should set volPath or raise.
by ewarszaw＠redhat.com 24 Dec '12

24 Dec '12

Eduardo has uploaded a new change for review. Change subject: Related to BZ#843387 - Payload should set volPath or raise. ...................................................................... Related to BZ#843387 - Payload should set volPath or raise. Change-Id: I0d5b36a88752ad2191226191c9502c1717033bbc Signed-off-by: Eduardo <ewarszaw(a)redhat.com> --- M vdsm/clientIF.py 1 file changed, 10 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/03/6803/1 -- To view, visit http://gerrit.ovirt.org/6803 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d5b36a88752ad2191226191c9502c1717033bbc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

10 26

Change in vdsm[master]: [WIP] Don't fail silently when ifup fails.
by asegurap＠redhat.com 23 Dec '12

23 Dec '12

Antoni Segura Puimedon has uploaded a new change for review. Change subject: [WIP] Don't fail silently when ifup fails. ...................................................................... [WIP] Don't fail silently when ifup fails. Up until now we discarded ifup return codes and ignored the possible errors present in ifup stdout. Use this information to perform better error reporting. Change-Id: I1cc9dcc0a6b55d36fc937e1d364bd9c256ecd70a Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/856737 --- M vdsm/configNetwork.py M vdsm/neterrors.py 2 files changed, 28 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/8415/1 diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index a114798..fb7cd94 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -29,6 +29,7 @@ from xml.sax.saxutils import escape import glob import shutil +from functools import partial import libvirt import selinux @@ -60,15 +61,23 @@ return rc -def ifup(iface, async=False): +def ifup(iface, async=False, final=None): "Bring up an interface" - _ifup = lambda netIf: execCmd([constants.EXT_IFUP, netIf], raw=True) + def _ifup(netIf, toCall=None): + rc, out, err = execCmd([constants.EXT_IFUP, netIf], raw=False) + + if rc != 0: + # In /etc/sysconfig/network-scripts/ifup* the last line usually + # contains the error reason. + raise ConfigNetworkError(ne.ERR_FAILED_IFUP, out[-1]) + elif toCall is not None: + toCall() if async: # wait for dhcp in another thread, # so vdsm won't get stuck (BZ#498940) t = threading.Thread(target=_ifup, name='ifup-waiting-on-dhcp', - args=(iface,)) + args=(iface, final)) t.daemon = True t.start() else: @@ -899,6 +908,11 @@ nic = nics[0] if nics else None iface = bonding or nic blockingDhcp = utils.tobool(options.get('blockingdhcp')) + # Asynchronous top level ifup creation variables. + async = options['bootproto'] and blockingDhcp + libvirtNetworkCreation = partial(configWriter.createLibvirtNetwork, + network, bridged, iface) + # take down nics that need to be changed vlanedIfaces = [v['iface'] for v in _netinfo.vlans.values()] @@ -959,22 +973,27 @@ # Now we can run ifup for all interfaces if bonding: - ifup(bonding, bondBootproto == 'dhcp' and not blockingDhcp) + ifup(bonding, bondBootproto == 'dhcp' and not blockingDhcp, + libvirtNetworkCreation) # NICs must be activated in the same order of boot time # to expose the correct MAC address. for nic in nicSort(nics): - ifup(nic, options['bootproto'] and not blockingDhcp) + ifup(nic, options['bootproto'] and not blockingDhcp, + libvirtNetworkCreation) # Now we can ifup VLAN interface, because bond and nic already up if vlan: - ifup(iface, vlanBootproto == 'dhcp' and not blockingDhcp) + ifup(iface, vlanBootproto == 'dhcp' and not blockingDhcp, + libvirtNetworkCreation) if bridged: - ifup(network, bridgeBootproto == 'dhcp' and not blockingDhcp) + ifup(network, bridgeBootproto == 'dhcp' and not blockingDhcp, + libvirtNetworkCreation) # add libvirt network - configWriter.createLibvirtNetwork(network, bridged, iface) + if not async: + libvirtNetworkCreation() def assertBridgeClean(bridge, vlan, bonding, nics): diff --git a/vdsm/neterrors.py b/vdsm/neterrors.py index 65e2674..92faa59 100644 --- a/vdsm/neterrors.py +++ b/vdsm/neterrors.py @@ -27,4 +27,5 @@ ERR_BAD_VLAN = 26 ERR_BAD_BRIDGE = 27 ERR_USED_BRIDGE = 28 +ERR_FAILED_IFUP = 30 ERR_LOST_CONNECTION = 10 # noConPeer -- To view, visit http://gerrit.ovirt.org/8415 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cc9dcc0a6b55d36fc937e1d364bd9c256ecd70a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

5 48

Change in vdsm[master]: Add getOSName() method in deployUtil for OS detection
by Pradipta Kumar Banerjee 23 Dec '12

23 Dec '12

Pradipta Banerjee has uploaded a new change for review. Change subject: Add getOSName() method in deployUtil for OS detection ...................................................................... Add getOSName() method in deployUtil for OS detection This patch improves the current detection of whether the running host is RHEL6 based or Fedora by adding a new method getOSName() Change-Id: Ifff9b08902cd234dfa03292136317d50e5e3d22b Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- M vds_bootstrap/vds_bootstrap.py M vdsm_reg/deployUtil.py.in 2 files changed, 24 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/8002/1 diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py index 537953d..c6ae08e 100755 --- a/vds_bootstrap/vds_bootstrap.py +++ b/vds_bootstrap/vds_bootstrap.py @@ -66,11 +66,18 @@ (LOGDIR, "phase1", strftime("%Y%m%d%H%M%S")), filemode='w') -rhel6based = deployUtil.versionCompare(deployUtil.getOSVersion(), "6.0") >= 0 +#Detect RHEL6 or Fedora16 as min supported version +rhel6based = False +fedorabased = False +if (deployUtil.getOSName().lower() == "redhat" and + deployUtil.versionCompare(deployUtil.getOSVersion(), "6.0")) >= 0: + rhel6based = True -# TODO this is an infra-hackish heuristic for identifying Fedora -# drop as soon as possible -fedorabased = deployUtil.versionCompare(deployUtil.getOSVersion(), "16") >= 0 +if (deployUtil.getOSName().lower() == "fedora" and + deployUtil.versionCompare(deployUtil.getOSVersion(), "16")) >= 0: + fedorabased = True + +logging.debug("fedorabased=%d rhel6based=%d", fedorabased, rhel6based) if rhel6based: VDSM_NAME = "vdsm" diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in index bbda70e..e410e32 100644 --- a/vdsm_reg/deployUtil.py.in +++ b/vdsm_reg/deployUtil.py.in @@ -451,6 +451,19 @@ logging.debug("OS Release Ver = %s", osVer[1]) return osVer[1] +def getOSName(): + """ + Return the OS Name, Fedora, Redhat etc + + Return "Unknown OS" on any failure. + """ + + # platform.linux_distribution returns a tuple (distname, version, id) or + # default as given in args in case of any failure + osName = platform.linux_distribution(distname='Unknown OS', version='') + logging.debug("OS Name = %s", osName[0]) + return osName[0] + def getKernelVR(): """Return current kernel version and release.""" -- To view, visit http://gerrit.ovirt.org/8002 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifff9b08902cd234dfa03292136317d50e5e3d22b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Pradipta Banerjee <bpradip(a)in.ibm.com>

2 3

Change in vdsm[master]: schema: Add tune element to vmparameter
by lvroyce＠linux.vnet.ibm.com 20 Dec '12

20 Dec '12

Royce Lv has uploaded a new change for review. Change subject: schema: Add tune element to vmparameter ...................................................................... schema: Add tune element to vmparameter This element includes all kinds of tunable parameter(e.g.CPU, mem, blockio) to support cgroup in vm create. Change-Id: I887e434aac8c4c277a5ae6b8b528984c8d53d51c Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm_api/vdsmapi-schema.json 1 file changed, 42 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/8638/1 diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 9be5e52..b9b60f5 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -2254,6 +2254,40 @@ 'VmChannelDevice']} ## +# @CpuTuneParams: +# +# Parameters for @VM.tuneCpu. +# +# @cpu_shares: Relative share of CPU compared with other VMs +# +# @vcpu_period: The enforcement period of vcpu_quota +# +# @vcpu_quota: Max bandwidth vCPU can consume +# +# @emulator_quota: Max bandwidth of the emulator thread +# +# @emulator_period: The enforcement period of emulator_quota +# +# Since: 4.10.0 +## +{'type': 'CpuTuneParams', + 'data': {'cpu_shares': 'uint', 'vcpu_period': 'uint', + 'vcpu_quota': 'int', 'emulator_period': 'uint', + 'emulator_quota': 'int'}} + +## +# @TuneType: +# +# Type that includes all tunable parameters for @VM.create. +# +# @cpu: Limits of CPU and emulator thread. +# +# Since: 4.10.0 +## +{'type': 'TuneType', + 'data': {'cpu': 'CpuTuneParams'}} + +## # @VmShortStatus: # # Abbreviated virtual machine status. @@ -2319,6 +2353,8 @@ # @transparentHugePages: Indicates if the Transparent Huge Pages feature is # enabled for this virtual machine # +# @tune: #optional Tuning values for the VM. +# # @vmId: The VM UUID # # @vmName: The VM name @@ -2338,7 +2374,8 @@ 'pid': 'uint', 'smp': 'uint', '*smpCoresPerSocket': 'uint', '*smpThreadsPerCore': 'uint', 'status': 'VmStatus', 'timeOffset': 'uint', 'transparentHugePages': 'bool', - 'vmId': 'UUID', 'vmName': 'str', 'vmType': 'VmType'}} + '*tune': 'TuneType', 'vmId': 'UUID', + 'vmName': 'str', 'vmType': 'VmType'}} ## # @VmParameters: @@ -2370,6 +2407,8 @@ # @transparentHugePages: Indicates if the Transparent Huge Pages feature is # enabled for this virtual machine # +# @tune: #optional Tuning values for the VM. +# # @vmId: The VM UUID # # @vmName: The VM name @@ -2384,7 +2423,8 @@ 'display': 'VmDisplayType', 'kvmEnable': 'bool', 'memSize': 'uint', 'nice': 'int', 'smp': 'uint', 'smpCoresPerSocket': 'uint', 'smpThreadsPerCore': 'uint', 'timeOffset': 'uint', - 'transparentHugePages': 'bool', 'vmId': 'UUID', 'vmName': 'str', + 'transparentHugePages': 'bool', '*tune':'TuneType', + 'vmId': 'UUID', 'vmName': 'str', 'vmType': 'VmType'}} ## -- To view, visit http://gerrit.ovirt.org/8638 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I887e434aac8c4c277a5ae6b8b528984c8d53d51c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

3 4

Change in vdsm[master]: schema: nit fixes in vm definition
by lvroyce＠linux.vnet.ibm.com 20 Dec '12

20 Dec '12

Royce Lv has uploaded a new change for review. Change subject: schema: nit fixes in vm definition ...................................................................... schema: nit fixes in vm definition delete displayPort and displaySecurePort in vmdef These two ports are selected by libvirt according to API.py Add boot to vmDef Change-Id: I14c8f2919390d65a6938b6aadfb09fb2419f74bc Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm_api/vdsmapi-schema.json 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/8487/1 diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index e3a1c2a..1c61e36 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -2289,6 +2289,8 @@ # # @acpiEnable: Indicates if ACPI is enabled inside the VM # +# @boot: #optional An alias for the type of device used to boot the VM +# # @clientIp: The IP address of the client connected to the display # # @cpuPinning: #optional Information about CPU pinning @@ -2302,10 +2304,6 @@ # @display: The type of display # # @displayIp: The IP address to use for accessing the VM display -# -# @displayPort: The port in use for unencrypted display data -# -# @displaySecurePort: The port in use for encrypted display data # # @emulatedMachine: The specific machine specification being emulated # @@ -2345,8 +2343,9 @@ # Since: 4.10.0 ## {'type': 'VmFullStatus', - 'data': {'acpiEnable': 'bool', 'clientIp': 'str', '*cpuPinning': 'CpuPinInfoMap', - 'cpuType': 'str', 'custom': 'StringMap', 'devices': ['VmDevice'], + 'data': {'acpiEnable': 'bool', 'clientIp': 'str', '*boot': 'VmBootMode', + '*cpuPinning': 'CpuPinInfoMap', 'cpuType': 'str', + 'custom': 'StringMap', 'devices': ['VmDevice'], 'display': 'VmDisplayType', 'displayIp': 'str', 'displayPort': 'uint', 'displaySecurePort': 'uint', 'emulatedMachine': 'str', 'keyboardLayout': 'str', -- To view, visit http://gerrit.ovirt.org/8487 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14c8f2919390d65a6938b6aadfb09fb2419f74bc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

2 2

Change in vdsm[master]: Handling removing file Exceptions.
by ewarszaw＠redhat.com 19 Dec '12

19 Dec '12

Eduardo has uploaded a new change for review. Change subject: Handling removing file Exceptions. ...................................................................... Handling removing file Exceptions. Change-Id: If76e158ad69921d382e3d42ae45486534b9379f9 Signed-off-by: Eduardo <ewarszaw(a)redhat.com> --- M vdsm/utils.py 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/8625/1 diff --git a/vdsm/utils.py b/vdsm/utils.py index 0dbb342..c6e8514 100644 --- a/vdsm/utils.py +++ b/vdsm/utils.py @@ -61,8 +61,13 @@ """ try: os.unlink(fileToRemove) - except: - pass + except OSError as e: + if e.errno == errno.ENOENT: + logging.warning("File: %s already removed", fileToRemove) + else: + logging.error("Removing file: %s failed", fileToRemove, + exc_info=True) + raise def readMemInfo(): """ -- To view, visit http://gerrit.ovirt.org/8625 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If76e158ad69921d382e3d42ae45486534b9379f9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

8 15

Change in vdsm[master]: Make advanced process invocations part of execCmd
by smizrahi＠redhat.com 18 Dec '12

18 Dec '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Make advanced process invocations part of execCmd ...................................................................... Make advanced process invocations part of execCmd There are a bunch of places in the code where priority is set using ad hoc command concatenation. This is hard to understand and error prone. This patch adds this as a feature of execCmd so proper use is always enforced. - niceness can be set with the nice parameter - ionice class and class data can also be set with the appropriate parameters - setsid can be set as a boolean with setsid=True Change-Id: I5abd61c03ce907ea94761f0209a4626669051eb1 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/constants.py.in M vdsm/storage/misc.py M vdsm/storage/safelease.py M vdsm/storage/volume.py M vdsm/sudoers.vdsm.in 5 files changed, 53 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/9042/1 diff --git a/vdsm/constants.py.in b/vdsm/constants.py.in index 2e9eb99..dead7ed 100644 --- a/vdsm/constants.py.in +++ b/vdsm/constants.py.in @@ -150,8 +150,6 @@ EXT_WGET = '@WGET_PATH@' EXT_WRITE_NET_CONFIG = '@VDSMDIR@/write-net-config' -CMD_LOWPRIO = [EXT_NICE, '-n', '19', EXT_IONICE, '-c', '3'] - # # Storage constants # diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index 3a1280b..4ab7253 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -181,12 +181,38 @@ logSkipName="Storage.Misc.excCmd") +class IOCLASS: + REALTIME = 1 + BEST_EFFORT = 2 + IDLE = 3 + + +class NICENESS: + NORMAL = 0 + LOW = 19 + + @logskip("Storage.Misc.excCmd") def execCmd(command, sudo=False, cwd=None, data=None, raw=False, logErr=True, - printable=None, env=None, sync=True): + printable=None, env=None, sync=True, nice=None, ioclass=None, + ioclassdata=None, setsid=False): """ Executes an external command, optionally via sudo. """ + if ioclass is not None: + cmd = command + command = [constants.EXT_IONICE, '-c', str(ioclass)] + if ioclassdata is not None: + command.extend(("-n", str(ioclassdata))) + + command = command + cmd + + if nice is not None: + command = [constants.EXT_NICE, '-n', str(nice)] + command + + if setsid: + command = [constants.EXT_SETSID] + command + if sudo: command = [constants.EXT_SUDO, SUDO_NON_INTERACTIVE_FLAG] + command @@ -246,11 +272,13 @@ return str(ctime) -def watchCmd(command, stop, cwd=None, data=None, recoveryCallback=None): +def watchCmd(command, stop, cwd=None, data=None, recoveryCallback=None, + nice=None, ioclass=None): """ Executes an external command, optionally via sudo with stop abilities. """ - proc = execCmd(command, sudo=False, cwd=cwd, data=data, sync=False) + proc = execCmd(command, sudo=False, cwd=cwd, data=data, sync=False, + nice=nice, ioclass=ioclass) if recoveryCallback: recoveryCallback(proc) @@ -393,13 +421,13 @@ if oflag: cmd.append("oflag=%s" % oflag) - cmd = constants.CMD_LOWPRIO + cmd - if not stop: - (rc, out, err) = execCmd(cmd, sudo=False) + (rc, out, err) = execCmd(cmd, sudo=False, nice=NICENESS.LOW, + ioclass=IOCLASS.IDLE) else: (rc, out, err) = watchCmd(cmd, stop=stop, - recoveryCallback=recoveryCallback) + recoveryCallback=recoveryCallback, + nice=NICENESS.LOW, ioclass=IOCLASS.IDLE) if rc: raise se.MiscBlockWriteException(dst, offset, size) diff --git a/vdsm/storage/safelease.py b/vdsm/storage/safelease.py index 551dda5..4d706b0 100644 --- a/vdsm/storage/safelease.py +++ b/vdsm/storage/safelease.py @@ -99,11 +99,12 @@ str(self._leaseFile), str(leaseTimeMs), str(ioOpTimeoutMs), str(self._leaseFailRetry)]) - cmd = [constants.EXT_SETSID, constants.EXT_IONICE, '-c1', '-n0', - constants.EXT_SU, misc.IOUSER, '-s', constants.EXT_SH, '-c', - acquireLockCommand] + cmd = [constants.EXT_SU, misc.IOUSER, '-s', constants.EXT_SH, '-c', + acquireLockCommand] (rc, out, err) = misc.execCmd(cmd, cwd=self.lockUtilPath, - sudo=True) + sudo=True, + ioclass=misc.IOCLASS.REALTIME, + ioclassdata=0, setsid=True) if rc != 0: raise se.AcquireLockFailure(self._sdUUID, rc, out, err) self.log.debug("Clustered lock acquired successfully") diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index b97e6f3..fada654 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -981,9 +981,9 @@ log.debug('(qemuRebase): REBASE %s (fmt=%s) on top of %s (%s) START' % (src, srcFormat, backingFile, backingFormat)) - cmd = constants.CMD_LOWPRIO + [constants.EXT_QEMUIMG, "rebase", - "-t", "none", "-f", srcFormat, - "-b", backingFile, "-F", backingFormat] + cmd = [constants.EXT_QEMUIMG, "rebase", + "-t", "none", "-f", srcFormat, + "-b", backingFile, "-F", backingFormat] if unsafe: cmd += ["-u"] cmd += [src] @@ -992,7 +992,9 @@ if rollback: recoveryCallback = baseAsyncTasksRollback (rc, out, err) = misc.watchCmd(cmd, stop=stop, cwd=cwd, - recoveryCallback=recoveryCallback) + recoveryCallback=recoveryCallback, + ioclass=misc.IOCLASS.IDLE, + nice=misc.NICENESS.LOW) log.debug('(qemuRebase): REBASE %s DONE' % (src)) return (rc, out, err) @@ -1014,11 +1016,13 @@ stop=stop, size=size, recoveryCallback=baseAsyncTasksRollback) else: - cmd = constants.CMD_LOWPRIO + [constants.EXT_QEMUIMG, "convert", - "-t", "none", "-f", src_fmt, src, - "-O", dst_fmt, dst] + cmd = [constants.EXT_QEMUIMG, "convert", + "-t", "none", "-f", src_fmt, src, + "-O", dst_fmt, dst] (rc, out, err) = misc.watchCmd(cmd, stop=stop, - recoveryCallback=baseAsyncTasksRollback) + recoveryCallback=baseAsyncTasksRollback, + ioclass=misc.IOCLASS.IDLE, + nice=misc.NICENESS.LOW) log.debug('(qemuConvert): COPY %s to %s DONE' % (src, dst)) return (rc, out, err) diff --git a/vdsm/sudoers.vdsm.in b/vdsm/sudoers.vdsm.in index ab99e8e..688fe16 100644 --- a/vdsm/sudoers.vdsm.in +++ b/vdsm/sudoers.vdsm.in @@ -40,7 +40,7 @@ @CP_PATH@ * /var/log/vdsm/backup/* *, \ @MULTIPATH_PATH@, \ @BLOCKDEV_PATH@ --getsize64 *, \ - @SETSID_PATH@ @IONICE_PATH@ -c? -n? @SU_PATH@ vdsm -s /bin/sh -c /usr/libexec/vdsm/spmprotect.sh*, \ + @SETSID_PATH@ @IONICE_PATH@ -c ? -n ? @SU_PATH@ vdsm -s /bin/sh -c /usr/libexec/vdsm/spmprotect.sh*, \ @SERVICE_PATH@ vdsmd *, \ @REBOOT_PATH@ -f, \ @PYTHON@ @VDSMDIR@/supervdsmServer.py* [a-z0-9\\-]* [0-9]* -- To view, visit http://gerrit.ovirt.org/9042 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5abd61c03ce907ea94761f0209a4626669051eb1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

4 7

Change in vdsm[master]: supervdsmServer is down after failed operation (#851832)
by ybronhei＠redhat.com 18 Dec '12

18 Dec '12

Yaniv Bronhaim has uploaded a new change for review. Change subject: supervdsmServer is down after failed operation (#851832) ...................................................................... supervdsmServer is down after failed operation (#851832) https://bugzilla.redhat.com/show_bug.cgi?id=851832 After running operation that throws exception that we don't catch in supervdsmServer, we catch it in ProxyCaller::__call__ method. In this except code we reset supervdsmServer and call the same method again. If the exception is thrown again, we leave supervdsmServer down And this is how supervdsmServer remains. This patch omit the recall and leave the reset to keep on normal flow. Change-Id: Idad4a622b82259b777851d1b0c1b37ec8da2b01e Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M vdsm/supervdsm.py 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/01/7901/1 diff --git a/vdsm/supervdsm.py b/vdsm/supervdsm.py index 79e8d81..75e93e2 100644 --- a/vdsm/supervdsm.py +++ b/vdsm/supervdsm.py @@ -67,7 +67,6 @@ return callMethod() except (IOError, socket.error, AuthenticationError): self._supervdsmProxy._restartSupervdsm() - return callMethod() class SuperVdsmProxy(object): -- To view, visit http://gerrit.ovirt.org/7901 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idad4a622b82259b777851d1b0c1b37ec8da2b01e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

6 35

Change in vdsm[master]: add general test to be compatible for xmlrpc and rest
by lvroyce＠linux.vnet.ibm.com 16 Dec '12

16 Dec '12

Royce Lv has uploaded a new change for review. Change subject: add general test to be compatible for xmlrpc and rest ...................................................................... add general test to be compatible for xmlrpc and rest this allow xmlrpc and rest to share common functional testcases and different binding to handle their own interface use def file to make test case dynamically changable Change-Id: I00449f9c22800e2b00109990a7e535da986c5d48 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M configure.ac M tests/functional/Makefile.am A tests/functional/SampleDef/Makefile.am A tests/functional/SampleDef/testBindingUp.def A tests/functional/defLoader.py A tests/functional/generalTest.py M vdsm.spec.in 7 files changed, 121 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/5308/1 -- To view, visit http://gerrit.ovirt.org/5308 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00449f9c22800e2b00109990a7e535da986c5d48 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

3 7

Change in vdsm[master]: add "uptime" field to the getStats (getVdsStats in vdsClient...
by peet＠redhat.com 13 Dec '12

13 Dec '12

Peter V. Saveliev has uploaded a new change for review. Change subject: add "uptime" field to the getStats (getVdsStats in vdsClient) call. ...................................................................... add "uptime" field to the getStats (getVdsStats in vdsClient) call. "uptime" field, measured in seconds, contains VDSM run time since start, actually -- since first API.py import Signed-off-by: Peter V. Saveliev <peet(a)redhat.com> Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 --- M vdsm/API.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/8008/1 diff --git a/vdsm/API.py b/vdsm/API.py index 566d6e5..2c21a9e 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -47,7 +47,7 @@ USER_SHUTDOWN_MESSAGE = 'System going down' PAGE_SIZE_BYTES = os.sysconf('SC_PAGESIZE') - +STARTTIME = time.time() class APIBase(object): @@ -1103,6 +1103,7 @@ stats['netConfigDirty'] = str(self._cif._netConfigDirty) stats['generationID'] = self._cif._generationID + stats['uptime'] = time.time() - STARTTIME return {'status': doneCode, 'info': stats} def setLogLevel(self, level): -- To view, visit http://gerrit.ovirt.org/8008 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev <peet(a)redhat.com>

5 10

Change in vdsm[master]: Fix duplicate emulated machines returned
by wudxw＠linux.vnet.ibm.com 13 Dec '12

13 Dec '12

Mark Wu has uploaded a new change for review. Change subject: Fix duplicate emulated machines returned ...................................................................... Fix duplicate emulated machines returned The old code use getElementsByTagName('machine') to collect machines information, which will hit the default info for that arch and the kvm domain's. This patch changes to collect machines information from the node of kvm domain. Change-Id: I7e28688bf09b5bc413afffe9cc1501d4247d67e0 Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- M vdsm/caps.py 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/8208/1 diff --git a/vdsm/caps.py b/vdsm/caps.py index 98b33ab..c00c957 100644 --- a/vdsm/caps.py +++ b/vdsm/caps.py @@ -98,15 +98,15 @@ def _getEmulatedMachines(): c = libvirtconnection.get() caps = minidom.parseString(c.getCapabilities()) - guestTag = caps.getElementsByTagName('guest') - # Guest element is missing if kvm modules are not loaded - if len(guestTag) == 0: + for domainNode in caps.getElementsByTagName('domain'): + if domainNode.getAttribute('type') == 'kvm': + break + else: + # KVM domain is missing if kvm modules are not loaded return [] - guestTag = guestTag[0] - return [m.firstChild.toxml() - for m in guestTag.getElementsByTagName('machine')] + for m in domainNode.getElementsByTagName('machine')] def _getAllCpuModels(): -- To view, visit http://gerrit.ovirt.org/8208 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7e28688bf09b5bc413afffe9cc1501d4247d67e0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>

8 24

Change in vdsm[master]: add check-local for Makefile.am of vdsm api
by shaohef＠linux.vnet.ibm.com 12 Dec '12

12 Dec '12

ShaoHe Feng has uploaded a new change for review. Change subject: add check-local for Makefile.am of vdsm api ...................................................................... add check-local for Makefile.am of vdsm api check-local can make it easy to check the errors, when new APIs are added in vdsmapi-schema.json. Change-Id: I7a07e291822dae9179d3e8a4a90d654a776f085c Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- M vdsm_api/Makefile.am 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/33/9433/1 diff --git a/vdsm_api/Makefile.am b/vdsm_api/Makefile.am index 655586f..ebafc3b 100644 --- a/vdsm_api/Makefile.am +++ b/vdsm_api/Makefile.am @@ -1,4 +1,9 @@ +CLEANFILES = \ + schema.html \ + $(NULL) + EXTRA_DIST = \ + process-schema.py \ vdsmapi-schema.json \ $(NULL) @@ -11,3 +16,7 @@ dist_vdsm_DATA = \ vdsmapi-schema.json \ $(NULL) + +check-local: + PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(srcdir)/process-schema.py \ + $(srcdir)/vdsmapi-schema.json $(srcdir)/schema.html -- To view, visit http://gerrit.ovirt.org/9433 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a07e291822dae9179d3e8a4a90d654a776f085c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>

6 14

Change in vdsm[master]: Refactor mom init error flow
by smizrahi＠redhat.com 11 Dec '12

11 Dec '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Refactor mom init error flow ...................................................................... Refactor mom init error flow Splitting a log to to log invocation is bad because it could potentially separate the 2 log lines. Further more, it usually points out to a bad flow if you only sometimes need to log in the same flow so you resort to such tricks. - Add proper exception when MomThread fails to initialize - Make the two error flows clear and have each logged properly Change-Id: I03ff6057cdbb22b88ed2b5766bda399651c4d058 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/clientIF.py M vdsm/momIF.py 2 files changed, 25 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/9481/1 diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index 82603af..0bd686f 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -29,7 +29,7 @@ from storage.hsm import HSM from vdsm.config import config import ksm -from momIF import MomThread +from momIF import MomThread, isMomAvailable from vdsm import netinfo from vdsm.define import doneCode, errCode import libvirt @@ -189,14 +189,20 @@ 'Please make sure it is installed.') def _prepareMOM(self): - try: - momconf = config.get("mom", "conf") - self.mom = MomThread(momconf) - except: - self.log.warn("MOM initialization failed and fall " - "back to KsmMonitor") - self.log.debug("Details:", exc_info=True) - self.ksmMonitor = ksm.KsmMonitorThread(self) + momconf = config.get("mom", "conf") + + if isMomAvailable(): + try: + self.mom = MomThread(momconf) + return + except: + self.log.warn("MOM initialization failed and fall " + "back to KsmMonitor", exc_info=True) + + else: + self.log.warn("MOM is not available, fallback to KsmMonitor") + + self.ksmMonitor = ksm.KsmMonitorThread(self) def _syncLibvirtNetworks(self): """ diff --git a/vdsm/momIF.py b/vdsm/momIF.py index 827e9e4..807daef 100644 --- a/vdsm/momIF.py +++ b/vdsm/momIF.py @@ -27,11 +27,20 @@ _momAvailable = False +class MomNotAvailableError(RuntimeError): + pass + + +def isMomAvailable(): + return _momAvailable + + class MomThread(threading.Thread): def __init__(self, momconf): if not _momAvailable: - raise Exception("MOM is not available") + raise MomNotAvailableError() + self.log = logging.getLogger("MOM") self.log.info("Starting up MOM") self._mom = mom.MOM(momconf) -- To view, visit http://gerrit.ovirt.org/9481 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I03ff6057cdbb22b88ed2b5766bda399651c4d058 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

5 7

Change in vdsm[master]: [WIP] a more delicate rollback
by Dan Kenigsberg 11 Dec '12

11 Dec '12

Dan Kenigsberg has uploaded a new change for review. Change subject: [WIP] a more delicate rollback ...................................................................... [WIP] a more delicate rollback If things go wrong during setupNetwork, we try to revert the networking state to what it used to be. Until this patch, we stopped the network service, reverted all ifcfg-* files, and restarted networking. This procedure disruppted all connection, even those unrelated to the ones being set up. With this change, we are taking down only affected devices, and revert them to their pre-setupNetwork state. Change-Id: If413164a34a1e6f0d7e4ef75ba931e630a26e666 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/configNetwork.py 1 file changed, 37 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/9506/1 diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 09d70ac..6e8649c 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -320,6 +320,41 @@ open(confFile, 'w').write(content) logging.info('Restored %s', confFile) + def _devType(self, content): + if re.search('^TYPE=Bridge$', content, re.MULTILINE): + return "Bridge" + elif re.search('^VLAN=yes$', content, re.MULTILINE): + return "Vlan" + else: + return "Other" + + def _sortModifiedIfcfgs(self): + devdict = {'Bridge': [], + 'Vlan': [], + 'Other': []} + for confFile, _ in self._backups.iteritems(): + try: + content = file(confFile).read() + except IOError as e: + if e.errno == os.errno.ENOENT: + continue + else: + raise + dev = confFile[len(self.NET_CONF_PREF):] + + devdict[self._devType(content)].append(dev) + + return nicSort(devdict['Other']) + devdict['Vlan'] + \ + devdict['Bridge'] + + def _stopAtomicDevices(self): + for dev in reversed(self._sortModifiedIfcfgs()): + ifdown(dev) + + def _startAtomicDevices(self): + for dev in self._sortModifiedIfcfgs(): + ifup(dev) + @classmethod def _persistentBackup(cls, filename): """ Persistently backup ifcfg-* config files """ @@ -374,12 +409,12 @@ if not self._backups and not self._networksBackups: return - execCmd(['/etc/init.d/network', 'stop']) + self._stopAtomicDevices() self.restoreAtomicNetworkBackup() self.restoreAtomicBackup() - execCmd(['/etc/init.d/network', 'start']) + self._startAtomicDevices() @classmethod def clearBackups(cls): -- To view, visit http://gerrit.ovirt.org/9506 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If413164a34a1e6f0d7e4ef75ba931e630a26e666 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

5 15

Change in vdsm[master]: fix: sockets/cores retrieval from cpu topology
by barumuga＠redhat.com 11 Dec '12

11 Dec '12

Hello Ayal Baron, Timothy Asir, Saggi Mizrahi, Federico Simoncelli, Dan Kenigsberg, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/9386 to review the following change. Change subject: fix: sockets/cores retrieval from cpu topology ...................................................................... fix: sockets/cores retrieval from cpu topology topology tag in capabilities from libvirt is missing in some environment. This fix assumes default sockets and cores as 1 when topology tag missing Change-Id: I343db03f9cf6eefc28f993d269c6c082e7695af5 Signed-off-by: Bala.FA <barumuga(a)redhat.com> --- M vdsm/caps.py 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/86/9386/1 diff --git a/vdsm/caps.py b/vdsm/caps.py index fdb06b1..c77a05c 100644 --- a/vdsm/caps.py +++ b/vdsm/caps.py @@ -111,12 +111,16 @@ caps = minidom.parseString(c.getCapabilities()) host = caps.getElementsByTagName('host')[0] cpu = host.getElementsByTagName('cpu')[0] + topology = cpu.getElementsByTagName('topology') + sockets = 1 + cores = 1 + if topology: + sockets = int(topology[0].getAttribute('sockets')) + cores = int(topology[0].getAttribute('cores')) cells = host.getElementsByTagName('cells')[0] topology = {'cells': int(cells.getAttribute('num')), - 'sockets': int(cpu.getElementsByTagName('topology')[0]. - getAttribute('sockets')), - 'cores': int(cpu.getElementsByTagName('topology')[0]. - getAttribute('cores')), + 'sockets': sockets, + 'cores': cores, 'threads': cells.getElementsByTagName('cpu').length} return topology -- To view, visit http://gerrit.ovirt.org/9386 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I343db03f9cf6eefc28f993d269c6c082e7695af5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Bala.FA <barumuga(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Timothy Asir <tjeyasin(a)redhat.com>

5 24

Change in vdsm[master]: vdsm: Attaching a console should be controllable
by Vinzenz Feenstra 11 Dec '12

11 Dec '12

Vinzenz Feenstra has uploaded a new change for review. Change subject: vdsm: Attaching a console should be controllable ...................................................................... vdsm: Attaching a console should be controllable Added a new VmParameter 'attachConsole' which defines whether or not a console should be attached upon creation Change-Id: Ie92b0ad693fdde7eae9091d944403ac4477eb186 Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M vdsm/libvirtvm.py M vdsm_api/vdsmapi-schema.json 2 files changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/9359/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index ca31a43..16e081f 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -1260,7 +1260,9 @@ _QEMU_GA_DEVICE_NAME) domxml.appendInput() domxml.appendGraphics() - domxml.appendConsole() + + if utils.tobool(self.conf.get('attachConsole', 'false')): + domxml.appendConsole() for devType in self._devices: for dev in self._devices[devType]: diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 6591410..f736307 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -2379,6 +2379,9 @@ # # @vmType: The type of VM # +# @attachConsole: Defines if a virtio-console should be attached to the +# virtual machine +# # Since: 4.10.0 ## {'type': 'VmParameters', @@ -2388,7 +2391,7 @@ 'nice': 'int', 'smp': 'uint', 'smpCoresPerSocket': 'uint', 'smpThreadsPerCore': 'uint', 'timeOffset': 'uint', 'transparentHugePages': 'bool', 'vmId': 'UUID', 'vmName': 'str', - 'vmType': 'VmType'}} + 'vmType': 'VmType', 'attachConsole': 'bool'}} ## # @VmInfo: -- To view, visit http://gerrit.ovirt.org/9359 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie92b0ad693fdde7eae9091d944403ac4477eb186 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

5 29

Change in vdsm[master]: Online check ksmState and ksmPages.
by apahim＠redhat.com 11 Dec '12

11 Dec '12

Amador Pahim has uploaded a new change for review. Change subject: Online check ksmState and ksmPages. ...................................................................... Online check ksmState and ksmPages. Currently ksmState and ksmPages is updated only when adjust() is called (vm._startUnderlyingVm() and libvirt.releaseVm()). Since ksmtuned can turn on/off ksm any time, vdsm will report inaccurate information until adjust() be called. This patch changes ksmState and ksmPages update to every API call, reflecting always the accurate information. Change-Id: I84c2f8b80529a47662bdeac80bb3f71defd0758a Signed-off-by: Amador Pahim <apahim(a)redhat.com> --- M vdsm/API.py M vdsm/ksm.py 2 files changed, 25 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/9510/1 diff --git a/vdsm/API.py b/vdsm/API.py index 0710191..a0f2067 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1124,8 +1124,8 @@ stats.update(self._cif.mom.getKsmStats()) else: stats['momStatus'] = 'disabled' - stats['ksmState'] = self._cif.ksmMonitor.state - stats['ksmPages'] = self._cif.ksmMonitor.pages + stats['ksmState'] = self._ksmState() + stats['ksmPages'] = self._ksmPages() stats['ksmCpu'] = self._cif.ksmMonitor.cpuUsage stats['memShared'] = self._memShared() / Mbytes @@ -1372,6 +1372,18 @@ """ return (self._cif.ksmMonitor.memsharing() * PAGE_SIZE_BYTES) + def _ksmState(self): + """ + Return ksm running state. + """ + return (self._cif.ksmMonitor.running()) + + def _ksmPages(self): + """ + Return how many pages to scan before ksm will sleep. + """ + return (self._cif.ksmMonitor.npages()) + def _memCommitted(self): """ Return the amount of memory (Mb) committed for VMs diff --git a/vdsm/ksm.py b/vdsm/ksm.py index 3037a65..3c858b6 100644 --- a/vdsm/ksm.py +++ b/vdsm/ksm.py @@ -55,7 +55,6 @@ def run(self): start() try: - self.state, self.pages = self.readState() KSM_MONITOR_INTERVAL = 60 jiff0 = self._getKsmdJiffies() while True: @@ -66,9 +65,6 @@ jiff0 = jiff1 except: self._cif.log.error("Error monitoring KSM", exc_info=True) - - def readState(self): - return running(), npages() def adjust(self): """Adjust ksm's vigor @@ -81,10 +77,9 @@ try: utils.execCmd([constants.EXT_SERVICE, 'ksmtuned', 'retune'], sudo=True) - self.state, self.pages = self.readState() finally: self._lock.release() - return self.state + return self.running() def memsharing(self): try: @@ -92,21 +87,17 @@ except: return 0 + def running(self): + try: + return (int(file('/sys/kernel/mm/ksm/run').read()) & 1 == 1) + except: + return False -def running(): - try: - state = int(file('/sys/kernel/mm/ksm/run').read()) & 1 == 1 - return state - except: - return False - - -def npages(): - try: - npages = int(file('/sys/kernel/mm/ksm/pages_to_scan').read()) - return npages - except: - return 0 + def npages(self): + try: + return (int(file('/sys/kernel/mm/ksm/pages_to_scan').read())) + except: + return 0 def start(): -- To view, visit http://gerrit.ovirt.org/9510 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84c2f8b80529a47662bdeac80bb3f71defd0758a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Amador Pahim <apahim(a)redhat.com>

6 22

Change in vdsm[master]: [WIP] netwiring: [3/3] Add API definitions.
by asegurap＠redhat.com 11 Dec '12

11 Dec '12

Antoni Segura Puimedon has uploaded a new change for review. Change subject: [WIP] netwiring: [3/3] Add API definitions. ...................................................................... [WIP] netwiring: [3/3] Add API definitions. Third and final of the Network Wiring feature patches. It adds the implementation for using the new updateVmDevice feature. TODO: Add vdsm startup creation of the DUMMY_BRIDGE. TODO: Add the port mirroring processing. Change-Id: I3b9b4f49f80466a83e3e13f1042ac2a8866c6bcd Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M vdsm/API.py M vdsm/define.py M vdsm/libvirtvm.py 3 files changed, 103 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/9562/1 diff --git a/vdsm/API.py b/vdsm/API.py index e87b7e5..966a921 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -353,6 +353,17 @@ response['status']['message'] = 'Hibernation process starting' return response + def updateVmDevice(self, params): + if 'type' not in params: + self.log.error('Missing a required parameters: type') + return {'status': {'code': errCode['MissParam']['status']['code'], + 'message': 'Missing one of required ' + 'parameters: type'}} + v = self._cif.vmContainer.get(self._UUID) + if not v: + return errCode['noVM'] + return v.updateDevice(params) + def hotplugNic(self, params): try: utils.validateMinimalKeySet(params, ('vmId', 'nic')) diff --git a/vdsm/define.py b/vdsm/define.py index 11a6ef6..e2ba196 100644 --- a/vdsm/define.py +++ b/vdsm/define.py @@ -124,6 +124,9 @@ 'replicaErr': {'status': {'code': 55, 'message': 'Drive replication error'}}, + 'updateDevice': {'status': + {'code': 56, + 'message': 'Failed to update device'}}, 'recovery': {'status': {'code': 99, 'message': @@ -137,3 +140,5 @@ #exitCodes ERROR = 1 NORMAL = 0 + +DUMMY_BRIDGE = 'none-br' diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index 3439dc3..3fdde03 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -25,7 +25,7 @@ import threading import vm -from vdsm.define import ERROR, doneCode, errCode +from vdsm.define import ERROR, doneCode, errCode, DUMMY_BRIDGE from vdsm import utils from vdsm import constants import guestIF @@ -1517,6 +1517,92 @@ return {'status': doneCode, 'vmList': self.status()} + def _updateNetDevice(self, params): + try: + utils.validateMinimalKeySet(params, ('alias', 'linkState')) + except ValueError: + self.log.error('Missing at least one of the required parameters: ' + 'alias, linkState') + return {'status': {'code': errCode['MissParam']['status']['code'], + 'message': 'Missing at least one of required ' + 'parameters: alias, linkState'}} + + dev = None + for dev in self.conf['devices']: + if (dev['type'] == vm.NIC_DEVICES and + dev['alias'] == params['alias']): + break + + if dev is None: + self.log.error('Network device %s cannot be updated. It does not' + 'exist', params['alias']) + return {'status': + {'code': errCode['updateDevice']['status']['code'], + 'message': 'Missing net device'}} + + network = dev['network'] + + # Prepare the updateDevice xml + netelem = xml.dom.minidom.Element(params['type']) + netelem.setAttribute('type', 'bridge') + mac = xml.dom.minidom.Element('mac') + mac.setAttribute('address', dev['macAddr']) + netelem.appendChild(mac) + model = xml.dom.minidom.Element('model') + model.setAttribute('type', dev['nicModel']) + netelem.appendChild(model) + + if 'network' not in params: + # If no network is specified we take the vnic to the dummy bridge + # and set the link 'down' always. + source = xml.dom.minidom.Element('source') + source.setAttribute('bridge', DUMMY_BRIDGE) + netelem.appendChild(source) + link = xml.dom.minidom.Element('link') + link.setAttribute('state', 'down') + netelem.appendChild(link) + else: + # There is a network defined. Thus, we either just modify the link + # status or move between network backends. + source = xml.dom.minidom.Element('source') + source.setAttribute('bridge', network) + netelem.appendChild(source) + link = xml.dom.minidom.Element('link') + if network != params['network']: + # If a different network is specified. First we take the link + # down and then update the device to connect to the new bridge. + link.setAttribute('state', 'down') + netelem.appendChild(link) + try: + self._dom.updateDeviceFlags( + netelem.toxml(), + libvirt.libvirt.VIR_DOMAIN_AFFECT_LIVE) + except: + self.log.debug("updateNetDevice failed", exc_info=True) + return {'status': + {'code': errCode['updateDevice']['status']['code'], + 'message': 'Failed to take the link down.'}} + + link.setAttribute('state', params['linkState']) + source.setAttribute('bridge', params['network']) + + try: + self._dom.updateDeviceFlags( + netelem.toxml(), + libvirt.libvirt.VIR_DOMAIN_AFFECT_LIVE) + except: + self.log.debug("updateNetDeviceFlags failed", exc_info=True) + return {'status': + {'code': errCode['updateDevice']['status']['code'], + 'message': 'Failed to take the link %s' % \ + link.getAttribute('state')}} + + def updateDevice(self, params): + if params['type'] == vm.NIC_DEVICES: + return self._updateNetDevice(params) + else: + return errCode['noimpl'] + def hotunplugNic(self, params): if self.isMigrating(): return errCode['migInProgress'] -- To view, visit http://gerrit.ovirt.org/9562 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b9b4f49f80466a83e3e13f1042ac2a8866c6bcd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

7 94

Change in vdsm[master]: integrate zombie reaper in supervdsmServer
by lvroyce＠linux.vnet.ibm.com 10 Dec '12

10 Dec '12

Royce Lv has uploaded a new change for review. Change subject: integrate zombie reaper in supervdsmServer ...................................................................... integrate zombie reaper in supervdsmServer Integrate zombie reaper in supervdsmServer to reclaim the zombie produced by validateAccess. As python signal handlers only occur between atomic python intepreter instructions, join thread will result in SIGCHLD infinite delay.Change it to a timeout join. Change-Id: Idccc34d8761fb9997cda1184552c6c8f633afbf0 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm/supervdsmServer.py 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/9315/1 diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index 34fefdb..33b22b6 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -56,6 +56,7 @@ import ksm import mkimage from storage.multipath import MPATH_CONF +import zombieReaper _UDEV_RULE_FILE_DIR = "/etc/udev/rules.d/" _UDEV_RULE_FILE_PREFIX = "99-vdsm-" @@ -199,6 +200,7 @@ res, err = pipe.recv() pipe.send("Bye") proc.terminate() + zombieReaper.autoReapPID(proc.pid) if err is not None: raise err @@ -348,6 +350,8 @@ if os.path.exists(address): os.unlink(address) + zombieReaper.registerSignalHandler() + log.debug("Setting up keep alive thread") monThread = threading.Thread(target=__pokeParent, @@ -369,7 +373,13 @@ chown(f, int(uid), METADATA_GROUP) log.debug("Started serving super vdsm object") - servThread.join() + + # Python signal handlers only occur between + # "atomic" instructions of the Python interpreter, + # periodically join server thread, + # to give chance to signal handling + while servThread.isAlive(): + servThread.join(5) finally: if os.path.exists(address): os.unlink(address) -- To view, visit http://gerrit.ovirt.org/9315 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idccc34d8761fb9997cda1184552c6c8f633afbf0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

6 24

Change in vdsm[master]: Nit fixes of supervdsmServer
by lvroyce＠linux.vnet.ibm.com 10 Dec '12

10 Dec '12

Royce Lv has uploaded a new change for review. Change subject: Nit fixes of supervdsmServer ...................................................................... Nit fixes of supervdsmServer use utils.rmFile instead of unlink raise directly will cause TypeError: exceptions must be old-style classes or derived from BaseException, not NoneType. use RuntimeError instead. Change-Id: Ie87c2332ca6342044e0c157231ea8c076ad622cc Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm/supervdsmServer.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/16/9316/1 diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index 34fefdb..06082ee 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -372,8 +372,8 @@ servThread.join() finally: if os.path.exists(address): - os.unlink(address) - raise + utils.rmFile(address) + raise RuntimeError('supervdsmServer exited') except Exception: log.error("Could not start Super Vdsm", exc_info=True) -- To view, visit http://gerrit.ovirt.org/9316 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie87c2332ca6342044e0c157231ea8c076ad622cc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

6 15

Change in vdsm[master]: Add default MTU=1500 to NIC's ifcfg files.
by Igor Lvovsky 08 Dec '12

08 Dec '12

Igor Lvovsky has uploaded a new change for review. Change subject: Add default MTU=1500 to NIC's ifcfg files. ...................................................................... Add default MTU=1500 to NIC's ifcfg files. When we add bridge with custom MTU on top of nic, this MTU will be set properly on interface. But if we'll remove this bridge (including removing of MTU keyword from NIC's ifcfg file) and add instead the bridge with default MTU (without MTU keyword at all in ifcfg file) the actual MTU on the interface will stay as before. The only way to change the actual MTU is add MTU keyword explicitly to ifcfg file. Change-Id: I0553a3956ea06586e0ece758932f00a9af640611 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=873745 Signed-off-by: Igor Lvovsky <ilvovsky(a)redhat.com> --- M vdsm/configNetwork.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/9547/1 diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 75f6e43..570f6b1 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -515,7 +515,7 @@ try: hwlines = [line for line in open(cf).readlines() if line.startswith('HWADDR=')] - l = ['DEVICE=%s\n' % nic, 'ONBOOT=yes\n'] + hwlines + l = ['DEVICE=%s\n' % nic, 'ONBOOT=yes\n', 'MTU=1500\n'] + hwlines open(cf, 'w').writelines(l) except IOError: pass -- To view, visit http://gerrit.ovirt.org/9547 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0553a3956ea06586e0ece758932f00a9af640611 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>

4 8

Change in vdsm[master]: [WIP] add host-cpu to api
by lhornyak＠redhat.com 07 Dec '12

07 Dec '12

Laszlo Hornyak has uploaded a new change for review. Change subject: [WIP] add host-cpu to api ...................................................................... [WIP] add host-cpu to api work in progress Change-Id: Ie9d107deec2f00912878161348ba639eaa6c4f07 Signed-off-by: Laszlo Hornyak <lhornyak(a)redhat.com> --- M vdsm/libvirtvm.py M vdsm_api/vdsmapi-schema.json 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/9367/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index 3439dc3..52a45b4 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -748,6 +748,11 @@ cputune.appendChild(vcpupin) self.dom.appendChild(cputune) + #cpu-host support + # see http://wiki.ovirt.org/wiki/Features/Cpu-host_Support + if 'useHostCpuFlags' in self.conf: + cpu.setAttribute('model', 'host-passthrough') + # This hack is for backward compatibility as the libvirt does not allow # 'qemu64' guest on intel hardware if model == 'qemu64' and not '+svm' in features: diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 843cbc7..b7bed35 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -2412,6 +2412,8 @@ # # @vmType: The type of VM # +# @useHostCpuFlags: use host CPU flags (host-passthrough) in the vcpus +# # Since: 4.10.0 ## {'type': 'VmDefinition', @@ -2425,7 +2427,8 @@ 'pid': 'uint', 'smp': 'uint', '*smpCoresPerSocket': 'uint', '*smpThreadsPerCore': 'uint', 'status': 'VmStatus', 'timeOffset': 'uint', 'transparentHugePages': 'bool', - 'vmId': 'UUID', 'vmName': 'str', 'vmType': 'VmType'}} + 'vmId': 'UUID', 'vmName': 'str', 'vmType': 'VmType', + 'useHostCpuFlags' : 'bool'}} ## # @VmParameters: @@ -2463,6 +2466,8 @@ # # @vmType: The type of VM # +# @useHostCpuFlags: use host CPU flags (host-passthrough) in the vcpus +# # Since: 4.10.0 ## {'type': 'VmParameters', @@ -2472,7 +2477,7 @@ 'nice': 'int', 'smp': 'uint', 'smpCoresPerSocket': 'uint', 'smpThreadsPerCore': 'uint', 'timeOffset': 'uint', 'transparentHugePages': 'bool', 'vmId': 'UUID', 'vmName': 'str', - 'vmType': 'VmType'}} + 'vmType': 'VmType', 'useHostCpuFlags' : 'true'}} ## # @VmInfo: -- To view, visit http://gerrit.ovirt.org/9367 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9d107deec2f00912878161348ba639eaa6c4f07 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <lhornyak(a)redhat.com>

6 27

Change in vdsm[master]: cpu mode support for vdsm
by lhornyak＠redhat.com 07 Dec '12

07 Dec '12

Laszlo Hornyak has uploaded a new change for review. Change subject: cpu mode support for vdsm ...................................................................... cpu mode support for vdsm This patch adds special hostPassthrough and hostModel as cpuType values. If the cpuType is one of these values, the <model> tag will not be created for libvirt, instead, a mode attribute will be crated in the <cpu> tag with value 'host-passthrough' or 'host-model'. Change-Id: I54fb440ef52255f0a7933b000b9b599c2d056021 Signed-off-by: Laszlo Hornyak <lhornyak(a)redhat.com> --- M vdsm/libvirtvm.py M vdsm_api/vdsmapi-schema.json 2 files changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/9507/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index f20968f..465a688 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -721,9 +721,17 @@ model = features[0] cpu = self.doc.createElement('cpu') cpu.setAttribute('match', 'exact') - m = self.doc.createElement('model') - m.appendChild(self.doc.createTextNode(model)) - cpu.appendChild(m) + + #and now for something completely different + if model == 'hostPassthrough': + cpu.setAttribute('mode', 'host-passthrough') + elif model == 'hostModel': + cpu.setAttribute('mode', 'host-model') + else: + m = self.doc.createElement('model') + m.appendChild(self.doc.createTextNode(model)) + cpu.appendChild(m) + if ('smpCoresPerSocket' in self.conf or 'smpThreadsPerCore' in self.conf): topo = self.doc.createElement('topology') diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index aa45059..dbfe153 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -2383,6 +2383,9 @@ # @clientIp: The IP address of the client connected to the display # # @cpuType: The type of CPU being emulated +# special values 'hostPassthrough' and 'hostModel' +# are reserved for host-passthrough and host-mode cpu +# mode # # @custom: A dictionary of custom, free-form properties # -- To view, visit http://gerrit.ovirt.org/9507 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54fb440ef52255f0a7933b000b9b599c2d056021 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <lhornyak(a)redhat.com>

7 26

Change in vdsm[master]: netwiring: [2/3] Add API definitions.
by asegurap＠redhat.com 07 Dec '12

07 Dec '12

Antoni Segura Puimedon has uploaded a new change for review. Change subject: netwiring: [2/3] Add API definitions. ...................................................................... netwiring: [2/3] Add API definitions. Second of the Network Wiring feature patches. It adds the cli support for using the new updateVmDevice feature. Change-Id: I637b3f584e28afc5ada6496abbb6f61aadb8d64f Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M vdsm_cli/vdsClient.py 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/61/9561/1 diff --git a/vdsm_cli/vdsClient.py b/vdsm_cli/vdsClient.py index 8cb78ed..f188825 100644 --- a/vdsm_cli/vdsClient.py +++ b/vdsm_cli/vdsClient.py @@ -205,6 +205,10 @@ return self.ExecAndExit(self.s.create(params)) + def updateVmDevice(self, args): + return self.ExecAndExit(self.s.updateVmDevice(args[0], + self._eqSplit(args[1:]))) + def hotplugNic(self, args): nic = self._parseDriveSpec(args[1]) nic['type'] = 'interface' @@ -1737,6 +1741,16 @@ 'http://libvirt.org/formatdomain.html' '#elementsCPUTuning' )), + 'updateVmDevice': (serv.updateVmDevice, + ('<vmId> <devicespec>', + 'Update a VM\'s device', + 'devicespec parameters list: r=required, o=optional', + 'r type: interface', + 'r network: network name', + 'r linkState: up|down', + 'r alias: libvirt\'s vnic alias', + 'o promisc: <blue|red> - Network traffic to mirror' + )), 'hotplugNic': (serv.hotplugNic, ('<vmId> <nicspec>', 'Hotplug NIC to existing VM', -- To view, visit http://gerrit.ovirt.org/9561 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I637b3f584e28afc5ada6496abbb6f61aadb8d64f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

5 29

Change in vdsm[master]: netwiring: [1/3] Add API definitions.
by asegurap＠redhat.com 07 Dec '12

07 Dec '12

Antoni Segura Puimedon has uploaded a new change for review. Change subject: netwiring: [1/3] Add API definitions. ...................................................................... netwiring: [1/3] Add API definitions. First of the Network Wiring feature patches. It adds the schema definitions as described in: http://wiki.ovirt.org/wiki/Feature/DetailedNetworkWiring#New_API Change-Id: I9d8352f237dbe0229dff368f7c1dfa4f5f8fc766 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M vdsm/BindingXMLRPC.py M vdsm_api/vdsmapi-schema.json 2 files changed, 51 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/60/9560/1 diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py index d460910..60efbdf 100644 --- a/vdsm/BindingXMLRPC.py +++ b/vdsm/BindingXMLRPC.py @@ -262,6 +262,10 @@ vm = API.VM(params['vmId']) return vm.hotunplugNic(params) + def updateVmDevice(self, vmId, params): + vm = API.VM(vmId) + return vm.updateDevice(params) + def vmSnapshot(self, vmId, snapDrives): vm = API.VM(vmId) return vm.snapshot(snapDrives) @@ -789,7 +793,8 @@ (self.vmHotplugDisk, 'hotplugDisk'), (self.vmHotunplugDisk, 'hotunplugDisk'), (self.vmHotplugNic, 'hotplugNic'), - (self.vmHotunplugNic, 'hotunplugNic')) + (self.vmHotunplugNic, 'hotunplugNic'), + (self.updateVmDevice, 'updateVmDevice')) def getIrsMethods(self): return ((self.domainActivate, 'activateStorageDomain'), diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 843cbc7..3818ab7 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -4849,6 +4849,51 @@ 'data': {'hibernationVolHandle': 'HibernationVolumeHandle'}} ## +# @updateVmDeviceParams: +# +# Parameters for @VM.updateVmDevice +# +# @type: The type of device to update. For example 'interface' for network +# devices or 'disk' for disk storage devices. +# +# @alias: Alias used to identify this device in commands. +# +# @network: Name of the bridge the interface will be added to. +# +# @linkState: The state in which the link of the interface will be upon +# successful completion of the api request. The values can be 'up' or 'down'. +# +# @promisc: If present, indicates the traffic of the network which should be +# mirrored to the interface identified by alias. +# +# Since 4.11.0 +## +{'type': 'updateVmDeviceParams', + 'data': {'type': 'str', 'network': 'str', + 'linkState': 'NetworkInterfaceState', 'alias': 'str', 'promisc': ''}} + +## +# @VM.updateVmDevice: +# +# Update the status of a VM's device. +# +# @vmId: The UUID of the VM to modify +# +# @params: The VM UUID and device information. +# +# Returns: +# The VM definition, as updated +# +# Since: 4.11.0 +# +# Notes: +# XXX: Split 'params' into direct parameters +## +{'command': {'class': 'VM', 'name': 'updateVmDevice'}, + 'data': {'vmId': 'UUID', 'params': 'updateVmDeviceParams'}, + 'returns': 'VmDefinition'} + +## # @HotplugNicParams: # # Parameters for @VM.hotplugNic. -- To view, visit http://gerrit.ovirt.org/9560 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d8352f237dbe0229dff368f7c1dfa4f5f8fc766 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

5 28

Change in vdsm[master]: remove redundant import misc
by shaohef＠linux.vnet.ibm.com 06 Dec '12

06 Dec '12

ShaoHe Feng has uploaded a new change for review. Change subject: remove redundant import misc ...................................................................... remove redundant import misc there is already "import storage.misc as misc" Change-Id: Iacb0b7d4510a2f44cdb3041c4ff10293e6878458 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- M vdsm/supervdsmServer.py 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/9372/1 diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index 34fefdb..840fef0 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -47,9 +47,8 @@ from storage.fileUtils import chown, resolveGid, resolveUid from storage.fileUtils import validateAccess as _validateAccess from vdsm.constants import METADATA_GROUP, EXT_UDEVADM, \ - DISKIMAGE_USER, DISKIMAGE_GROUP, P_LIBVIRT_VMCHANNELS + DISKIMAGE_USER, DISKIMAGE_GROUP, P_LIBVIRT_VMCHANNELS from storage.devicemapper import _removeMapping, _getPathsStatus -import storage.misc import configNetwork from vdsm.config import config import tc @@ -216,8 +215,8 @@ @logDecorator def udevTrigger(self, guid): cmd = [EXT_UDEVADM, 'trigger', '--verbose', '--action', 'change', - '--property-match=DM_NAME=%s' % guid] - rc, out, err = storage.misc.execCmd(cmd, sudo=False) + '--property-match=DM_NAME=%s' % guid] + rc, out, err = misc.execCmd(cmd, sudo=False) if rc: raise OSError(errno.EINVAL, "Could not trigger change for device \ %s, out %s\nerr %s" % (guid, out, err)) -- To view, visit http://gerrit.ovirt.org/9372 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iacb0b7d4510a2f44cdb3041c4ff10293e6878458 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>

6 17

Change in vdsm[master]: netwiring: [1/4] Extend vmInterfaceDevice API def
by asegurap＠redhat.com 06 Dec '12

06 Dec '12

Antoni Segura Puimedon has uploaded a new change for review. Change subject: netwiring: [1/4] Extend vmInterfaceDevice API def ...................................................................... netwiring: [1/4] Extend vmInterfaceDevice API def This patch extends the definitions of vmInterfaceDevice in order to allow vmHotplugNic and vmCreate to set a vnic link status as well as set portMirroring for it. Change-Id: I4ef8ad6963682a38d5f65d718e5b2a465ef3af82 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M vdsm_api/vdsmapi-schema.json 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/9599/1 diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 843cbc7..2c02804 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -1980,6 +1980,11 @@ # # @specParams: #optional Additional device parameters # +# @linkActive: #optional Whether the VM network card has its link active (up) +# or not (down). If omitted, the link will be active +# @portMirroring: #optional If present, indicates the traffic of which networks +# should be mirrored to the interface. +# # Since: 4.10.0 ## {'type': 'VmInterfaceDevice', @@ -1987,7 +1992,8 @@ 'nicModel': 'VmInterfaceDeviceModel', 'macAddr': 'str', 'network': 'str', '*bootOrder': 'uint', 'address': 'VmDeviceAddress', 'alias': 'str', 'deviceId': 'UUID', - '*specParams': 'VmInterfaceDeviceSpecParams'}} + '*specParams': 'VmInterfaceDeviceSpecParams', '*linkActive': 'bool', + '*portMirroring': ['str']}} ## # @VmVideoDeviceType: -- To view, visit http://gerrit.ovirt.org/9599 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ef8ad6963682a38d5f65d718e5b2a465ef3af82 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

4 9

Change in vdsm[master]: vdsm.spec: Move mom requirement to Fedora condition
by Douglas Schilling Landgraf 06 Dec '12

06 Dec '12

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: vdsm.spec: Move mom requirement to Fedora condition ...................................................................... vdsm.spec: Move mom requirement to Fedora condition Mom requirement is based on oVirt 3.2, let's move it to Fedora packages requirements at this moment. Change-Id: Ib4788b4fcac2e8354422a5b57038046538fd97d9 Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M vdsm.spec.in 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/9515/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index eebe535..bb122fa 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -120,6 +120,7 @@ Requires: sed >= 4.2.1-10 Requires: selinux-policy-targeted >= 3.10.0-149 Requires: lvm2 >= 2.02.95 +Requires: mom >= 0.3.0 %endif Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client @@ -134,7 +135,6 @@ Requires: libselinux-python Requires: %{name}-python = %{version}-%{release} Requires: pyparted -Requires: mom >= 0.3.0 Requires(pre,preun): policycoreutils-python Requires(post): /usr/sbin/saslpasswd2 -- To view, visit http://gerrit.ovirt.org/9515 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4788b4fcac2e8354422a5b57038046538fd97d9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

4 12

Change in vdsm[master]: sdcache: add refresh to connectStoragePool
by Federico Simoncelli 06 Dec '12

06 Dec '12

Federico Simoncelli has uploaded a new change for review. Change subject: sdcache: add refresh to connectStoragePool ...................................................................... sdcache: add refresh to connectStoragePool Change-Id: I2d3adcff7bb0e97be5c797cd720c6353920d9db0 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/22/9422/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index ac5e1db..2577db7 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -640,6 +640,7 @@ self.scsiKey = scsiKey # Make sure SDCache doesn't have stale data (it can be in case of FC) sdCache.invalidateStorage() + sdCache.refresh() # Rebuild whole Pool self.__rebuild(msdUUID=msdUUID, masterVersion=masterVersion) self.__createMailboxMonitor() -- To view, visit http://gerrit.ovirt.org/9422 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d3adcff7bb0e97be5c797cd720c6353920d9db0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

5 15

Change in vdsm[master]: vm: increase the volume extension on storage migration
by Federico Simoncelli 05 Dec '12

05 Dec '12

Federico Simoncelli has uploaded a new change for review. Change subject: vm: increase the volume extension on storage migration ...................................................................... vm: increase the volume extension on storage migration During live migration VDSM needs to subsequently extend two volumes instead of one; doubling the size of the chunk to extend the watermark limit is doubled and VDSM has more time to accomplish the operations. Change-Id: Ib61375613712feb7118a80c50b73e678d257f251 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/libvirtvm.py M vdsm/vm.py 2 files changed, 15 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/9200/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index ca31a43..5f525bf 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -108,7 +108,7 @@ capacity, alloc, physical = \ self._vm._dom.blockInfo(vmDrive.path, 0) - if physical - alloc >= self._vm._MIN_DISK_REMAIN: + if physical - alloc >= vmDrive.watermarkLimit: continue self._log.info('%s/%s apparent: %s capacity: %s, alloc: %s, ' @@ -1024,6 +1024,9 @@ class Drive(LibvirtVmDevice): + VOLWM_CHUNK_MB = config.getint('irs', 'volume_utilization_chunk_mb') + VOLWM_FREE_PCT = 100 - config.getint('irs', 'volume_utilization_percent') + VOLWM_CHUNK_LSM_MULT = 2 # Chunk multiplier during live storage migration def __init__(self, conf, log, **kwargs): if not kwargs.get('serial'): @@ -1041,6 +1044,16 @@ self._blockDev = None self._customize() + + @property + def volExtensionChunk(self): + if hasattr(self, "diskReplicate"): + return self.VOLWM_CHUNK_MB * self.VOLWM_CHUNK_LSM_MULT + return self.VOLWM_CHUNK_MB + + @property + def watermarkLimit(self): + return self.VOLWM_FREE_PCT * self.volExtensionChunk * (2 ** 20 / 100) @property def blockDev(self): @@ -1195,12 +1208,6 @@ self._qemuguestSocketFile = (constants.P_LIBVIRT_VMCHANNELS + self.conf['vmName'].encode('utf-8') + '.' + _QEMU_GA_DEVICE_NAME) - # TODO find a better idea how to calculate this constant only after - # config is initialized - self._MIN_DISK_REMAIN = \ - ((100 - config.getint('irs', 'volume_utilization_percent')) * - config.getint('irs', 'volume_utilization_chunk_mb') * - 2 ** 20 / 100) self._lastXMLDesc = '<domain><uuid>%s</uuid></domain>' % self.id self._devXmlHash = '0' self._released = False diff --git a/vdsm/vm.py b/vdsm/vm.py index 7a421bf..8661911 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -800,7 +800,7 @@ if newSize is None: # newSize is always in megabytes - newSize = (config.getint('irs', 'volume_utilization_chunk_mb') + + newSize = (vmDrive.volExtensionChunk + ((vmDrive.apparentsize + constants.MEGAB - 1) / constants.MEGAB)) -- To view, visit http://gerrit.ovirt.org/9200 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib61375613712feb7118a80c50b73e678d257f251 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

4 14

Change in vdsm[master]: Specify the ACPI flag when shutting down VMs
by Federico Simoncelli 05 Dec '12

05 Dec '12

Federico Simoncelli has uploaded a new change for review. Change subject: Specify the ACPI flag when shutting down VMs ...................................................................... Specify the ACPI flag when shutting down VMs In commit e460308 has been introduced the qemu guest agent support. When such agent channel is present the default shutdown method uses the guest agent (which might be missing). For consistency and to maintain the old behavior we should specify to use ACPI to shutdown the guest. Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> Change-Id: I6ca628ce6f4a5c7f6a937a14b12a5078b32e89dd --- M vdsm/libvirtvm.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/6996/1 -- To view, visit http://gerrit.ovirt.org/6996 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ca628ce6f4a5c7f6a937a14b12a5078b32e89dd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

4 26

Change in vdsm[master]: Remove Pool.isMember() function.
by ewarszaw＠redhat.com 04 Dec '12

04 Dec '12

Eduardo has uploaded a new change for review. Change subject: Remove Pool.isMember() function. ...................................................................... Remove Pool.isMember() function. Related to BZ#878894. Change-Id: I648c22f4914ed3d13994b7c5049fc6083f02633f Signed-off-by: Eduardo <ewarszaw(a)redhat.com> --- M vdsm/storage/hsm.py M vdsm/storage/sp.py 2 files changed, 3 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/9454/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 358876d..e47eee1 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -269,8 +269,10 @@ @classmethod def validatePoolSD(cls, spUUID, sdUUID): - if not cls.getPool(spUUID).isMember(sdUUID): + pool = cls.getPool(spUUID) + if sdUUID not in pool.getDomains(): raise se.StorageDomainNotMemberOfPool(spUUID, sdUUID) + return pool @classmethod def validateNonDomain(cls, sdUUID): diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index ac5e1db..25134d5 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1618,13 +1618,6 @@ return domainslist @unsecured - def isMember(self, sdUUID, checkActive=False): - """ - Check if domain is member in the pool. - """ - return sdUUID in self.getDomains(activeOnly=checkActive) - - @unsecured def isActive(self, sdUUID): return sdUUID in self.getDomains(activeOnly=True) -- To view, visit http://gerrit.ovirt.org/9454 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I648c22f4914ed3d13994b7c5049fc6083f02633f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

5 7

Change in vdsm[master]: mailbox: daemonize the hsm mailbox thread
by Federico Simoncelli 04 Dec '12

04 Dec '12

Federico Simoncelli has uploaded a new change for review. Change subject: mailbox: daemonize the hsm mailbox thread ...................................................................... mailbox: daemonize the hsm mailbox thread In order to successfully complete a prepareForShutdown command instead of waiting for a faulty mailbox thread to end, the thread has been daemonized. Change-Id: I416b42f46e67cecedbcd0ec4ead069279dd6935b Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/storage/storage_mailbox.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/9559/1 diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py index c74fccc..991509f 100644 --- a/vdsm/storage/storage_mailbox.py +++ b/vdsm/storage/storage_mailbox.py @@ -243,6 +243,7 @@ self._msgCounter = 0 self._sendMail() # Clear outgoing mailbox threading.Thread.__init__(self) + self.daemon = True self.start() def _initMailbox(self): -- To view, visit http://gerrit.ovirt.org/9559 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I416b42f46e67cecedbcd0ec4ead069279dd6935b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

4 9

Change in vdsm[master]: upgrade: skip volume lease for faulty metadata offsets
by Federico Simoncelli 04 Dec '12

04 Dec '12

Federico Simoncelli has uploaded a new change for review. Change subject: upgrade: skip volume lease for faulty metadata offsets ...................................................................... upgrade: skip volume lease for faulty metadata offsets This check has been added to overcome bz882276 (during the domain upgrade). Few vdsm releases (4.9 prior 496c0c3) generated metadata offsets higher than 2048 - 100 - 1 that would not permit sanlock to store the volume resource in the leases LV. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=882276 Change-Id: Ic84108d4fbe0dfee9fe1d57c802f99dd937cd8ec Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/storage/imageRepository/formatConverter.py 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/9600/1 diff --git a/vdsm/storage/imageRepository/formatConverter.py b/vdsm/storage/imageRepository/formatConverter.py index cd32a62..a0edaab 100644 --- a/vdsm/storage/imageRepository/formatConverter.py +++ b/vdsm/storage/imageRepository/formatConverter.py @@ -18,7 +18,9 @@ # Refer to the README and COPYING files for full details of the license # +import errno import logging +import sanlock from vdsm import qemuImg @@ -27,6 +29,10 @@ from storage import image from storage import safelease from storage import volume +from storage import blockVolume + + +BLKVOL_MAX_OFFSET = sd.LEASES_SIZE - blockVolume.RESERVED_LEASES - 1 def __convertDomainMetadataToTags(domain, targetVersion): @@ -153,7 +159,23 @@ log.debug("Creating the volume lease for %s", volUUID) metaId = vol.getMetadataId() - vol.newVolumeLease(metaId, domain.sdUUID, volUUID) + + try: + vol.newVolumeLease(metaId, domain.sdUUID, volUUID) + except sanlock.SanlockException, e: + metaOffset = (vol.getMetaOffset() + if hasattr(vol, "getMetaOffset") else 0 + # This check has been added to overcome BZ#882276 (during + # the domain upgrade). Few vdsm releases (4.9 prior 496c0c3) + # generated metadata offsets higher than 2048 - 100 - 1 that + # would not permit sanlock to store the volume resource in + # the leases LV. + if e.errno == errno.ENOSPC and metaOffset > BLKVOL_MAX_OFFSET: + log.error("The volume lease for %s has not been " + "initialized due bz882276, metadata offset " + "too high: %s", volUUID, metaOffset) + else: + raise # If this volume is used as a template let's update the other # volume's permissions and share the volume lease (at the moment -- To view, visit http://gerrit.ovirt.org/9600 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic84108d4fbe0dfee9fe1d57c802f99dd937cd8ec Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

1 2

Change in vdsm[master]: Fix return value of shutdown() on failure
by wudxw＠linux.vnet.ibm.com 04 Dec '12

04 Dec '12

Mark Wu has uploaded a new change for review. Change subject: Fix return value of shutdown() on failure ...................................................................... Fix return value of shutdown() on failure Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- M vdsm/vm.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/34/5434/1 -- To view, visit http://gerrit.ovirt.org/5434 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>

8 17

Change in vdsm[master]: concurrency: Vdscli uses a new HTTP conn per req.
by asegurap＠redhat.com 04 Dec '12

04 Dec '12

Antoni Segura Puimedon has uploaded a new change for review. Change subject: concurrency: Vdscli uses a new HTTP conn per req. ...................................................................... concurrency: Vdscli uses a new HTTP conn per req. Python-2.7 changed xmlrpclib's implementation detail of spawining a new http/https connection per each request to add support for Keepalive. Unfortunately, this implementation detail was also what made the xmlrpclib's Transport be thread-safe. This change reverts the change in Transport, thus mantaining the thread-safety of our python client code for unencrypted communications. Change-Id: Ifb08df759051bb340423958280e88df5792e9ed2 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M vdsm_cli/vdscli.py.in 1 file changed, 21 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/9329/1 diff --git a/vdsm_cli/vdscli.py.in b/vdsm_cli/vdscli.py.in index 2af41b7..9d5d8a3 100644 --- a/vdsm_cli/vdscli.py.in +++ b/vdsm_cli/vdscli.py.in @@ -19,7 +19,8 @@ # Refer to the README and COPYING files for full details of the license # -import xmlrpclib +from xmlrpclib import Server, ServerProxy, Transport +import httplib import subprocess import os from vdsm import SecureXMLRPCServer @@ -28,6 +29,21 @@ d_tsPath = '@TRUSTSTORE@' d_addr = '0' d_port = '54321' + + +class SingleRequestTransport(Transport): + '''Python 2.7 Transport introduced a change that makes it reuse connections + by default when new connections are requested for a host with an existing + connection. This class reverts the change to avoid the concurrency + issues.''' + + def make_connection(self, host): + '''Creates a new HTTPConnection to the host.''' + # create a HTTP connection object from a host descriptor + chost, self._extra_headers, x509 = self.get_host_info(host) + #store the host argument along with the connection object + self._connection = host, httplib.HTTPConnection(chost) + return self._connection[1] def __guessDefaults(): @@ -109,10 +125,11 @@ transport = TransportClass(key_file=KEYFILE, cert_file=CERTFILE, ca_certs=CACERT) - server = xmlrpclib.ServerProxy('https://%s' % addrport, - transport=transport) + server = ServerProxy('https://%s' % addrport, + transport=transport) else: - server = xmlrpclib.Server('http://%s' % addrport) + server = Server('http://%s' % addrport, + transport=SingleRequestTransport(use_datetime=0)) return server if __name__ == '__main__': -- To view, visit http://gerrit.ovirt.org/9329 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb08df759051bb340423958280e88df5792e9ed2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

3 14

Change in vdsm[master]: use default libvirt event handler impl
by lvroyce＠linux.vnet.ibm.com 04 Dec '12

04 Dec '12

Royce Lv has uploaded a new change for review. Change subject: use default libvirt event handler impl ...................................................................... use default libvirt event handler impl use default libvirt event handler implementation and event loop add setKeepAlive to avoid some buggy condition in libvirt connection Change-Id: I735d6b1f856b5a5b216d2dddf629c5ec80e8b7e7 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm/libvirtconnection.py M vdsm/libvirtev.py 2 files changed, 23 insertions(+), 486 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/5015/1 -- To view, visit http://gerrit.ovirt.org/5015 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I735d6b1f856b5a5b216d2dddf629c5ec80e8b7e7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

6 27

Change in vdsm[master]: Fix block volume atomicity creation issue.
by ewarszaw＠redhat.com 04 Dec '12

04 Dec '12

Hello Ayal Baron, Haim Ateya, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/9358 to review the following change. Change subject: Fix block volume atomicity creation issue. ...................................................................... Fix block volume atomicity creation issue. BlockVolume creation is a 2 step process where first an LV is created and then tags are added to it. If another host refreshes it's cache between the 2 commands it will have an LV with partial data on it. To solve this issue, we add an initial tag to the lvcreate command so that any other host would be able to identify this volume as incomplete and ignore it. Special LVs still have not MD tags. Bug-uri: https://bugzilla.redhat.com/show_bug.cgi?id=876558 Change-Id: I40cd67e563935de663d938cbc1bc9cf152802448 Signed-off-by: Eduardo <ewarszaw(a)redhat.com> Reviewed-on: https://gerrit.eng.lab.tlv.redhat.com/3299 Reviewed-by: Ayal Baron <abaron(a)redhat.com> Tested-by: Haim Ateya <hateya(a)redhat.com> --- M vdsm/storage/blockVolume.py 1 file changed, 29 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/58/9358/1 diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index 98c471b..692f8cd 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -20,6 +20,7 @@ import os import threading +import logging import sanlock from vdsm.config import config @@ -42,6 +43,7 @@ TAG_PREFIX_MDNUMBLKS = "MS_" TAG_PREFIX_IMAGE = "IU_" TAG_PREFIX_PARENT = "PU_" +TAG_VOL_UNINIT = "RHAT_VOL_INITIALIZING" VOLUME_TAGS = [TAG_PREFIX_PARENT, TAG_PREFIX_IMAGE, TAG_PREFIX_MD, @@ -58,6 +60,7 @@ # - 2..100 (Unassigned) RESERVED_LEASES = 100 +log = logging.getLogger('Storage.Volume') rmanager = rm.ResourceManager.getInstance() @@ -159,7 +162,8 @@ else: volSize = "%s" % (size / 2 / 1024) - lvm.createLV(dom.sdUUID, volUUID, volSize, activate=True) + lvm.createLV(dom.sdUUID, volUUID, volSize, activate=True, + initialTag=TAG_VOL_UNINIT) fileUtils.safeUnlink(volPath) os.symlink(lvm.lvPath(dom.sdUUID, volUUID), volPath) @@ -180,11 +184,11 @@ with cls._tagCreateLock: mdSlot = dom.mapMetaOffset(volUUID, VOLUME_MDNUMBLKS) - lvm.addLVTags(dom.sdUUID, volUUID, ( - "%s%s" % (TAG_PREFIX_MD, mdSlot), - "%s%s" % (TAG_PREFIX_PARENT, srcVolUUID,), - "%s%s" % (TAG_PREFIX_IMAGE, imgUUID,) - )) + mdTags = ["%s%s" % (TAG_PREFIX_MD, mdSlot), + "%s%s" % (TAG_PREFIX_PARENT, srcVolUUID), + "%s%s" % (TAG_PREFIX_IMAGE, imgUUID)] + lvm.changeLVTags(dom.sdUUID, volUUID, delTags=[TAG_VOL_UNINIT], + addTags=mdTags) try: lvm.deactivateLVs(dom.sdUUID, volUUID) @@ -541,13 +545,15 @@ def getMetaOffset(self): if self.metaoff: return self.metaoff - l = lvm.getLV(self.sdUUID, self.volUUID).tags - for t in l: - if t.startswith(TAG_PREFIX_MD): - return int(t[3:]) - self.log.error("missing offset tag on volume %s", self.volUUID) - raise se.VolumeMetadataReadError("missing offset tag on volume %s" - % self.volUUID) + try: + md = _getVolumeTag(self.sdUUID, self.volUUID, TAG_PREFIX_MD) + except se.MissingTagOnLogicalVolume: + self.log.error("missing offset tag on volume %s/%s", + self.sdUUID, self.volUUID, exc_info=True) + raise se.VolumeMetadataReadError("missing offset tag on volume" + "%s/%s" % (self.sdUUID, self.volUUID)) + else: + return int(md) def getMetadataId(self): """ @@ -633,7 +639,16 @@ def _getVolumeTag(sdUUID, volUUID, tagPrefix): - for tag in lvm.getLV(sdUUID, volUUID).tags: + tags = lvm.getLV(sdUUID, volUUID).tags + if TAG_VOL_UNINIT in tags: + log.warning("Reloading unfinished volume %s/%s", sdUUID, volUUID) + lvm.invalidateVG(sdUUID) + tags = lvm.getLV(sdUUID, volUUID).tags + if TAG_VOL_UNINIT in tags: + log.error("Unfinished volume %s/%s", sdUUID, volUUID) + raise se.VolumeDoesNotExist("%s/%s" % (sdUUID, volUUID)) + + for tag in tags: if tag.startswith(tagPrefix): return tag[len(tagPrefix):] -- To view, visit http://gerrit.ovirt.org/9358 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I40cd67e563935de663d938cbc1bc9cf152802448 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Haim Ateya <hateya(a)redhat.com>

6 21

Change in vdsm[master]: bz#849886 allow multilib in bootstrap when download package
by lvroyce＠linux.vnet.ibm.com 03 Dec '12

03 Dec '12

Royce Lv has uploaded a new change for review. Change subject: bz#849886 allow multilib in bootstrap when download package ...................................................................... bz#849886 allow multilib in bootstrap when download package Change-Id: Id0574afc94c038f7b53b890bae875cf66d9b58f1 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vds_bootstrap/vds_bootstrap.py M vdsm_reg/deployUtil.py.in 2 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/7383/1 diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py index 8211c81..59230f2 100755 --- a/vds_bootstrap/vds_bootstrap.py +++ b/vds_bootstrap/vds_bootstrap.py @@ -443,9 +443,10 @@ def _installPackage(self, pack, type, update=0): nReturn = 0 + option = "--setopt=protected_multilib=false" logging.debug('Installing %s %d',pack, update ) if type == "REQ" or type == "DEVEL": - self.res, self.message = deployUtil.installAndVerify(type, pack, "install") + self.res, self.message = deployUtil.installAndVerify(type, pack, "install", option) res = "OK" if not self.res: res = "FAIL" @@ -456,7 +457,7 @@ if update == 1: yumcmd = "update" - self.res, self.message = deployUtil.installAndVerify(type, pack, yumcmd) + self.res, self.message = deployUtil.installAndVerify(type, pack, yumcmd, option) res = "OK" if not self.res: res = "FAIL" @@ -468,7 +469,7 @@ yumcmd = "update" self.res, self.message = deployUtil.installAndVerify(type, pack, - yumcmd) + yumcmd, option) res = "OK" if not self.res: res = "FAIL" diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in index e22bfb5..af37547 100644 --- a/vdsm_reg/deployUtil.py.in +++ b/vdsm_reg/deployUtil.py.in @@ -1015,7 +1015,7 @@ """ execFunc = [EX_YUM, "-y"] if args is not None: - execFunc += args + execFunc.append(args) if action == "install": execFunc.append(action) @@ -1033,7 +1033,7 @@ a package, and then verify it. """ fReturn = True - out, err, ret = yumInstallDeleteUpdate(pckgName, action, args=None) + out, err, ret = yumInstallDeleteUpdate(pckgName, action, args) msg = None if not ret: fReturn, msg = getPackageInfo(pckgType, pckgName, 'install') -- To view, visit http://gerrit.ovirt.org/7383 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id0574afc94c038f7b53b890bae875cf66d9b58f1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

2 2

Change in vdsm[master]: vdsm-tool: add the sebool configuration module
by Federico Simoncelli 03 Dec '12

03 Dec '12

Federico Simoncelli has uploaded a new change for review. Change subject: vdsm-tool: add the sebool configuration module ...................................................................... vdsm-tool: add the sebool configuration module This patch moves the sebool configuration from a shell scriptlet in the rpm package to the vdsm-tool command. Change-Id: I01baf1c17f7cad2a0525b261be6b5ac648576252 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm-tool/Makefile.am A vdsm-tool/seboolsetup.py M vdsm.spec.in 3 files changed, 69 insertions(+), 36 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/9362/1 diff --git a/vdsm-tool/Makefile.am b/vdsm-tool/Makefile.am index 997e339..348940e 100644 --- a/vdsm-tool/Makefile.am +++ b/vdsm-tool/Makefile.am @@ -29,5 +29,6 @@ __init__.py \ load_needed_modules.py \ passwd.py \ + seboolsetup.py \ validate_ovirt_certs.py \ $(NULL) diff --git a/vdsm-tool/seboolsetup.py b/vdsm-tool/seboolsetup.py new file mode 100644 index 0000000..dee1e58 --- /dev/null +++ b/vdsm-tool/seboolsetup.py @@ -0,0 +1,63 @@ +# +# Copyright 2012 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 seobject +from vdsm.tool import expose + +SEBOOL_ENABLED = "on" +SEBOOL_DISABLED = "off" + +VDSM_SEBOOL_LIST = [ + "virt_use_fusefs", + "virt_use_nfs", + "virt_use_samba", + "sanlock_use_fusefs", + "sanlock_use_nfs", + "sanlock_use_samba", + "virt_use_sanlock", +] + + +def setup_booleans(status): + sebool_obj = seobject.booleanRecords() + sebool_status = sebool_obj.get_all() + + sebool_obj.start() + + for sebool_variable in VDSM_SEBOOL_LIST: + if status and not all(sebool_status[sebool_variable]): + sebool_obj.modify(sebool_variable, SEBOOL_ENABLED) + + if not status and any(sebool_status[sebool_variable]): + sebool_obj.modify(sebool_variable, SEBOOL_DISABLED) + + sebool_obj.finish() + + +@expose("sebool-enable") +def sebool_enable(): + """Enable the required selinux booleans""" + setup_booleans(True) + + +@expose("sebool-disable") +def sebool_disable(): + """Disable the required selinux booleans""" + setup_booleans(False) diff --git a/vdsm.spec.in b/vdsm.spec.in index 3fa3395..033ce1a 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -456,30 +456,8 @@ /usr/sbin/usermod -a -G %{qemu_group},%{snlk_group} %{vdsm_user} /usr/sbin/usermod -a -G %{qemu_group},%{vdsm_group} %{snlk_user} -# vdsm makes extensive use of nfs-exported images -# The next lines will collect the default selinux behaviour for the booleans -virtNFS=$(/usr/sbin/semanage boolean -l | /bin/grep virt_use_nfs | cut -d ',' -f 2) -virtSANLOCK=$(/usr/sbin/semanage boolean -l | /bin/grep virt_use_sanlock | cut -d ',' -f 2) -snlkNFS=$(/usr/sbin/semanage boolean -l | /bin/grep sanlock_use_nfs | cut -d ',' -f 2) - -# Set the booleans and persist it across reboots -if [[ "${virtNFS}" == *off* || "${virtSANLOCK}" == *off* || \ - "${snlkNFS}" == *off* ]]; then - /usr/sbin/semanage boolean -m -S targeted -F /dev/stdin << _EOF -virt_use_nfs=1 -virt_use_sanlock=1 -sanlock_use_nfs=1 -_EOF -fi - -# Set the current state of SELinux booleans -if /usr/sbin/selinuxenabled; then - /usr/sbin/setsebool virt_use_nfs on - /usr/sbin/setsebool virt_use_sanlock on - /usr/sbin/setsebool sanlock_use_nfs on -fi - %post +%{_bindir}/vdsm-tool sebool-enable # set the vdsm "secret" password for libvirt %{_bindir}/vdsm-tool set-saslpasswd @@ -521,17 +499,7 @@ /bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \ /etc/sysctl.conf - /usr/sbin/semanage boolean -m -S targeted -F /dev/stdin << _EOF -virt_use_nfs=0 -virt_use_sanlock=0 -sanlock_use_nfs=0 -_EOF - - if /usr/sbin/selinuxenabled; then - /usr/sbin/setsebool virt_use_nfs off - /usr/sbin/setsebool virt_use_sanlock off - /usr/sbin/setsebool sanlock_use_nfs off - fi + %{_bindir}/vdsm-tool sebool-disable /usr/sbin/saslpasswd2 -p -a libvirt -d vdsm@ovirt @@ -794,9 +762,10 @@ %{python_sitearch}/%{vdsm_name}/betterPopen/__init__.py* %{python_sitearch}/%{vdsm_name}/betterPopen/createprocess.so %{python_sitearch}/%{vdsm_name}/tool/__init__.py* -%{python_sitearch}/%{vdsm_name}/tool/passwd.py* -%{python_sitearch}/%{vdsm_name}/tool/validate_ovirt_certs.py* %{python_sitearch}/%{vdsm_name}/tool/load_needed_modules.py* +%{python_sitearch}/%{vdsm_name}/tool/passwd.py* +%{python_sitearch}/%{vdsm_name}/tool/seboolsetup.py* +%{python_sitearch}/%{vdsm_name}/tool/validate_ovirt_certs.py* %files tests %doc %{_datadir}/%{vdsm_name}/tests/README -- To view, visit http://gerrit.ovirt.org/9362 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01baf1c17f7cad2a0525b261be6b5ac648576252 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

4 13

Change in vdsm[master]: Skip mountTests:MountTests.testLoopMount test if mkfs.ext2 i...
by smizrahi＠redhat.com 03 Dec '12

03 Dec '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Skip mountTests:MountTests.testLoopMount test if mkfs.ext2 is not installed ...................................................................... Skip mountTests:MountTests.testLoopMount test if mkfs.ext2 is not installed Change-Id: I7fef7122157dd69f725d793332956a81845dd991 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M tests/mountTests.py 1 file changed, 22 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/9593/1 diff --git a/tests/mountTests.py b/tests/mountTests.py index d9b64f2..6a914e0 100644 --- a/tests/mountTests.py +++ b/tests/mountTests.py @@ -19,14 +19,17 @@ # from contextlib import contextmanager -from storage.misc import execCmd -import storage.mount as mount -from testValidation import checkSudo - -from testrunner import VdsmTestCase as TestCaseBase +import errno from tempfile import mkstemp, mkdtemp import os import shutil + +from nose.plugins.skip import SkipTest + +from testrunner import VdsmTestCase as TestCaseBase +from storage.misc import execCmd +import storage.mount as mount +from testValidation import checkSudo FLOPPY_SIZE = (2 ** 20) * 4 @@ -52,11 +55,17 @@ checkSudo(["mount", "-o", "loop", "somefile", "target"]) checkSudo(["umount", "target"]) mpath = mkdtemp() - with createFloppyImage(FLOPPY_SIZE) as path: - m = mount.Mount(path, mpath) - m.mount(mntOpts="loop") - try: - self.assertTrue(m.isMounted()) - finally: - m.umount() - shutil.rmtree(mpath) + try: + with createFloppyImage(FLOPPY_SIZE) as path: + m = mount.Mount(path, mpath) + m.mount(mntOpts="loop") + try: + self.assertTrue(m.isMounted()) + finally: + m.umount() + shutil.rmtree(mpath) + except OSError as e: + if e.errno == errno.ENOENT: + raise SkipTest("cannot execute mkfs.ext2") + + raise -- To view, visit http://gerrit.ovirt.org/9593 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fef7122157dd69f725d793332956a81845dd991 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

2 6

Change in vdsm[master]: Properly raise OSError in betterPopen
by smizrahi＠redhat.com 03 Dec '12

03 Dec '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Properly raise OSError in betterPopen ...................................................................... Properly raise OSError in betterPopen Change-Id: I2429093229aa1f98263b1d9eb1b5557d49ce52fd Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/betterPopen/createprocess.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/9592/1 diff --git a/vdsm/betterPopen/createprocess.c b/vdsm/betterPopen/createprocess.c index a57cbae..499bed6 100644 --- a/vdsm/betterPopen/createprocess.c +++ b/vdsm/betterPopen/createprocess.c @@ -289,7 +289,8 @@ safeClose(errnofd[1]); errnofd[1] = -1; if (read(errnofd[0], &childErrno, sizeof(int)) == sizeof(int)) { - PyErr_SetString(PyExc_OSError, strerror(childErrno)); + errno = childErrno; + PyErr_SetFromErrno(PyExc_OSError); goto fail; } -- To view, visit http://gerrit.ovirt.org/9592 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2429093229aa1f98263b1d9eb1b5557d49ce52fd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

2 4

Change in vdsm[master]: Move guest agent timeout config reading to clientIF.__init__
by smizrahi＠redhat.com 03 Dec '12

03 Dec '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Move guest agent timeout config reading to clientIF.__init__ ...................................................................... Move guest agent timeout config reading to clientIF.__init__ Change-Id: Id6138f2b47934cb8afc89cd9a2d14867d9db03a9 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/clientIF.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/9396/1 diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index 82603af..73fe3c0 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -66,6 +66,7 @@ :param log: a log object to be used for this object's logging. :type log: :class:`logging.Logger` """ + self.guestAgentTimeout = config.getint('vars', 'guest_agent_timeout') self.vmContainerLock = threading.Lock() self._networkSemaphore = threading.Semaphore() self._shutdownSemaphore = threading.Semaphore() @@ -100,8 +101,7 @@ self._prepareMOM() threading.Thread(target=self._recoverExistingVms, name='clientIFinit').start() - self.channelListener.settimeout( - config.getint('vars', 'guest_agent_timeout')) + self.channelListener.settimeout(self.guestAgentTimeout) self.channelListener.start() self.threadLocal = threading.local() self.threadLocal.client = '' -- To view, visit http://gerrit.ovirt.org/9396 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6138f2b47934cb8afc89cd9a2d14867d9db03a9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

3 5

Change in vdsm[master]: fix error handling for misc.NoIntrPoll
by lvroyce＠linux.vnet.ibm.com 03 Dec '12

03 Dec '12

Royce Lv has uploaded a new change for review. Change subject: fix error handling for misc.NoIntrPoll ...................................................................... fix error handling for misc.NoIntrPoll when recieving signal, poll() raise select.error fix this to misc.NoIntrPoll to avoid exception Found in: http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/170/ Change-Id: I272654a9006fdab77e5fab608ac287416d75843e Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M tests/miscTests.py M vdsm/storage/misc.py 2 files changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/58/9458/1 diff --git a/tests/miscTests.py b/tests/miscTests.py index fb37b72..d47c883 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -22,6 +22,8 @@ import uuid import time import threading +import select +import signal from testrunner import VdsmTestCase as TestCaseBase import inspect from vdsm import utils @@ -1117,3 +1119,19 @@ return misc.findCaller() self.assertRaises(AssertionError, self._assertFindCaller, _foo) + + +class NoIntrPollTests(TestCaseBase): + def testNoIntr(self): + def fakeSigchld(): + for i in range(5): + time.sleep(1) + os.kill(os.getpid(), signal.SIGCHLD) + + intrThread = threading.Thread(target=fakeSigchld) + intrThread.setDaemon(True) + intrThread.start() + poller = select.poll() + tempFd, tempPath = tempfile.mkstemp() + poller.register(tempFd, select.POLLERR) + misc.NoIntrPoll(poller.poll, 10000) diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index 6360dcf..d2ac851 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -1346,8 +1346,8 @@ while True: try: return pollfun(timeout) - except (OSError, IOError), e: - if not e.errno in (errno.EINTR, errno.EAGAIN): + except (os.error, select.error), e: + if e.args[0] != errno.EINTR: raise timeout = max(0, endtime - time.time()) -- To view, visit http://gerrit.ovirt.org/9458 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I272654a9006fdab77e5fab608ac287416d75843e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

6 18

Change in vdsm[master]: added glusterVolumeProfileInfo verb
by tjeyasin＠redhat.com 03 Dec '12

03 Dec '12

Hello Bala.FA, Saggi Mizrahi, Dan Kenigsberg, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/7436 to review the following change. Change subject: added glusterVolumeProfileInfo verb ...................................................................... added glusterVolumeProfileInfo verb Following is the output structure { 'statusCode' : CODE, 'volumeName' : VOLUME-NAME, 'brickCount' : BRICK-COUNT, 'bricks' : { BRICK-NAME: { 'cumulativeStats': { 'blockStat': [ { 'size': SIZE, 'read': READ-COUNT, 'write': WRITE-COUNT }, ...], 'fopStat': [ { 'name': FOP-NAME, 'hits': HITS, 'latencyAvg': AVERAGE-LATENCY, 'latencyMin': MINIMUM-LATENCY, 'latencyMax': MAXIMUM-LATENCY }, ...], 'duration': DURATION, 'totalRead': TOTAL-READ, 'totalWrite': TOTAL-WRITE }, 'intervalStats': { 'blockStat': [ { 'size': SIZE, 'read': READ-COUNT, 'write': WRITE-COUNT }, ...], 'fopStat': [ { 'name': FOP-NAME, 'hits': HITS, 'latencyAvg': AVERAGE-LATENCY, 'latencyMin': MINIMUM-LATENCY, 'latencyMax': MAXIMUM-LATENCY }, ...], 'duration': DURATION, 'totalRead': TOTAL-READ, 'totalWrite': TOTAL-WRITE }}, ...}} Change-Id: Ib6a26fa7634b999cd70197c958fe86a6d9ed4a9c Signed-off-by: Timothy Asir <tjeyasin(a)redhat.com> --- M vdsm/gluster/api.py M vdsm/gluster/cli.py M vdsm/gluster/exception.py M vdsm_cli/vdsClientGluster.py 4 files changed, 81 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/7436/1 diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py index dc3ec0b..9073791 100644 --- a/vdsm/gluster/api.py +++ b/vdsm/gluster/api.py @@ -229,6 +229,11 @@ def volumeProfileStop(self, volumeName, options=None): self.svdsmProxy.glusterVolumeProfileStop(volumeName) + @exportAsVerb + def volumeProfileInfo(self, volumeName, options=None): + status = self.svdsmProxy.glusterVolumeProfileInfo(volumeName) + return {'profileInfo': status} + def getGlusterMethods(gluster): l = [] diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py index 2618aa1..059bff4 100644 --- a/vdsm/gluster/cli.py +++ b/vdsm/gluster/cli.py @@ -155,6 +155,54 @@ return volumeInfoDict +def _parseGlusterVolumeProfileInfo(tree): + fopCumulative = [] + blkCumulative = [] + fopInterval = [] + blkInterval = [] + bricks = {} + for brick in tree.findall('volProfile/brick'): + for block in brick.findall('cumulativeStats/blockStats/block'): + blkCumulative.append({'size': block.find('size').text, + 'read': block.find('reads').text, + 'write': block.find('writes').text}) + for fop in brick.findall('cumulativeStats/fopStats/fop'): + fopCumulative.append({'name': fop.find('name').text, + 'hits': fop.find('hits').text, + 'latencyAvg': fop.find('avgLatency').text, + 'latencyMin': fop.find('minLatency').text, + 'latencyMax': fop.find('maxLatency').text}) + for block in brick.findall('intervalStats/blockStats/block'): + blkInterval.append({'size': block.find('size').text, + 'read': block.find('reads').text, + 'write': block.find('writes').text}) + for fop in brick.findall('intervalStats/fopStats/fop'): + fopInterval.append({'name': fop.find('name').text, + 'hits': fop.find('hits').text, + 'latencyAvg': fop.find('avgLatency').text, + 'latencyMin': fop.find('minLatency').text, + 'latencyMax': fop.find('maxLatency').text}) + bricks[brick.find('brickName').text] = { + 'cumulativeStats': { + 'blockStats': blkCumulative, + 'fopStats': fopCumulative, + 'duration': brick.find('cumulativeStats/duration').text, + 'totalRead': brick.find('cumulativeStats/totalRead').text, + 'totalWrite': brick.find('cumulativeStats/totalWrite').text}, + 'intervalStats': { + 'blockStats': blkInterval, + 'fopStats': fopInterval, + 'duration': brick.find('intervalStats/duration').text, + 'totalRead': brick.find('intervalStats/totalRead').text, + 'totalWrite': brick.find('intervalStats/totalWrite').text}} + status = { + 'volumeName': tree.find("volProfile/volname").text, + 'brickCount': tree.find("volProfile/brickCount").text, + 'statusCode': tree.find("opRet").text, + 'bricks': bricks} + return status + + @exportToSuperVdsm def volumeInfo(volumeName=None): """ @@ -577,3 +625,16 @@ if err: raise ge.GlusterVolumeProfileStopFailedException(err[0], err[1]) return True + + +@exportToSuperVdsm +def volumeProfileInfo(volumeName): + command = _getGlusterVolCmd() + ["profile", volumeName, "info"] + err, res = _execGluster(command, xml=True) + if err: + raise ge.GlusterVolumeProfileInfoFailedException(err[0], err[1]) + xmltree, out = res + try: + return _parseGlusterVolumeProfileInfo(xmltree) + except: + raise ge.GlusterXmlErrorException(err=out) diff --git a/vdsm/gluster/exception.py b/vdsm/gluster/exception.py index f5dfb73..5dea24d 100644 --- a/vdsm/gluster/exception.py +++ b/vdsm/gluster/exception.py @@ -328,6 +328,11 @@ message = "Volume profile stop failed" +class GlusterVolumeProfileInfoFailedException(GlusterVolumeException): + code = 4159 + message = "Volume profile info failed" + + # Host class GlusterHostException(GlusterException): code = 4400 diff --git a/vdsm_cli/vdsClientGluster.py b/vdsm_cli/vdsClientGluster.py index 0a253fe..c93a59f 100644 --- a/vdsm_cli/vdsClientGluster.py +++ b/vdsm_cli/vdsClientGluster.py @@ -207,6 +207,11 @@ status = self.s.glusterVolumeProfileStop(args[0]) return status['status']['code'], status['status']['message'] + def do_glusterVolumeProfileInfo(self, args): + status = self.s.glusterVolumeProfileInfo(args[0]) + pp.pprint(status) + return status['status']['code'], status['status']['message'] + def getGlusterCmdDict(serv): return { @@ -373,4 +378,9 @@ ('<volume_name>\n\t<volume_name> is existing volume name', 'stop gluster volume profile' )), + 'glusterVolumeProfileInfo': + (serv.do_glusterVolumeProfileInfo, + ('<volume_name>\n\t<volume_name> is existing volume name', + 'get gluster volume profile info' + )), } -- To view, visit http://gerrit.ovirt.org/7436 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6a26fa7634b999cd70197c958fe86a6d9ed4a9c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Timothy Asir <tjeyasin(a)redhat.com> Gerrit-Reviewer: Bala.FA <barumuga(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>

4 30

Change in vdsm[master]: tests: Cleanup apiTests exception handling
by agl＠us.ibm.com 03 Dec '12

03 Dec '12

Adam Litke has uploaded a new change for review. Change subject: tests: Cleanup apiTests exception handling ...................................................................... tests: Cleanup apiTests exception handling As Dan reported in http://gerrit.ovirt.org/#/c/9442/ the behavior of SocketServer differs between versions of python which causes the exception raised by sendMessage() to change. Rather than key the expected exception based on the Python version, clean up the flow so it will behave the same across Python versions. Change-Id: I818e5e7b8dd0a1abad94deb65e32c1d76225b839 Signed-off-by: Adam Litke <agl(a)us.ibm.com> --- M tests/apiTests.py 1 file changed, 22 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/9499/1 diff --git a/tests/apiTests.py b/tests/apiTests.py index ff0a785..3e4be6a 100644 --- a/tests/apiTests.py +++ b/tests/apiTests.py @@ -176,6 +176,10 @@ _fakeret = {} +class ProtocolError(Exception): + pass + + class JsonRawTest(APITest): _Size = struct.Struct("!Q") @@ -191,12 +195,23 @@ try: sock.connect((ip, port)) sock.sendall(msg) + except socket.error, e: + raise ProtocolError("Unable to send request: %s", e) + try: data = sock.recv(JsonRawTest._Size.size) - msgLen = JsonRawTest._Size.unpack(data)[0] + except socket.error, e: + raise ProtocolError("Unable to read response length: %s", e) + if not data: + raise ProtocolError("No data received") + msgLen = JsonRawTest._Size.unpack(data)[0] + try: data = sock.recv(msgLen) - return json.loads(data) - finally: - sock.close() + except socket.error, e: + raise ProtocolError("Unable to read response body: %s", e) + if len(data) != msgLen: + raise ProtocolError("Response body length mismatch") + return json.loads(data) + sock.close() def testPing(self): self.clearAPI() @@ -227,14 +242,14 @@ self.assertEquals(4, reply['error']['code']) def testMissingSize(self): - self.assertRaises(struct.error, self.sendMessage, + self.assertRaises(ProtocolError, self.sendMessage, "malformed message") def testClientNotJson(self): msg = "malformed message" msize = JsonRawTest._Size.pack(len(msg)) msg = msize + msg - self.assertRaises(struct.error, self.sendMessage, msg) + self.assertRaises(ProtocolError, self.sendMessage, msg) def testSynchronization(self): def doPing(msg): @@ -245,7 +260,7 @@ msg = self.buildMessage({'id': 1, 'method': 'Host.ping'}) # Send Truncated message - self.assertRaises(struct.error, doPing, msg[:-1]) + self.assertRaises(ProtocolError, doPing, msg[:-1]) # Test that the server recovers doPing(msg) -- To view, visit http://gerrit.ovirt.org/9499 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I818e5e7b8dd0a1abad94deb65e32c1d76225b839 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>

4 10

Change in vdsm[master]: apiTests: silence testMissingSize failure on Python 2.6
by Dan Kenigsberg 03 Dec '12

03 Dec '12

Dan Kenigsberg has uploaded a new change for review. Change subject: apiTests: silence testMissingSize failure on Python 2.6 ...................................................................... apiTests: silence testMissingSize failure on Python 2.6 I did not delve into the reasons of this, but on Python 2.6, testMissingSize raises socket.error instead of struct.error. Change-Id: I6d69ec07234c73a884abdc615a33c6b6508b47f5 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M tests/apiTests.py 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/9442/1 diff --git a/tests/apiTests.py b/tests/apiTests.py index ff0a785..4100ad0 100644 --- a/tests/apiTests.py +++ b/tests/apiTests.py @@ -25,6 +25,7 @@ import errno import json import struct +import sys from testrunner import VdsmTestCase as TestCaseBase from vdsm import constants @@ -73,7 +74,6 @@ self.lastFunc = name return self.default - import sys import imp from new import classobj @@ -227,7 +227,12 @@ self.assertEquals(4, reply['error']['code']) def testMissingSize(self): - self.assertRaises(struct.error, self.sendMessage, + if sys.version_info[0:2] == (2, 6): + expectedException = socket.error + else: + expectedException = struct.error + + self.assertRaises(expectedException, self.sendMessage, "malformed message") def testClientNotJson(self): -- To view, visit http://gerrit.ovirt.org/9442 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d69ec07234c73a884abdc615a33c6b6508b47f5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

4 7

Change in vdsm[master]: storage: set block schedule elevator using udev
by Alon Bar-Lev 03 Dec '12

03 Dec '12

Alon Bar-Lev has uploaded a new change for review. Change subject: storage: set block schedule elevator using udev ...................................................................... storage: set block schedule elevator using udev CURRENT IMPLEMENTATION block schedule elevator is set by bootstrap using modification to kernel command-lines. PROBLEMS IN CURRENT IMPLEMENTATION 1. assumption of grub bootloader. 2. assumption of active kernel. 3. assumption of user not override anything. 4. problem to port. NEW IMPLEMENTATION Use udev in order to set the block schedule elevator. User may override behavior using udev rule, no bootloader dependency or conflict. The setting is applied also if vdsm is installed manually. Change-Id: I0a8de1c861bf4570509599b6f47235ed38cc424d Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com> --- M vds_bootstrap/vds_bootstrap.py M vdsm.spec.in A vdsm/storage/12-vdsm-elevator.rules M vdsm/storage/Makefile.am A vdsm/storage/vdsm-elevator.sh 5 files changed, 31 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/8700/1 diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py index 867d6f4..9353daf 100755 --- a/vds_bootstrap/vds_bootstrap.py +++ b/vds_bootstrap/vds_bootstrap.py @@ -435,7 +435,7 @@ self.message = '' self.rc = True - args = ['elevator=deadline'] + args = [] if rhel6based and not _constantTSC(): args += ['processor.max_cstate=1'] diff --git a/vdsm.spec.in b/vdsm.spec.in index 4814172..18a3661 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -382,9 +382,13 @@ install -Dm 0755 vdsm/respawn \ %{buildroot}%{_datadir}/%{vdsm_name}/respawn -# Install the lvm rules +# Install the udev rules install -Dm 0644 vdsm/storage/12-vdsm-lvm.rules \ %{buildroot}/lib/udev/rules.d/12-vdsm-lvm.rules +install -Dm 0644 vdsm/storage/12-vdsm-elevator.rules \ + %{buildroot}/lib/udev/rules.d/12-vdsm-elevator.rules +install -Dm 0755 vdsm/storage/vdsm-elevator.sh \ + %{buildroot}/lib/udev/vdsm-elevator.sh install -Dm 0644 vdsm/limits.conf \ %{buildroot}/etc/security/limits.d/99-vdsm.conf @@ -721,6 +725,8 @@ %{_datadir}/%{vdsm_name}/set-conf-item %{python_sitelib}/sos/plugins/vdsm.py* /lib/udev/rules.d/12-vdsm-lvm.rules +/lib/udev/rules.d/12-vdsm-elevator.rules +/lib/udev/vdsm-elevator.sh /etc/security/limits.d/99-vdsm.conf %{_mandir}/man8/vdsmd.8* %if 0%{?rhel} diff --git a/vdsm/storage/12-vdsm-elevator.rules b/vdsm/storage/12-vdsm-elevator.rules new file mode 100644 index 0000000..38a7607 --- /dev/null +++ b/vdsm/storage/12-vdsm-elevator.rules @@ -0,0 +1,12 @@ +# +# Copyright 2012 Red Hat, Inc. and/or its affiliates. +# +# Licensed to you under 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. See the files README and +# LICENSE_GPL_v2 which accompany this distribution. +# + +# Udev rules for elevator setting. + +ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", RUN+="vdsm-elevator.sh deadline" diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am index cff09be..5900802 100644 --- a/vdsm/storage/Makefile.am +++ b/vdsm/storage/Makefile.am @@ -65,7 +65,9 @@ volume.py EXTRA_DIST = \ - 12-vdsm-lvm.rules + 12-vdsm-lvm.rules \ + 12-vdsm-elevator.rules \ + vdsm-elevator.sh check-local: PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(srcdir)/storage_exception.py diff --git a/vdsm/storage/vdsm-elevator.sh b/vdsm/storage/vdsm-elevator.sh new file mode 100755 index 0000000..6f2ff85 --- /dev/null +++ b/vdsm/storage/vdsm-elevator.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +elevator="$1" +scheduler="/sys/${DEVPATH}/queue/scheduler" + +if [ -w "${scheduler}" ]; then + echo "${elevator}" > "${scheduler}" +fi -- To view, visit http://gerrit.ovirt.org/8700 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a8de1c861bf4570509599b6f47235ed38cc424d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>

9 36

Change in vdsm[master]: Have direct file not use the O_DIRECT flag on tmpfs and ramf...
by smizrahi＠redhat.com 02 Dec '12

02 Dec '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Have direct file not use the O_DIRECT flag on tmpfs and ramfs ...................................................................... Have direct file not use the O_DIRECT flag on tmpfs and ramfs tmpfs and ramfs don't support the O_DIRECT flags. This is intentional as O_DIRECT tells the kernel to bypass the page-cache and those file systems live solely on the page cache. Since the effect desired by direct IO is accomplished on these file systems without the flag there is no reason for the use to test the FS every time before opening a file for direct access. The reason we keep the same class instead of falling back to the regular file object is so we keep the semantics of the DirectFile() class and the user doesn't have to care that the underlying FS doesn't really support direct IO. Change-Id: I7db4136c1a34d960b17312c2c785fc3234b24b92 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/storage/fileUtils.py M vdsm/storage/mount.py 2 files changed, 51 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/9595/1 diff --git a/vdsm/storage/fileUtils.py b/vdsm/storage/fileUtils.py index 13a8cfa..e00a004 100644 --- a/vdsm/storage/fileUtils.py +++ b/vdsm/storage/fileUtils.py @@ -31,11 +31,12 @@ import ctypes from contextlib import contextmanager import subprocess - import shutil -from vdsm import constants import logging import errno + +from vdsm import constants +import mount libc = ctypes.CDLL("libc.so.6", use_errno=True) log = logging.getLogger('fileUtils') @@ -184,10 +185,13 @@ log.warning("Dir %s already exists", dirPath) if mode is not None: statinfo = os.stat(dirPath) - if statinfo[stat.ST_MODE] != mode: + curMode = statinfo[stat.ST_MODE] + if curMode != mode: raise OSError(errno.EPERM, - "Existing %s permissions %s are not as requested %s" % - (dirPath, oct(statinfo[stat.ST_MODE]), oct(mode))) + ("Existing %s permissions %s are not as " + "requested %s") % (dirPath, + oct(curMode), + oct(mode))) def resolveUid(user): @@ -219,7 +223,7 @@ currentGid = stat.st_gid if ((uid == currentUid or user == -1) and - (gid == currentGid or group == -1)): + (gid == currentGid or group == -1)): return True os.chown(path, uid, gid) @@ -243,7 +247,14 @@ raise ValueError("Invalid mode parameter") self._writable = True - flags = os.O_DIRECT + # Memory only file systems don't support direct IO because direct IO + # means "skip the page cache" and they are 100% page cahce. + vfstype = mount.findMountOfPath(path).getRecord().fs_vfstype + if vfstype in ["tmpfs", "ramfs"]: + flags = 0 + else: + flags = os.O_DIRECT + if "r" in mode: if "+" in mode: flags |= os.O_RDWR diff --git a/vdsm/storage/mount.py b/vdsm/storage/mount.py index 94cfae0..aaa9eb0 100644 --- a/vdsm/storage/mount.py +++ b/vdsm/storage/mount.py @@ -34,14 +34,14 @@ VFS_EXT3 = "ext3" MountRecord = namedtuple("MountRecord", "fs_spec fs_file fs_vfstype " - "fs_mntops fs_freq fs_passno") + "fs_mntops fs_freq fs_passno") _RE_ESCAPE = re.compile(r"\\0\d\d") def _parseFstabLine(line): (fs_spec, fs_file, fs_vfstype, fs_mntops, - fs_freq, fs_passno) = line.split()[:6] + fs_freq, fs_passno) = line.split()[:6] fs_mntops = fs_mntops.split(",") fs_freq = int(fs_freq) fs_passno = int(fs_passno) @@ -50,7 +50,7 @@ fs_mntops = [_parseFstabPath(item) for item in fs_mntops] return MountRecord(fs_spec, fs_file, fs_vfstype, fs_mntops, - fs_freq, fs_passno) + fs_freq, fs_passno) def _iterateMtab(): @@ -118,7 +118,7 @@ continue yield MountRecord(realSpec, rec.fs_file, rec.fs_vfstype, - rec.fs_mntops, rec.fs_freq, rec.fs_passno) + rec.fs_mntops, rec.fs_freq, rec.fs_passno) def iterMounts(): @@ -144,6 +144,30 @@ return Mount(rec.fs_spec, rec.fs_file) raise OSError(errno.ENOENT, 'Mount target %s not found' % target) + + +def findMountOfPath(path): + # TBD: Bind mounts, should we ignore them? + # Follow symlinks (if file exists) + path = os.path.realpath(path) + + # Make sure using canonical representation + path = os.path.normpath(path) + + # Find longest match + maxLen = 0 + mountRec = None + for rec in _iterMountRecords(): + mntPath = os.path.normpath(rec.fs_file) + if len(mntPath) > maxLen: + if path.startswith(mntPath): + maxLen = len(mntPath) + mountRec = rec + + if mountRec is None: + raise OSError(errno.ENOENT, os.strerror(errno.ENOENT)) + + return Mount(mountRec.fs_spec, mountRec.fs_file) def getMountFromDevice(device): @@ -195,7 +219,7 @@ if not p.wait(timeout): p.kill() raise OSError(errno.ETIMEDOUT, - "%s operation timed out" % os.path.basename(cmd[0])) + "%s operation timed out" % os.path.basename(cmd[0])) out, err = p.communicate() rc = p.returncode @@ -232,9 +256,9 @@ return record raise OSError(errno.ENOENT, - "Mount of `%s` at `%s` does not exist" % - (self.fs_spec, self.fs_file)) + "Mount of `%s` at `%s` does not exist" % + (self.fs_spec, self.fs_file)) def __repr__(self): - return "<Mount fs_spec='%s' fs_file='%s'>" % \ - (self.fs_spec, self.fs_file) + return ("<Mount fs_spec='%s' fs_file='%s'>" % + (self.fs_spec, self.fs_file)) -- To view, visit http://gerrit.ovirt.org/9595 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7db4136c1a34d960b17312c2c785fc3234b24b92 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

3 4

Change in vdsm[master]: Remove network.service dependencies from vdsmd.service
by Igor Lvovsky 02 Dec '12

02 Dec '12

Igor Lvovsky has uploaded a new change for review. Change subject: Remove network.service dependencies from vdsmd.service ...................................................................... Remove network.service dependencies from vdsmd.service In current vdsm behaviour during network rollback vdsm need to stop network service, rollback latest network changes and start network service again, but in host with systemd network service can't be stoped. According to systemd concept if service required by another service it will be immediately started again. In such situation vdsm can't revert network changes if needed. In this patch we just remove network.service dependencies from vdsmd.service. Anyway vdsm start network service explicitly during vdsm start Change-Id: I03c9696022490da3204a1d5f9676066712f0653d Signed-off-by: Igor Lvovsky <ilvovsky(a)redhat.com> --- M vdsm/vdsmd.service 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/9363/1 diff --git a/vdsm/vdsmd.service b/vdsm/vdsmd.service index fb6d238..6a650f4 100644 --- a/vdsm/vdsmd.service +++ b/vdsm/vdsmd.service @@ -1,6 +1,6 @@ [Unit] Description=Virtual Desktop Server Manager -Requires=multipathd.service libvirtd.service ntpd.service network.service +Requires=multipathd.service libvirtd.service ntpd.service Conflicts=libvirt-guests.service [Service] -- To view, visit http://gerrit.ovirt.org/9363 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I03c9696022490da3204a1d5f9676066712f0653d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>

5 18

Change in vdsm[master]: The return of super vdsm tests
by ybronhei＠redhat.com 01 Dec '12

01 Dec '12

Yaniv Bronhaim has uploaded a new change for review. Change subject: The return of super vdsm tests ...................................................................... The return of super vdsm tests We couldn't run svdsm tests because imports wasn't exists under vdsm installation directory when running the tests. We want to be able to run those tests without being depended on installing vdsm rpm. This patch adds hackedSupervdsmServer.py and run it instead of running the original file, it loads needed modules before running and then calling to supervdsmServer main function. Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> Change-Id: I52e935662633601ce85150171c37fbf7c6196c15 --- M Makefile.am M tests/Makefile.am M tests/superVdsmTests.py M vdsm.spec.in M vdsm/Makefile.am A vdsm/hackedSupervdsmServer.py M vdsm/supervdsm.py 7 files changed, 41 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/78/9278/1 diff --git a/Makefile.am b/Makefile.am index e15d709..37eff0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,6 +103,7 @@ vdsm/storage/task.py \ vdsm/storage/taskManager.py \ vdsm/storage/volume.py \ + vdsm/hackedSupervdsmServer.py \ vdsm/supervdsm.py \ vdsm/supervdsmServer.py \ vdsm/tc.py \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 4b89751..0723ab8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -49,6 +49,7 @@ restTests.py \ sslTests.py \ storageMailboxTests.py \ + superVdsmTests.py \ tcTests.py \ vdsClientTests.py \ volumeTests.py \ diff --git a/tests/superVdsmTests.py b/tests/superVdsmTests.py index 20b1591..4ed8603 100644 --- a/tests/superVdsmTests.py +++ b/tests/superVdsmTests.py @@ -6,10 +6,14 @@ import os +supervdsm.SUPERVDSM = supervdsm.__supervdsmServerPath( + "hackedSupervdsmServer.py") + + class TestSuperVdsm(TestCaseBase): def setUp(self): - testValidation.checkSudo(['python', "supervdsmServer.py"]) + testValidation.checkSudo(['python', supervdsm.SUPERVDSM]) self._proxy = supervdsm.getProxy() # temporary values to run temporary svdsm diff --git a/vdsm.spec.in b/vdsm.spec.in index 9ba254f..31bdc91 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -625,6 +625,7 @@ %{_datadir}/%{vdsm_name}/caps.py* %{_datadir}/%{vdsm_name}/clientIF.py* %{_datadir}/%{vdsm_name}/API.py* +%{_datadir}/%{vdsm_name}/hackedSupervdsmServer.py* %{_datadir}/%{vdsm_name}/hooking.py* %{_datadir}/%{vdsm_name}/hooks.py* %{_datadir}/%{vdsm_name}/libvirtev.py* diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 76a81c6..15410ae 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -32,6 +32,7 @@ configNetwork.py \ debugPluginClient.py \ guestIF.py \ + hackedSupervdsmServer.py \ hooking.py \ hooks.py \ kaxmlrpclib.py \ diff --git a/vdsm/hackedSupervdsmServer.py b/vdsm/hackedSupervdsmServer.py new file mode 100644 index 0000000..a9f44b2 --- /dev/null +++ b/vdsm/hackedSupervdsmServer.py @@ -0,0 +1,27 @@ +from types import ModuleType +import sys + + +class vdsm(ModuleType): + def __init__(self): + ModuleType.__init__(self, "vdsm") + + +def hackVdsmModuleForSvdsm(): + sys.modules['vdsm'] = mod = vdsm() + + for name in ('config', 'constants', 'utils', 'define', 'netinfo', + 'SecureXMLRPCServer', 'libvirtconnection', 'betterPopen', + 'exception', 'qemuImg'): + sub = __import__(name, globals(), locals(), [], -1) + setattr(mod, name, sub) + sys.modules['vdsm.%s' % name] = getattr(mod, name) + + sys.modules['vdsm.constants'].P_VDSM = "../" + + +hackVdsmModuleForSvdsm() + +from supervdsmServer import main + +main() diff --git a/vdsm/supervdsm.py b/vdsm/supervdsm.py index 2eaaabb..445ce58 100644 --- a/vdsm/supervdsm.py +++ b/vdsm/supervdsm.py @@ -35,20 +35,19 @@ _g_singletonSupervdsmInstance_lock = threading.Lock() -def __supervdsmServerPath(): +def __supervdsmServerPath(serverFile): base = os.path.dirname(__file__) - for serverFile in ("supervdsmServer.py", "supervdsmServer.pyc"): - serverPath = os.path.join(base, serverFile) - if os.path.exists(serverPath): - return os.path.abspath(serverPath) + serverPath = os.path.join(base, serverFile) + if os.path.exists(serverPath): + return os.path.abspath(serverPath) raise RuntimeError("SuperVDSM Server not found") PIDFILE = os.path.join(constants.P_VDSM_RUN, "svdsm.pid") TIMESTAMP = os.path.join(constants.P_VDSM_RUN, "svdsm.time") ADDRESS = os.path.join(constants.P_VDSM_RUN, "svdsm.sock") -SUPERVDSM = __supervdsmServerPath() +SUPERVDSM = __supervdsmServerPath("supervdsmServer.py") class _SuperVdsmManager(BaseManager): -- To view, visit http://gerrit.ovirt.org/9278 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52e935662633601ce85150171c37fbf7c6196c15 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

5 31

Change in vdsm[master]: More PEP8 fixes
by smizrahi＠redhat.com 01 Dec '12

01 Dec '12

Saggi Mizrahi has uploaded a new change for review. Change subject: More PEP8 fixes ...................................................................... More PEP8 fixes Change-Id: I7b4dac13951b63263e59bb962cdc69496d277b70 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M tests/betterPopenTests.py M vdsm/storage/fileUtils.py M vdsm/storage/mount.py 3 files changed, 30 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/9604/1 diff --git a/tests/betterPopenTests.py b/tests/betterPopenTests.py index 1459ac2..a3e3232 100644 --- a/tests/betterPopenTests.py +++ b/tests/betterPopenTests.py @@ -37,7 +37,7 @@ p = BetterPopen([EXT_ECHO, "-n", data]) p.wait() self.assertTrue(p.returncode == 0, - "Process failed: %s" % os.strerror(p.returncode)) + "Process failed: %s" % os.strerror(p.returncode)) self.assertEquals(p.stdout.read(), data) def testCat(self): @@ -45,16 +45,16 @@ p = BetterPopen(["cat", path]) p.wait() self.assertTrue(p.returncode == 0, - "Process failed: %s" % os.strerror(p.returncode)) + "Process failed: %s" % os.strerror(p.returncode)) with open(path, "r") as f: self.assertEquals(p.stdout.read(), f.read()) def _subTest(self, name, params, *args, **kwargs): p = BetterPopen(["python", __file__, name] + params, - *args, **kwargs) + *args, **kwargs) p.wait() self.assertTrue(p.returncode == 0, - "Process failed: %s" % os.strerror(p.returncode)) + "Process failed: %s" % os.strerror(p.returncode)) self.assertEquals(p.stdout.read().strip(), "True") def testCloseFDs(self): @@ -82,10 +82,10 @@ def testCwd(self): cwd = "/proc" p = BetterPopen(["python", "-c", "import os; print os.getcwd()"], - cwd=cwd) + cwd=cwd) p.wait() self.assertTrue(p.returncode == 0, - "Process failed: %s" % os.strerror(p.returncode)) + "Process failed: %s" % os.strerror(p.returncode)) self.assertEquals(p.stdout.read().strip(), cwd) def testRunNonExecutable(self): @@ -93,7 +93,7 @@ def testBadCwd(self): self.assertRaises(OSError, BetterPopen, ["echo", "hello"], - cwd="/~~~~~dasdas~~~~") + cwd="/~~~~~dasdas~~~~") def testUnicodeArg(self): data = u'hello' @@ -102,7 +102,7 @@ p = BetterPopen(cmd) p.wait() p2 = subprocess.Popen(cmd, stdin=subprocess.PIPE, - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout=subprocess.PIPE, stderr=subprocess.PIPE) p2.wait() self.assertEquals(p.stdout.read(), p2.stdout.read()) @@ -118,7 +118,7 @@ p = BetterPopen(cmd) p.wait() p2 = subprocess.Popen(cmd, stdin=subprocess.PIPE, - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout=subprocess.PIPE, stderr=subprocess.PIPE) p2.wait() self.assertEquals(p.stdout.read(), p2.stdout.read()) @@ -130,7 +130,7 @@ p.stdin.close() p.wait() self.assertTrue(p.returncode == 0, - "Process failed: %s" % os.strerror(p.returncode)) + "Process failed: %s" % os.strerror(p.returncode)) self.assertEquals(p.stdout.read(), data) @@ -147,7 +147,7 @@ p.stdin.close() p.wait() self.assertTrue(p.returncode == 0, - "Process failed: %s" % os.strerror(p.returncode)) + "Process failed: %s" % os.strerror(p.returncode)) self.assertEquals(p.stdout.read(), data) diff --git a/vdsm/storage/fileUtils.py b/vdsm/storage/fileUtils.py index 13a8cfa..78c498a 100644 --- a/vdsm/storage/fileUtils.py +++ b/vdsm/storage/fileUtils.py @@ -31,11 +31,12 @@ import ctypes from contextlib import contextmanager import subprocess - import shutil -from vdsm import constants import logging import errno + +from vdsm import constants + libc = ctypes.CDLL("libc.so.6", use_errno=True) log = logging.getLogger('fileUtils') @@ -184,10 +185,13 @@ log.warning("Dir %s already exists", dirPath) if mode is not None: statinfo = os.stat(dirPath) - if statinfo[stat.ST_MODE] != mode: + curMode = statinfo[stat.ST_MODE] + if curMode != mode: raise OSError(errno.EPERM, - "Existing %s permissions %s are not as requested %s" % - (dirPath, oct(statinfo[stat.ST_MODE]), oct(mode))) + ("Existing %s permissions %s are not as " + "requested %s") % (dirPath, + oct(curMode), + oct(mode))) def resolveUid(user): @@ -219,7 +223,7 @@ currentGid = stat.st_gid if ((uid == currentUid or user == -1) and - (gid == currentGid or group == -1)): + (gid == currentGid or group == -1)): return True os.chown(path, uid, gid) diff --git a/vdsm/storage/mount.py b/vdsm/storage/mount.py index 94cfae0..d0a0b58 100644 --- a/vdsm/storage/mount.py +++ b/vdsm/storage/mount.py @@ -34,14 +34,14 @@ VFS_EXT3 = "ext3" MountRecord = namedtuple("MountRecord", "fs_spec fs_file fs_vfstype " - "fs_mntops fs_freq fs_passno") + "fs_mntops fs_freq fs_passno") _RE_ESCAPE = re.compile(r"\\0\d\d") def _parseFstabLine(line): (fs_spec, fs_file, fs_vfstype, fs_mntops, - fs_freq, fs_passno) = line.split()[:6] + fs_freq, fs_passno) = line.split()[:6] fs_mntops = fs_mntops.split(",") fs_freq = int(fs_freq) fs_passno = int(fs_passno) @@ -50,7 +50,7 @@ fs_mntops = [_parseFstabPath(item) for item in fs_mntops] return MountRecord(fs_spec, fs_file, fs_vfstype, fs_mntops, - fs_freq, fs_passno) + fs_freq, fs_passno) def _iterateMtab(): @@ -118,7 +118,7 @@ continue yield MountRecord(realSpec, rec.fs_file, rec.fs_vfstype, - rec.fs_mntops, rec.fs_freq, rec.fs_passno) + rec.fs_mntops, rec.fs_freq, rec.fs_passno) def iterMounts(): @@ -195,7 +195,7 @@ if not p.wait(timeout): p.kill() raise OSError(errno.ETIMEDOUT, - "%s operation timed out" % os.path.basename(cmd[0])) + "%s operation timed out" % os.path.basename(cmd[0])) out, err = p.communicate() rc = p.returncode @@ -232,9 +232,9 @@ return record raise OSError(errno.ENOENT, - "Mount of `%s` at `%s` does not exist" % - (self.fs_spec, self.fs_file)) + "Mount of `%s` at `%s` does not exist" % + (self.fs_spec, self.fs_file)) def __repr__(self): - return "<Mount fs_spec='%s' fs_file='%s'>" % \ - (self.fs_spec, self.fs_file) + return ("<Mount fs_spec='%s' fs_file='%s'>" % + (self.fs_spec, self.fs_file)) -- To view, visit http://gerrit.ovirt.org/9604 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b4dac13951b63263e59bb962cdc69496d277b70 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

2 2

Change in vdsm[master]: clientIF pep8
by smizrahi＠redhat.com 30 Nov '12

30 Nov '12

Saggi Mizrahi has uploaded a new change for review. Change subject: clientIF pep8 ...................................................................... clientIF pep8 Change-Id: Ifce5dfdd43754da6cc33603a5ef3283d060bf6c0 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/clientIF.py 1 file changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/9397/1 diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index 73fe3c0..8bb1cf2 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -86,9 +86,9 @@ self.vmContainer = {} ifids = netinfo.nics() + netinfo.bondings() ifrates = map(netinfo.speed, ifids) - self._hostStats = utils.HostStatsThread( - cif=self, log=log, ifids=ifids, - ifrates=ifrates) + self._hostStats = utils.HostStatsThread(cif=self, log=log, + ifids=ifids, + ifrates=ifrates) self._hostStats.start() mog = min(config.getint('vars', 'max_outgoing_migrations'), caps.CpuTopology().cores()) @@ -194,8 +194,7 @@ self.mom = MomThread(momconf) except: self.log.warn("MOM initialization failed and fall " - "back to KsmMonitor") - self.log.debug("Details:", exc_info=True) + "back to KsmMonitor", exc_info=True) self.ksmMonitor = ksm.KsmMonitorThread(self) def _syncLibvirtNetworks(self): @@ -271,9 +270,10 @@ if type(drive) is dict: # PDIV drive format if drive['device'] == 'disk' and vm.isVdsmImage(drive): - res = self.irs.prepareImage( - drive['domainID'], drive['poolID'], - drive['imageID'], drive['volumeID']) + res = self.irs.prepareImage(drive['domainID'], + drive['poolID'], + drive['imageID'], + drive['volumeID']) if res['status']['code']: raise vm.VolumeError(drive) @@ -301,13 +301,13 @@ vmPayload is a key in specParams 'vmPayload': {'file': {'filename': 'content'}} ''' + svdsm = supervdsm.getProxy() for key, files in drive['specParams']['vmPayload'].iteritems(): if key == 'file': if drive['device'] == 'cdrom': - volPath = supervdsm.getProxy().mkIsoFs(vmId, files) + volPath = svdsm.mkIsoFs(vmId, files) elif drive['device'] == 'floppy': - volPath = \ - supervdsm.getProxy().mkFloppyFs(vmId, files) + volPath = svdsm.mkFloppyFs(vmId, files) elif "path" in drive: volPath = drive['path'] @@ -344,7 +344,7 @@ def createVm(self, vmParams): self.vmContainerLock.acquire() self.log.info("vmContainerLock acquired by vm %s", - vmParams['vmId']) + vmParams['vmId']) try: if 'recover' not in vmParams: if vmParams['vmId'] in self.vmContainer: @@ -379,8 +379,8 @@ vmId, exc_info=True) while (self._enabled and - 'WaitForLaunch' in [v.lastStatus for v in - self.vmContainer.values()]): + 'WaitForLaunch' in [v.lastStatus for v in + self.vmContainer.values()]): time.sleep(1) self._cleanOldFiles() self._recovery = False @@ -389,8 +389,8 @@ # and then prepare all volumes. # Actually, we need it just to get the resources for future # volumes manipulations - while self._enabled and self.vmContainer and \ - not self.irs.getConnectedStoragePoolsList()['poollist']: + while (self._enabled and self.vmContainer and + not self.irs.getConnectedStoragePoolsList()['poollist']): time.sleep(5) for vmId, vmObj in self.vmContainer.items(): @@ -399,7 +399,7 @@ # Do not prepare volumes when system goes down if self._enabled: vmObj.preparePaths( - vmObj.getConfDevices()[vm.DISK_DEVICES]) + vmObj.getConfDevices()[vm.DISK_DEVICES]) except: self.log.error("Vm %s recovery failed", vmId, exc_info=True) @@ -428,8 +428,8 @@ if entry.getAttribute("name") == "product": prod = entry.firstChild.data if prod in (caps.OSName.RHEL, caps.OSName.OVIRT, - caps.OSName.RHEVH, caps.OSName.FEDORA, - caps.OSName.DEBIAN): + caps.OSName.RHEVH, caps.OSName.FEDORA, + caps.OSName.DEBIAN): return True return False @@ -473,7 +473,7 @@ try: vmId, fileType = f.split(".", 1) if fileType in ["guest.socket", "monitor.socket", "pid", - "stdio.dump", "recovery"]: + "stdio.dump", "recovery"]: if vmId in self.vmContainer: continue if f == 'vdsmd.pid': -- To view, visit http://gerrit.ovirt.org/9397 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifce5dfdd43754da6cc33603a5ef3283d060bf6c0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

3 6

Change in vdsm[master]: Catch all possible errors in apiTests:JsonRawTest.testMissin...
by smizrahi＠redhat.com 30 Nov '12

30 Nov '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Catch all possible errors in apiTests:JsonRawTest.testMissingSize ...................................................................... Catch all possible errors in apiTests:JsonRawTest.testMissingSize On old python implementation the overflow is not caught by the struct object and the disconnection of the server is the sign of the problem. Change-Id: I1d1a5cbd73583958812abcac1942b83aeea537b9 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M tests/apiTests.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/9594/1 diff --git a/tests/apiTests.py b/tests/apiTests.py index ff0a785..390cd03 100644 --- a/tests/apiTests.py +++ b/tests/apiTests.py @@ -227,7 +227,7 @@ self.assertEquals(4, reply['error']['code']) def testMissingSize(self): - self.assertRaises(struct.error, self.sendMessage, + self.assertRaises((socket.error, struct.error), self.sendMessage, "malformed message") def testClientNotJson(self): -- To view, visit http://gerrit.ovirt.org/9594 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d1a5cbd73583958812abcac1942b83aeea537b9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

2 2

Change in vdsm[master]: spec: our tests requires 'import selinux'
by Dan Kenigsberg 30 Nov '12

30 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: spec: our tests requires 'import selinux' ...................................................................... spec: our tests requires 'import selinux' configNetwork imports selinux during its unittest, thus we need it when we build the rpm. Change-Id: I06b29cd3a872b4649e44a344f4032f1ba88a6eb8 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm.spec.in 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/9570/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 0800446..7a6c3a3 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -39,6 +39,7 @@ # BuildRequires needed by the tests during the build BuildRequires: python-ethtool +BuildRequires: libselinux-python BuildRequires: libvirt-python BuildRequires: genisoimage BuildRequires: openssl -- To view, visit http://gerrit.ovirt.org/9570 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06b29cd3a872b4649e44a344f4032f1ba88a6eb8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

2 3

Change in vdsm[master]: spec: hack around el6 logrotate dependency issue
by Dan Kenigsberg 30 Nov '12

30 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: spec: hack around el6 logrotate dependency issue ...................................................................... spec: hack around el6 logrotate dependency issue We currently require logrotate >= 3.8.0 which is not part of el6, because we use the 'su' directive. This patch drops 'su' from el6 builds, and requires logrotate version that does not need it. Change-Id: I68afc21eb94331204529554a5bb4d275f0dad4a0 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm.spec.in 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/69/9569/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index eebe535..0800446 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -63,7 +63,7 @@ Requires: which Requires: sudo >= 1.7.3 -Requires: logrotate >= 3.8.0 +Requires: logrotate Requires: xz Requires: ntp Requires: iproute @@ -105,6 +105,7 @@ Requires: initscripts >= 9.03.31-2.el6_3.1 Requires: selinux-policy-targeted >= 3.7.19-80 Requires: lvm2 >= 2.02.95-10.el6_3.2 +Requires: logrotate < 3.8.0 %endif %else # Subprocess and thread bug was found on python 2.7.2 @@ -393,6 +394,9 @@ %prep %setup -q +%if 0%{?rhel} == 6 +sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in +%endif %build %if 0%{?enable_autotools} -- To view, visit http://gerrit.ovirt.org/9569 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68afc21eb94331204529554a5bb4d275f0dad4a0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

2 3

Change in vdsm[master]: libvirtvm: Removing libvirt snapshot metadata.
by apahim＠redhat.com 30 Nov '12

30 Nov '12

Amador Pahim has uploaded a new change for review. Change subject: libvirtvm: Removing libvirt snapshot metadata. ...................................................................... libvirtvm: Removing libvirt snapshot metadata. Bug-Url: http://bugzilla.redhat.com/872277 After creating a new snapshot, it is not possible to live migrate vm: libvirtError: Requested operation is not valid: cannot migrate domain with 1 snapshots Issue is also affecting live storage migration due to use of the same vm snapshot function during the live storage migration process. This pach removes unused libvirt snapshot metadata just after snapshot creation allowing live migration. Change-Id: I928983a404f822522a0a48218f9c58fa8d6296b1 Signed-off-by: Amador Pahim <apahim(a)redhat.com> --- M vdsm/libvirtvm.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/9139/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index ca31a43..b213206 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -1913,6 +1913,11 @@ finally: self.startDisksStatsCollection() + # Removing libvirt snapshot metadata + curSnap = self._dom.snapshotCurrent(0) + snapDelFlags = (libvirt.VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY) + curSnap.delete(snapDelFlags) + # Successful break -- To view, visit http://gerrit.ovirt.org/9139 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I928983a404f822522a0a48218f9c58fa8d6296b1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Amador Pahim <apahim(a)redhat.com>

5 12

Change in vdsm[master]: Add sanlock debug info to sosreport.
by lyarwood＠redhat.com 30 Nov '12

30 Nov '12

Lee Yarwood has uploaded a new change for review. Change subject: Add sanlock debug info to sosreport. ...................................................................... Add sanlock debug info to sosreport. Collect log_dump and status output from sanlock. Change-Id: Ieb02a8b87d24b503ddf6238c09d28e93242d3f56 Signed-off-by: Lee Yarwood <lyarwood(a)redhat.com> --- M vdsm/sos/vdsm.py.in 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/9589/1 diff --git a/vdsm/sos/vdsm.py.in b/vdsm/sos/vdsm.py.in index 5f09f8d..04ad7fc 100644 --- a/vdsm/sos/vdsm.py.in +++ b/vdsm/sos/vdsm.py.in @@ -90,6 +90,8 @@ self.collectExtOutput("/usr/bin/iostat") self.collectExtOutput("/sbin/iscsiadm -m node") self.collectExtOutput("/sbin/iscsiadm -m session") + self.collectExtOutput("/sbin/sanlock client log_dump") + self.collectExtOutput("/sbin/sanlock client status -D") sslopt = ['', '-s '][config.getboolean('vars', 'ssl')] vdsclient = "/usr/bin/vdsClient " + sslopt + "0 " self.collectExtOutput(vdsclient + "getVdsCapabilities") -- To view, visit http://gerrit.ovirt.org/9589 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb02a8b87d24b503ddf6238c09d28e93242d3f56 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Lee Yarwood <lyarwood(a)redhat.com>

2 3

Change in vdsm[master]: pep8: fix remaining vdsm/*.py and vdsm/ut
by Dan Kenigsberg 30 Nov '12

30 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: pep8: fix remaining vdsm/*.py and vdsm/ut ...................................................................... pep8: fix remaining vdsm/*.py and vdsm/ut Change-Id: Ie4e0a0bdeb5f8a014b336fe32583cf9fc9c3cec4 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M Makefile.am M vdsm/dumpStorageTable.py.in M vdsm/hooking.py M vdsm/logUtils.py M vdsm/mkimage.py M vdsm/qemuImg.py M vdsm/ut/ivdsm.py 7 files changed, 75 insertions(+), 77 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/84/9584/1 diff --git a/Makefile.am b/Makefile.am index 811038d..d10887c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,33 +50,8 @@ tests \ vds_bootstrap/miniyum.py \ vdsm-tool \ - vdsm/API.py \ - vdsm/BindingXMLRPC.py \ - vdsm/SecureXMLRPCServer.py \ - vdsm/blkid.py \ - vdsm/caps.py \ - vdsm/clientIF.py \ - vdsm/config.py.in \ - vdsm/configNetwork.py \ - vdsm/constants.py.in \ - vdsm/debugPluginClient.py \ - vdsm/define.py \ - vdsm/exception.py \ - vdsm/gluster \ - vdsm/guestIF.py \ - vdsm/hooks.py \ - vdsm/kaxmlrpclib.py \ - vdsm/ksm.py \ - vdsm/libvirtconnection.py \ - vdsm/libvirtev.py \ - vdsm/libvirtvm.py \ - vdsm/lsblk.py \ - vdsm/md_utils.py \ - vdsm/momIF.py \ - vdsm/neterrors.py \ - vdsm/netinfo.py \ - vdsm/nwfilter.py \ - vdsm/parted_utils.py \ + vdsm/*.py \ + vdsm/*.py.in \ vdsm/storage/blockVolume.py \ vdsm/storage/devicemapper.py \ vdsm/storage/domainMonitor.py \ @@ -103,14 +78,8 @@ vdsm/storage/task.py \ vdsm/storage/taskManager.py \ vdsm/storage/volume.py \ - vdsm/supervdsm.py \ - vdsm/supervdsmServer.py \ - vdsm/tc.py \ - vdsm/utils.py \ + vdsm/ut \ vdsm/vdsm \ - vdsm/vdsmDebugPlugin.py \ - vdsm/vm.py \ - vdsm/vmChannels.py \ vdsm_api \ vdsm_cli \ vdsm_hooks/fileinject \ diff --git a/vdsm/dumpStorageTable.py.in b/vdsm/dumpStorageTable.py.in index d173e6e..a148a4d 100644 --- a/vdsm/dumpStorageTable.py.in +++ b/vdsm/dumpStorageTable.py.in @@ -26,6 +26,7 @@ MASTERSD_PATH = 'mastersd/master/vms' CDROM_IMAGE = '11111111-1111-1111-1111-111111111111' + class StorageTable: def __init__(self, server): @@ -38,9 +39,11 @@ images = [] for vmUUID in vmUUIDs: - vm_images_links = os.listdir(os.path.join(DC, pool, MASTERSD_PATH, vmUUID)) + vm_images_links = os.listdir(os.path.join(DC, pool, MASTERSD_PATH, + vmUUID)) for vm_image_link in vm_images_links: - ovf = open(os.path.join(DC, pool, MASTERSD_PATH, vmUUID, vm_image_link)).read() + ovf = open(os.path.join(DC, pool, MASTERSD_PATH, vmUUID, + vm_image_link)).read() cont = ovf.split('ovf:fileRef=\"') vmName = cont[-1].split('<Name>')[-1].split('</Name>')[0] @@ -52,7 +55,8 @@ for x in range(1, len(cont)): image = cont[x].split(' ')[0].split('/')[0] if not image in images: - sd = self.serverConncetion.getImageDomainsList(pool, image)['domainslist'] + s = self.serverConncetion + sd = s.getImageDomainsList(pool, image)['domainslist'] if len(sd) > 0: sd = sd[0] images.append(image) @@ -66,7 +70,8 @@ if not sd in self.domainsList.keys(): sd_info = self.serverConncetion.getStorageDomainInfo(sd)['info'] - self.domainsList[sd] = {'Name': sd_info['name'], 'Role': sd_info['role'], 'Refs': []} + self.domainsList[sd] = {'Name': sd_info['name'], + 'Role': sd_info['role'], 'Refs': []} def _getSds(self, pool): @@ -119,19 +124,21 @@ leafvol = vol self.volumesList[imageDomVol].append('Template') - self.imagesList[imageDom] = self._buildVolumesChain(leafvol, vollen, volParents, sd, image) + self.imagesList[imageDom] = self._buildVolumesChain(leafvol, vollen, + volParents, sd, + image) def _buildVolumesChain(self, leafvol, vollen, volParents, sd, image): - volChain = vollen*[None] + volChain = vollen * [None] - volChain[(vollen-1)]=leafvol + volChain[(vollen - 1)] = leafvol next = leafvol - for k in range(1, (vollen+1)): + for k in range(1, (vollen + 1)): prev = next next = volParents[prev] if next in volParents.keys(): - volChain[(vollen-1-k)]=next + volChain[(vollen - 1 - k)] = next else: if next == BLANK_UUID: app = 'Template independent' @@ -145,10 +152,7 @@ return volChain - - def _buildStorageTable(self): - self.domainsList = {} self.vmList = {} self.imagesList = {} @@ -159,7 +163,6 @@ pools = self.serverConncetion.getConnectedStoragePoolsList() self.pool = pools['poollist'][0] - # Check if its possible to access the ovf files try: @@ -188,7 +191,7 @@ for obj, obj_data in startObj.items(): row = 0 - obj_data = dict(obj_data) # copy + obj_data = dict(obj_data) # copy refs = obj_data.pop('Refs') self.tbl[colStart].append([obj] + obj_data.values()) @@ -203,7 +206,7 @@ if row == 0: sd_data = dict(self.domainsList[sdUUID]) del sd_data['Refs'] - self.tbl['Domains'].append( [sdUUID] + sd_data.values() ) + self.tbl['Domains'].append([sdUUID] + sd_data.values()) else: self.tbl['Vms'].append([]) self.tbl['Domains'].append([]) @@ -223,13 +226,12 @@ vol = volsToAdd[0] domImageVol = '%s:%s:%s' % (sdUUID, image, vol) - templToAdd = self.volumesList.get( domImageVol, [] ) + templToAdd = self.volumesList.get(domImageVol, []) self.tbl['Template'].append(templToAdd) row += 1 - def _printRowSep(self, rowSep, columnNum): - sepLine = '+' + ( rowSep + '+' ) * columnNum + sepLine = '+' + (rowSep + '+') * columnNum print sepLine def _printTableSegment(self, depth, alignCenter=False, printHeader=False): @@ -238,7 +240,7 @@ row = 0 rows = 1 - rowSep = (UUID_LEN+2) * '-' + rowSep = (UUID_LEN + 2) * '-' colStart = 0 if not self.canAccessVms: @@ -266,9 +268,9 @@ adding = '' if alignCenter: - adding = adding.center( UUID_LEN ) + adding = adding.center(UUID_LEN) else: - adding = adding.ljust( UUID_LEN ) + adding = adding.ljust(UUID_LEN) line = line + ' %s |' % (adding) @@ -276,7 +278,6 @@ row += 1 self._printRowSep(rowSep, columnNum) - def show(self): '''Show the Storage Table''' diff --git a/vdsm/hooking.py b/vdsm/hooking.py index a324311..b9b76a4 100644 --- a/vdsm/hooking.py +++ b/vdsm/hooking.py @@ -42,10 +42,11 @@ from storage.misc import execCmd execCmd # make pyflakes happy + def tobool(s): """Convert the argument into a boolean""" try: - if s == None: + if s is None: return False if type(s) == bool: return s @@ -55,8 +56,10 @@ except: return False + def read_domxml(): return minidom.parseString(file(os.environ['_hook_domxml']).read()) + def write_domxml(domxml): file(os.environ['_hook_domxml'], 'w').write(domxml.toxml(encoding='utf-8')) diff --git a/vdsm/logUtils.py b/vdsm/logUtils.py index 83b56a8..933719d 100644 --- a/vdsm/logUtils.py +++ b/vdsm/logUtils.py @@ -23,25 +23,31 @@ from functools import wraps from inspect import ismethod + def funcName(func): if ismethod(func): return func.im_func.func_name return func.func_name -def logcall(loggerName, pattern="%s", loglevel=logging.INFO, printers={}, resPrinter=repr, resPattern="%(name)s->%(result)s"): + +def logcall(loggerName, pattern="%s", loglevel=logging.INFO, printers={}, + resPrinter=repr, resPattern="%(name)s->%(result)s"): def phase2(f): @wraps(f) def wrapper(*args, **kwargs): logger = logging.getLogger(loggerName) - logger.log(loglevel, pattern % (call2str(f, args, kwargs, printers),)) + logger.log(loglevel, pattern % + (call2str(f, args, kwargs, printers),)) res = f(*args, **kwargs) - logger.log(loglevel, resPattern % {"name": funcName(f), "result": resPrinter(res)}) + logger.log(loglevel, resPattern % + {"name": funcName(f), "result": resPrinter(res)}) return res return wrapper return phase2 + def call2str(func, args, kwargs, printers={}): kwargs = kwargs.copy() @@ -70,6 +76,7 @@ return "%s(%s)" % (func.func_name, ", ".join(argsStrs)) + class SimpleLogAdapter(logging.LoggerAdapter): # Because of how python implements the fact that warning # and warn are the same. I need to reimplement it here. :( @@ -81,6 +88,7 @@ result += '%s=`%s`' % (key, value) result += '::%s' % msg return (result, kwargs) + class TracebackRepeatFilter(logging.Filter): """ @@ -100,6 +108,7 @@ ex._logged = True return 1 + class QueueHandler(logging.Handler): """ @@ -151,4 +160,3 @@ raise except: self.handleError(record) - diff --git a/vdsm/mkimage.py b/vdsm/mkimage.py index 4eb46e5..204d525 100644 --- a/vdsm/mkimage.py +++ b/vdsm/mkimage.py @@ -25,13 +25,15 @@ import errno import hashlib -from vdsm.constants import EXT_MKFS_MSDOS, EXT_MKISOFS, DISKIMAGE_USER, DISKIMAGE_GROUP +from vdsm.constants import EXT_MKFS_MSDOS, EXT_MKISOFS, \ + DISKIMAGE_USER, DISKIMAGE_GROUP from vdsm.constants import P_VDSM_RUN from storage.fileUtils import resolveUid, resolveGid import storage.misc import storage.mount _P_PAYLOAD_IMAGES = os.path.join(P_VDSM_RUN, 'payload') + def _decodeFilesIntoDir(files, dirname): ''' @@ -46,15 +48,18 @@ for name, content in files.iteritems(): filename = os.path.join(dirname, name) - with file(filename, 'w') as f: f.write(base64.b64decode(content)) + with file(filename, 'w') as f: + f.write(base64.b64decode(content)) + def _commonCleanFs(dirname, media): if media is not None: os.chown(media, resolveUid(DISKIMAGE_USER), - resolveGid(DISKIMAGE_GROUP)) + resolveGid(DISKIMAGE_GROUP)) if dirname is not None: shutil.rmtree(dirname) + def _getFileName(vmId, files): if not os.path.exists(_P_PAYLOAD_IMAGES): @@ -67,6 +72,7 @@ md5 = hashlib.md5(content).hexdigest() path = os.path.join(_P_PAYLOAD_IMAGES, "%s.%s.img" % (vmId, md5)) return path + def mkFloppyFs(vmId, files): floppy = dirname = None @@ -90,6 +96,7 @@ return floppy + def mkIsoFs(vmId, files): dirname = isopath = None try: @@ -107,8 +114,10 @@ return isopath + def removeFs(path): if not os.path.abspath(path).startswith(_P_PAYLOAD_IMAGES): - raise Exception('Cannot remove Fs that does not exists in: ' + _P_PAYLOAD_IMAGES) + raise Exception('Cannot remove Fs that does not exists in: ' + + _P_PAYLOAD_IMAGES) if os.path.exists(path): os.remove(path) diff --git a/vdsm/qemuImg.py b/vdsm/qemuImg.py index e3612ad..5496d93 100644 --- a/vdsm/qemuImg.py +++ b/vdsm/qemuImg.py @@ -23,25 +23,28 @@ _qemuimg = CommandPath("qemu-img", "/usr/bin/qemu-img", # Fedora, RHEL -) + ) + class FORMAT: - QCOW2 = "qcow2" - QCOW = "qcow" - QED = "qed" - RAW = "raw" - VMDK = "vmdk" + QCOW2 = "qcow2" + QCOW = "qcow" + QED = "qed" + RAW = "raw" + VMDK = "vmdk" __iregex = { 'format': re.compile("^file format: (?P<value>\w+)$"), 'virtualsize': re.compile("^virtual size: " - "[\d.]+[KMGT] $(?P<value>\d+) bytes$$"), + "[\d.]+[KMGT] $(?P<value>\d+) bytes$$"), 'clustersize': re.compile("^cluster_size: (?P<value>\d+)$"), 'backingfile': re.compile("^backing file: (?P<value>.+) \(actual path"), } + def __iregexSearch(pattern, text): return __iregex[pattern].search(text).group("value") + class QImgError(Exception): def __init__(self, ecode, stdout, stderr, message=None): @@ -52,7 +55,8 @@ def __str__(self): return "ecode=%s, stdout=%s, stderr=%s, message=%s" % ( - self.ecode, self.stdout, self.stderr, self.message) + self.ecode, self.stdout, self.stderr, self.message) + def info(image, format=None): cmd = [_qemuimg.cmd, "info"] @@ -82,6 +86,7 @@ return info + def check(image, format=None): cmd = [_qemuimg.cmd, "check"] diff --git a/vdsm/ut/ivdsm.py b/vdsm/ut/ivdsm.py index ccd9a45..086e90c 100644 --- a/vdsm/ut/ivdsm.py +++ b/vdsm/ut/ivdsm.py @@ -24,9 +24,13 @@ import threading import sys -def runVdsm(baseDir="/usr/share/vdsm/", configFilePath="/etc/vdsm/vdsm.conf", loggerConfigurationPath='/etc/vdsm/logger.conf'): + +def runVdsm(baseDir="/usr/share/vdsm/", configFilePath="/etc/vdsm/vdsm.conf", + loggerConfigurationPath='/etc/vdsm/logger.conf'): """ - Starts a VDSM instance in a new thread and returns a tuple ``(ClientIF, Thread Running VDSM)`` + Start a VDSM instance in a new thread. + + Return a tuple ``(ClientIF, Thread Running VDSM)`` """ if pwd.getpwuid(os.geteuid())[0] != "vdsm": raise Exception("You can't run vdsm with any user other then 'vdsm'.") @@ -45,9 +49,8 @@ cif = clientIF.clientIF(log) - t = threading.Thread(target = cif.serve) + t = threading.Thread(target=cif.serve) t.setDaemon(True) t.start() return (cif, t) - -- To view, visit http://gerrit.ovirt.org/9584 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4e0a0bdeb5f8a014b336fe32583cf9fc9c3cec4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

2 4

Change in vdsm[master]: Extract a method _getCapsXMLStr() to get capabilities from l...
by wudxw＠linux.vnet.ibm.com 29 Nov '12

29 Nov '12

Mark Wu has uploaded a new change for review. Change subject: Extract a method _getCapsXMLStr() to get capabilities from libvirt ...................................................................... Extract a method _getCapsXMLStr() to get capabilities from libvirt The new function _getCapsXMLStr() could be shared by _getCpuTopology() and _getEmulatedMachines(). And it also saves a libvirt call by memorizing the result. Change-Id: I004693d64c84479f150f05d348b2e843f48238a4 Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- M tests/capsTests.py M vdsm/caps.py 2 files changed, 10 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/9431/1 diff --git a/tests/capsTests.py b/tests/capsTests.py index 74ddda8..51d23ee 100644 --- a/tests/capsTests.py +++ b/tests/capsTests.py @@ -56,7 +56,7 @@ testPath = os.path.realpath(__file__) dirName = os.path.split(testPath)[0] path = os.path.join(dirName, "caps_libvirt.out") - t = caps.CpuTopology(path) + t = caps.CpuTopology(file(path).read()) self.assertEqual(t.threads(), 24) self.assertEqual(t.cores(), 12) self.assertEqual(t.sockets(), 2) diff --git a/vdsm/caps.py b/vdsm/caps.py index fdb06b1..4878f71 100644 --- a/vdsm/caps.py +++ b/vdsm/caps.py @@ -103,12 +103,15 @@ @utils.memoized +def _getCapsXMLStr(): + return libvirtconnection.get().getCapabilities() + + +(a)utils.memoized def _getCpuTopology(capabilities): - if capabilities: - caps = minidom.parse(capabilities) - else: - c = libvirtconnection.get() - caps = minidom.parseString(c.getCapabilities()) + if capabilities is None: + capabilities = _getCapsXMLStr() + caps = minidom.parseString(capabilities) host = caps.getElementsByTagName('host')[0] cpu = host.getElementsByTagName('cpu')[0] cells = host.getElementsByTagName('cells')[0] @@ -123,8 +126,7 @@ @utils.memoized def _getEmulatedMachines(): - c = libvirtconnection.get() - caps = minidom.parseString(c.getCapabilities()) + caps = minidom.parseString(_getCapsXML()) guestTag = caps.getElementsByTagName('guest') # Guest element is missing if kvm modules are not loaded if len(guestTag) == 0: -- To view, visit http://gerrit.ovirt.org/9431 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I004693d64c84479f150f05d348b2e843f48238a4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>

5 10

Change in vdsm[master]: packaging: add net-tools dependency
by Alon Bar-Lev 29 Nov '12

29 Nov '12

Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: add net-tools dependency ...................................................................... packaging: add net-tools dependency In fedora-18 net-tools(ifconfig) are not within vanilla. In future we should remove the ifconfig usage entirely. Change-Id: I74b238156f3751214fc9555f035feecb39daa967 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=869963 Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com> --- M vdsm.spec.in 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/86/9586/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index eebe535..8667fce 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -67,6 +67,7 @@ Requires: xz Requires: ntp Requires: iproute +Requires: net-tools Requires: python-ethtool Requires: rpm-python Requires: nfs-utils -- To view, visit http://gerrit.ovirt.org/9586 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I74b238156f3751214fc9555f035feecb39daa967 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>

2 2

Change in vdsm[master]: libvirtvm: prepare for <interface type='network'>
by Dan Kenigsberg 29 Nov '12

29 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: libvirtvm: prepare for <interface type='network'> ...................................................................... libvirtvm: prepare for <interface type='network'> In the near future (actually, in the following patch), I would like to define virtual interfaces with <source network>. If such a VM is migrated to a host expecting <source bridge>, bad thing would happen. This patch extracts <interface>'s network for bridge- and network-based interfaces alike. It should be applied to all the hosts in the cluster before generating the first network-based interface. Change-Id: Ib1eeb8c008d95c8812d855c7e073b5f78ffd67b2 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/libvirtvm.py 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/9531/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index 3439dc3..1f15306 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -2790,10 +2790,15 @@ mac = x.getElementsByTagName('mac')[0].getAttribute('address') alias = x.getElementsByTagName('alias')[0].getAttribute('name') model = x.getElementsByTagName('model')[0].getAttribute('type') - bridge = None + + network = None source = x.getElementsByTagName('source') if source: - bridge = source[0].getAttribute('bridge') + network = source[0].getAttribute('bridge') + if not network: + network = source[0].getAttribute('network') + network = network[len(netinfo.LIBVIRT_NET_PREFIX):] + # Get nic address address = self._getUnderlyingDeviceAddress(x) for nic in self._devices[vm.NIC_DEVICES]: @@ -2819,8 +2824,8 @@ 'address': address, 'alias': alias, 'name': name} - if bridge: - nicDev['network'] = bridge + if network: + nicDev['network'] = network self.conf['devices'].append(nicDev) def _setWriteWatermarks(self): -- To view, visit http://gerrit.ovirt.org/9531 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1eeb8c008d95c8812d855c7e073b5f78ffd67b2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

4 7

Change in vdsm[master]: Fix warnings at end of tests
by smizrahi＠redhat.com 29 Nov '12

29 Nov '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Fix warnings at end of tests ...................................................................... Fix warnings at end of tests Change-Id: Id11acbffcbc9faaef54a2ba3b24ed82c8710f51c Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/storage/remoteFileHandler.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/9395/1 diff --git a/vdsm/storage/remoteFileHandler.py b/vdsm/storage/remoteFileHandler.py index 2590b54..d54bdcc 100644 --- a/vdsm/storage/remoteFileHandler.py +++ b/vdsm/storage/remoteFileHandler.py @@ -241,7 +241,8 @@ except: pass - zombieReaper.autoReapPID(self.process.pid) + if zombieReaper is not None: + zombieReaper.autoReapPID(self.process.pid) def __del__(self): self.stop() -- To view, visit http://gerrit.ovirt.org/9395 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id11acbffcbc9faaef54a2ba3b24ed82c8710f51c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

4 12

Change in vdsm[master]: Adopt the change in xml output format
by barumuga＠redhat.com 28 Nov '12

28 Nov '12

Hello Ayal Baron, Timothy Asir, Saggi Mizrahi, Federico Simoncelli, Dan Kenigsberg, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/9323 to review the following change. Change subject: Adopt the change in xml output format ...................................................................... Adopt the change in xml output format 'gluster volume status --xml' output added values under <volumes/volume> levels. This change is taken up in the parsing. Change-Id: Icfb5c622b369d4ecd1ee0010595bec25557fe0c2 Signed-off-by: Bala.FA <barumuga(a)redhat.com> --- M tests/gluster_cli_tests.py M vdsm/gluster/cli.py M vdsm_cli/vdsClientGluster.py 3 files changed, 481 insertions(+), 464 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/23/9323/1 diff --git a/tests/gluster_cli_tests.py b/tests/gluster_cli_tests.py index 2a2a4d3..1b57433 100644 --- a/tests/gluster_cli_tests.py +++ b/tests/gluster_cli_tests.py @@ -217,36 +217,40 @@ <opErrno>0</opErrno> <opErrstr/> <volStatus> - <volName>music</volName> - <nodeCount>4</nodeCount> - <node> - <hostname>192.168.122.2</hostname> - <path>/tmp/music-b1</path> - <port>49152</port> - <status>1</status> - <pid>1313</pid> - </node> - <node> - <hostname>192.168.122.2</hostname> - <path>/tmp/music-b2</path> - <port>49153</port> - <status>1</status> - <pid>1335</pid> - </node> - <node> - <hostname>NFS Server</hostname> - <path>192.168.122.2</path> - <port>38467</port> - <status>1</status> - <pid>1357</pid> - </node> - <node> - <hostname>Self-heal Daemon</hostname> - <path>192.168.122.2</path> - <port>0</port> - <status>1</status> - <pid>1375</pid> - </node> + <volumes> + <volume> + <volName>music</volName> + <nodeCount>4</nodeCount> + <node> + <hostname>192.168.122.2</hostname> + <path>/tmp/music-b1</path> + <port>49152</port> + <status>1</status> + <pid>1313</pid> + </node> + <node> + <hostname>192.168.122.2</hostname> + <path>/tmp/music-b2</path> + <port>49153</port> + <status>1</status> + <pid>1335</pid> + </node> + <node> + <hostname>NFS Server</hostname> + <path>192.168.122.2</path> + <port>38467</port> + <status>1</status> + <pid>1357</pid> + </node> + <node> + <hostname>Self-heal Daemon</hostname> + <path>192.168.122.2</path> + <port>0</port> + <status>1</status> + <pid>1375</pid> + </node> + </volume> + </volumes> </volStatus> </cliOutput> """ @@ -277,34 +281,38 @@ <opErrno>0</opErrno> <opErrstr/> <volStatus> - <volName>music</volName> - <nodeCount>2</nodeCount> - <node> - <hostname>192.168.122.2</hostname> - <path>/tmp/music-b1</path> - <port>49152</port> - <status>1</status> - <pid>1313</pid> - <sizeTotal>8370712576</sizeTotal> - <sizeFree>4478812160</sizeFree> - <device>/dev/vda1</device> - <blockSize>4096</blockSize> - <mntOptions>rw,seclabel,relatime,data=ordered</mntOptions> - <fsName>ext4</fsName> - </node> - <node> - <hostname>192.168.122.2</hostname> - <path>/tmp/music-b2</path> - <port>49153</port> - <status>1</status> - <pid>1335</pid> - <sizeTotal>8370712576</sizeTotal> - <sizeFree>4478812160</sizeFree> - <device>/dev/vda1</device> - <blockSize>4096</blockSize> - <mntOptions>rw,seclabel,relatime,data=ordered</mntOptions> - <fsName>ext4</fsName> - </node> + <volumes> + <volume> + <volName>music</volName> + <nodeCount>2</nodeCount> + <node> + <hostname>192.168.122.2</hostname> + <path>/tmp/music-b1</path> + <port>49152</port> + <status>1</status> + <pid>1313</pid> + <sizeTotal>8370712576</sizeTotal> + <sizeFree>4478812160</sizeFree> + <device>/dev/vda1</device> + <blockSize>4096</blockSize> + <mntOptions>rw,seclabel,relatime,data=ordered</mntOptions> + <fsName>ext4</fsName> + </node> + <node> + <hostname>192.168.122.2</hostname> + <path>/tmp/music-b2</path> + <port>49153</port> + <status>1</status> + <pid>1335</pid> + <sizeTotal>8370712576</sizeTotal> + <sizeFree>4478812160</sizeFree> + <device>/dev/vda1</device> + <blockSize>4096</blockSize> + <mntOptions>rw,seclabel,relatime,data=ordered</mntOptions> + <fsName>ext4</fsName> + </node> + </volume> + </volumes> </volStatus> </cliOutput>""" tree = etree.fromstring(out) @@ -334,48 +342,52 @@ <opErrno>0</opErrno> <opErrstr/> <volStatus> - <volName>music</volName> - <nodeCount>2</nodeCount> - <node> - <hostname>192.168.122.2</hostname> - <path>/tmp/music-b1</path> - <port>49152</port> - <status>1</status> - <pid>1313</pid> - <clientsStatus> - <clientCount>2</clientCount> - <client> - <hostname>192.168.122.2:1021</hostname> - <bytesRead>1172</bytesRead> - <bytesWrite>792</bytesWrite> - </client> - <client> - <hostname>192.168.122.2:1011</hostname> - <bytesRead>10076</bytesRead> - <bytesWrite>12152</bytesWrite> - </client> - </clientsStatus> - </node> - <node> - <hostname>192.168.122.2</hostname> - <path>/tmp/music-b2</path> - <port>49153</port> - <status>1</status> - <pid>1335</pid> - <clientsStatus> - <clientCount>2</clientCount> - <client> - <hostname>192.168.122.2:1020</hostname> - <bytesRead>1172</bytesRead> - <bytesWrite>792</bytesWrite> - </client> - <client> - <hostname>192.168.122.2:1010</hostname> - <bytesRead>10864</bytesRead> - <bytesWrite>12816</bytesWrite> - </client> - </clientsStatus> - </node> + <volumes> + <volume> + <volName>music</volName> + <nodeCount>2</nodeCount> + <node> + <hostname>192.168.122.2</hostname> + <path>/tmp/music-b1</path> + <port>49152</port> + <status>1</status> + <pid>1313</pid> + <clientsStatus> + <clientCount>2</clientCount> + <client> + <hostname>192.168.122.2:1021</hostname> + <bytesRead>1172</bytesRead> + <bytesWrite>792</bytesWrite> + </client> + <client> + <hostname>192.168.122.2:1011</hostname> + <bytesRead>10076</bytesRead> + <bytesWrite>12152</bytesWrite> + </client> + </clientsStatus> + </node> + <node> + <hostname>192.168.122.2</hostname> + <path>/tmp/music-b2</path> + <port>49153</port> + <status>1</status> + <pid>1335</pid> + <clientsStatus> + <clientCount>2</clientCount> + <client> + <hostname>192.168.122.2:1020</hostname> + <bytesRead>1172</bytesRead> + <bytesWrite>792</bytesWrite> + </client> + <client> + <hostname>192.168.122.2:1010</hostname> + <bytesRead>10864</bytesRead> + <bytesWrite>12816</bytesWrite> + </client> + </clientsStatus> + </node> + </volume> + </volumes> </volStatus> </cliOutput> """ @@ -406,356 +418,360 @@ <opErrno>0</opErrno> <opErrstr/> <volStatus> - <volName>music</volName> - <nodeCount>2</nodeCount> - <node> - <hostname>192.168.122.2</hostname> - <path>/tmp/music-b1</path> - <port>49152</port> - <status>1</status> - <pid>1452</pid> - <memStatus> - <mallinfo> - <arena>606208</arena> - <ordblks>6</ordblks> - <smblks>1</smblks> - <hblks>12</hblks> - <hblkhd>15179776</hblkhd> - <usmblks>0</usmblks> - <fsmblks>64</fsmblks> - <uordblks>474208</uordblks> - <fordblks>132000</fordblks> - <keepcost>130224</keepcost> - </mallinfo> - <mempool> - <count>15</count> - <pool> - <name>music-server:fd_t</name> - <hotCount>0</hotCount> - <coldCount>1024</coldCount> - <padddedSizeOf>100</padddedSizeOf> - <allocCount>0</allocCount> - <maxAlloc>0</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>music-server:dentry_t</name> - <hotCount>0</hotCount> - <coldCount>16384</coldCount> - <padddedSizeOf>84</padddedSizeOf> - <allocCount>0</allocCount> - <maxAlloc>0</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>music-server:inode_t</name> - <hotCount>1</hotCount> - <coldCount>16383</coldCount> - <padddedSizeOf>148</padddedSizeOf> - <allocCount>1</allocCount> - <maxAlloc>1</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>music-locks:pl_local_t</name> - <hotCount>0</hotCount> - <coldCount>32</coldCount> - <padddedSizeOf>140</padddedSizeOf> - <allocCount>1</allocCount> - <maxAlloc>1</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>music-marker:marker_local_t</name> - <hotCount>0</hotCount> - <coldCount>128</coldCount> - <padddedSizeOf>316</padddedSizeOf> - <allocCount>0</allocCount> - <maxAlloc>0</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>music-server:rpcsvc_request_t</name> - <hotCount>0</hotCount> - <coldCount>512</coldCount> - <padddedSizeOf>6372</padddedSizeOf> - <allocCount>10</allocCount> - <maxAlloc>1</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:struct saved_frame</name> - <hotCount>0</hotCount> - <coldCount>8</coldCount> - <padddedSizeOf>124</padddedSizeOf> - <allocCount>2</allocCount> - <maxAlloc>2</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:struct rpc_req</name> - <hotCount>0</hotCount> - <coldCount>8</coldCount> - <padddedSizeOf>2236</padddedSizeOf> - <allocCount>2</allocCount> - <maxAlloc>2</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:rpcsvc_request_t</name> - <hotCount>1</hotCount> - <coldCount>7</coldCount> - <padddedSizeOf>6372</padddedSizeOf> - <allocCount>1</allocCount> - <maxAlloc>1</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:data_t</name> - <hotCount>117</hotCount> - <coldCount>16266</coldCount> - <padddedSizeOf>52</padddedSizeOf> - <allocCount>179</allocCount> - <maxAlloc>121</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:data_pair_t</name> - <hotCount>138</hotCount> - <coldCount>16245</coldCount> - <padddedSizeOf>68</padddedSizeOf> - <allocCount>218</allocCount> - <maxAlloc>142</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:dict_t</name> - <hotCount>13</hotCount> - <coldCount>4083</coldCount> - <padddedSizeOf>84</padddedSizeOf> - <allocCount>24</allocCount> - <maxAlloc>15</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:call_stub_t</name> - <hotCount>0</hotCount> - <coldCount>1024</coldCount> - <padddedSizeOf>1228</padddedSizeOf> - <allocCount>2</allocCount> - <maxAlloc>1</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:call_stack_t</name> - <hotCount>0</hotCount> - <coldCount>1024</coldCount> - <padddedSizeOf>2084</padddedSizeOf> - <allocCount>4</allocCount> - <maxAlloc>2</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:call_frame_t</name> - <hotCount>0</hotCount> - <coldCount>4096</coldCount> - <padddedSizeOf>172</padddedSizeOf> - <allocCount>14</allocCount> - <maxAlloc>7</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - </mempool> - </memStatus> - </node> - <node> - <hostname>192.168.122.2</hostname> - <path>/tmp/music-b2</path> - <port>49153</port> - <status>1</status> - <pid>1459</pid> - <memStatus> - <mallinfo> - <arena>606208</arena> - <ordblks>5</ordblks> - <smblks>2</smblks> - <hblks>12</hblks> - <hblkhd>15179776</hblkhd> - <usmblks>0</usmblks> - <fsmblks>128</fsmblks> - <uordblks>474224</uordblks> - <fordblks>131984</fordblks> - <keepcost>130224</keepcost> - </mallinfo> - <mempool> - <count>15</count> - <pool> - <name>music-server:fd_t</name> - <hotCount>0</hotCount> - <coldCount>1024</coldCount> - <padddedSizeOf>100</padddedSizeOf> - <allocCount>0</allocCount> - <maxAlloc>0</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>music-server:dentry_t</name> - <hotCount>0</hotCount> - <coldCount>16384</coldCount> - <padddedSizeOf>84</padddedSizeOf> - <allocCount>0</allocCount> - <maxAlloc>0</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>music-server:inode_t</name> - <hotCount>1</hotCount> - <coldCount>16383</coldCount> - <padddedSizeOf>148</padddedSizeOf> - <allocCount>2</allocCount> - <maxAlloc>2</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>music-locks:pl_local_t</name> - <hotCount>0</hotCount> - <coldCount>32</coldCount> - <padddedSizeOf>140</padddedSizeOf> - <allocCount>1</allocCount> - <maxAlloc>1</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>music-marker:marker_local_t</name> - <hotCount>0</hotCount> - <coldCount>128</coldCount> - <padddedSizeOf>316</padddedSizeOf> - <allocCount>0</allocCount> - <maxAlloc>0</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>music-server:rpcsvc_request_t</name> - <hotCount>0</hotCount> - <coldCount>512</coldCount> - <padddedSizeOf>6372</padddedSizeOf> - <allocCount>12</allocCount> - <maxAlloc>1</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:struct saved_frame</name> - <hotCount>0</hotCount> - <coldCount>8</coldCount> - <padddedSizeOf>124</padddedSizeOf> - <allocCount>2</allocCount> - <maxAlloc>2</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:struct rpc_req</name> - <hotCount>0</hotCount> - <coldCount>8</coldCount> - <padddedSizeOf>2236</padddedSizeOf> - <allocCount>2</allocCount> - <maxAlloc>2</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:rpcsvc_request_t</name> - <hotCount>1</hotCount> - <coldCount>7</coldCount> - <padddedSizeOf>6372</padddedSizeOf> - <allocCount>1</allocCount> - <maxAlloc>1</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:data_t</name> - <hotCount>117</hotCount> - <coldCount>16266</coldCount> - <padddedSizeOf>52</padddedSizeOf> - <allocCount>180</allocCount> - <maxAlloc>121</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:data_pair_t</name> - <hotCount>138</hotCount> - <coldCount>16245</coldCount> - <padddedSizeOf>68</padddedSizeOf> - <allocCount>220</allocCount> - <maxAlloc>142</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:dict_t</name> - <hotCount>13</hotCount> - <coldCount>4083</coldCount> - <padddedSizeOf>84</padddedSizeOf> - <allocCount>25</allocCount> - <maxAlloc>15</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:call_stub_t</name> - <hotCount>0</hotCount> - <coldCount>1024</coldCount> - <padddedSizeOf>1228</padddedSizeOf> - <allocCount>4</allocCount> - <maxAlloc>1</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:call_stack_t</name> - <hotCount>0</hotCount> - <coldCount>1024</coldCount> - <padddedSizeOf>2084</padddedSizeOf> - <allocCount>6</allocCount> - <maxAlloc>2</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - <pool> - <name>glusterfs:call_frame_t</name> - <hotCount>0</hotCount> - <coldCount>4096</coldCount> - <padddedSizeOf>172</padddedSizeOf> - <allocCount>20</allocCount> - <maxAlloc>7</maxAlloc> - <poolMisses>0</poolMisses> - <maxStdAlloc>0</maxStdAlloc> - </pool> - </mempool> - </memStatus> - </node> + <volumes> + <volume> + <volName>music</volName> + <nodeCount>2</nodeCount> + <node> + <hostname>192.168.122.2</hostname> + <path>/tmp/music-b1</path> + <port>49152</port> + <status>1</status> + <pid>1452</pid> + <memStatus> + <mallinfo> + <arena>606208</arena> + <ordblks>6</ordblks> + <smblks>1</smblks> + <hblks>12</hblks> + <hblkhd>15179776</hblkhd> + <usmblks>0</usmblks> + <fsmblks>64</fsmblks> + <uordblks>474208</uordblks> + <fordblks>132000</fordblks> + <keepcost>130224</keepcost> + </mallinfo> + <mempool> + <count>15</count> + <pool> + <name>music-server:fd_t</name> + <hotCount>0</hotCount> + <coldCount>1024</coldCount> + <padddedSizeOf>100</padddedSizeOf> + <allocCount>0</allocCount> + <maxAlloc>0</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>music-server:dentry_t</name> + <hotCount>0</hotCount> + <coldCount>16384</coldCount> + <padddedSizeOf>84</padddedSizeOf> + <allocCount>0</allocCount> + <maxAlloc>0</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>music-server:inode_t</name> + <hotCount>1</hotCount> + <coldCount>16383</coldCount> + <padddedSizeOf>148</padddedSizeOf> + <allocCount>1</allocCount> + <maxAlloc>1</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>music-locks:pl_local_t</name> + <hotCount>0</hotCount> + <coldCount>32</coldCount> + <padddedSizeOf>140</padddedSizeOf> + <allocCount>1</allocCount> + <maxAlloc>1</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>music-marker:marker_local_t</name> + <hotCount>0</hotCount> + <coldCount>128</coldCount> + <padddedSizeOf>316</padddedSizeOf> + <allocCount>0</allocCount> + <maxAlloc>0</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>music-server:rpcsvc_request_t</name> + <hotCount>0</hotCount> + <coldCount>512</coldCount> + <padddedSizeOf>6372</padddedSizeOf> + <allocCount>10</allocCount> + <maxAlloc>1</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:struct saved_frame</name> + <hotCount>0</hotCount> + <coldCount>8</coldCount> + <padddedSizeOf>124</padddedSizeOf> + <allocCount>2</allocCount> + <maxAlloc>2</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:struct rpc_req</name> + <hotCount>0</hotCount> + <coldCount>8</coldCount> + <padddedSizeOf>2236</padddedSizeOf> + <allocCount>2</allocCount> + <maxAlloc>2</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:rpcsvc_request_t</name> + <hotCount>1</hotCount> + <coldCount>7</coldCount> + <padddedSizeOf>6372</padddedSizeOf> + <allocCount>1</allocCount> + <maxAlloc>1</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:data_t</name> + <hotCount>117</hotCount> + <coldCount>16266</coldCount> + <padddedSizeOf>52</padddedSizeOf> + <allocCount>179</allocCount> + <maxAlloc>121</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:data_pair_t</name> + <hotCount>138</hotCount> + <coldCount>16245</coldCount> + <padddedSizeOf>68</padddedSizeOf> + <allocCount>218</allocCount> + <maxAlloc>142</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:dict_t</name> + <hotCount>13</hotCount> + <coldCount>4083</coldCount> + <padddedSizeOf>84</padddedSizeOf> + <allocCount>24</allocCount> + <maxAlloc>15</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:call_stub_t</name> + <hotCount>0</hotCount> + <coldCount>1024</coldCount> + <padddedSizeOf>1228</padddedSizeOf> + <allocCount>2</allocCount> + <maxAlloc>1</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:call_stack_t</name> + <hotCount>0</hotCount> + <coldCount>1024</coldCount> + <padddedSizeOf>2084</padddedSizeOf> + <allocCount>4</allocCount> + <maxAlloc>2</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:call_frame_t</name> + <hotCount>0</hotCount> + <coldCount>4096</coldCount> + <padddedSizeOf>172</padddedSizeOf> + <allocCount>14</allocCount> + <maxAlloc>7</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + </mempool> + </memStatus> + </node> + <node> + <hostname>192.168.122.2</hostname> + <path>/tmp/music-b2</path> + <port>49153</port> + <status>1</status> + <pid>1459</pid> + <memStatus> + <mallinfo> + <arena>606208</arena> + <ordblks>5</ordblks> + <smblks>2</smblks> + <hblks>12</hblks> + <hblkhd>15179776</hblkhd> + <usmblks>0</usmblks> + <fsmblks>128</fsmblks> + <uordblks>474224</uordblks> + <fordblks>131984</fordblks> + <keepcost>130224</keepcost> + </mallinfo> + <mempool> + <count>15</count> + <pool> + <name>music-server:fd_t</name> + <hotCount>0</hotCount> + <coldCount>1024</coldCount> + <padddedSizeOf>100</padddedSizeOf> + <allocCount>0</allocCount> + <maxAlloc>0</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>music-server:dentry_t</name> + <hotCount>0</hotCount> + <coldCount>16384</coldCount> + <padddedSizeOf>84</padddedSizeOf> + <allocCount>0</allocCount> + <maxAlloc>0</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>music-server:inode_t</name> + <hotCount>1</hotCount> + <coldCount>16383</coldCount> + <padddedSizeOf>148</padddedSizeOf> + <allocCount>2</allocCount> + <maxAlloc>2</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>music-locks:pl_local_t</name> + <hotCount>0</hotCount> + <coldCount>32</coldCount> + <padddedSizeOf>140</padddedSizeOf> + <allocCount>1</allocCount> + <maxAlloc>1</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>music-marker:marker_local_t</name> + <hotCount>0</hotCount> + <coldCount>128</coldCount> + <padddedSizeOf>316</padddedSizeOf> + <allocCount>0</allocCount> + <maxAlloc>0</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>music-server:rpcsvc_request_t</name> + <hotCount>0</hotCount> + <coldCount>512</coldCount> + <padddedSizeOf>6372</padddedSizeOf> + <allocCount>12</allocCount> + <maxAlloc>1</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:struct saved_frame</name> + <hotCount>0</hotCount> + <coldCount>8</coldCount> + <padddedSizeOf>124</padddedSizeOf> + <allocCount>2</allocCount> + <maxAlloc>2</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:struct rpc_req</name> + <hotCount>0</hotCount> + <coldCount>8</coldCount> + <padddedSizeOf>2236</padddedSizeOf> + <allocCount>2</allocCount> + <maxAlloc>2</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:rpcsvc_request_t</name> + <hotCount>1</hotCount> + <coldCount>7</coldCount> + <padddedSizeOf>6372</padddedSizeOf> + <allocCount>1</allocCount> + <maxAlloc>1</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:data_t</name> + <hotCount>117</hotCount> + <coldCount>16266</coldCount> + <padddedSizeOf>52</padddedSizeOf> + <allocCount>180</allocCount> + <maxAlloc>121</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:data_pair_t</name> + <hotCount>138</hotCount> + <coldCount>16245</coldCount> + <padddedSizeOf>68</padddedSizeOf> + <allocCount>220</allocCount> + <maxAlloc>142</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:dict_t</name> + <hotCount>13</hotCount> + <coldCount>4083</coldCount> + <padddedSizeOf>84</padddedSizeOf> + <allocCount>25</allocCount> + <maxAlloc>15</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:call_stub_t</name> + <hotCount>0</hotCount> + <coldCount>1024</coldCount> + <padddedSizeOf>1228</padddedSizeOf> + <allocCount>4</allocCount> + <maxAlloc>1</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:call_stack_t</name> + <hotCount>0</hotCount> + <coldCount>1024</coldCount> + <padddedSizeOf>2084</padddedSizeOf> + <allocCount>6</allocCount> + <maxAlloc>2</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + <pool> + <name>glusterfs:call_frame_t</name> + <hotCount>0</hotCount> + <coldCount>4096</coldCount> + <padddedSizeOf>172</padddedSizeOf> + <allocCount>20</allocCount> + <maxAlloc>7</maxAlloc> + <poolMisses>0</poolMisses> + <maxStdAlloc>0</maxStdAlloc> + </pool> + </mempool> + </memStatus> + </node> + </volume> + </volumes> </volStatus> </cliOutput> """ diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py index af16891..c2c3542 100644 --- a/vdsm/gluster/cli.py +++ b/vdsm/gluster/cli.py @@ -117,12 +117,12 @@ def _parseVolumeStatus(tree): - status = {'name': tree.find('volStatus/volName').text, + status = {'name': tree.find('volStatus/volumes/volume/volName').text, 'bricks': [], 'nfs': [], 'shd': []} hostname = _getLocalIpAddress() or _getGlusterHostName() - for el in tree.findall('volStatus/node'): + for el in tree.findall('volStatus/volumes/volume/node'): value = {} for ch in el.getchildren(): @@ -155,9 +155,9 @@ def _parseVolumeStatusDetail(tree): - status = {'name': tree.find('volStatus/volName').text, + status = {'name': tree.find('volStatus/volumes/volume/volName').text, 'bricks': []} - for el in tree.findall('volStatus/node'): + for el in tree.findall('volStatus/volumes/volume/node'): value = {} for ch in el.getchildren(): @@ -179,9 +179,9 @@ def _parseVolumeStatusClients(tree): - status = {'name': tree.find('volStatus/volName').text, + status = {'name': tree.find('volStatus/volumes/volume/volName').text, 'bricks': []} - for el in tree.findall('volStatus/node'): + for el in tree.findall('volStatus/volumes/volume/node'): hostname = el.find('hostname').text path = el.find('path').text @@ -200,9 +200,9 @@ def _parseVolumeStatusMem(tree): - status = {'name': tree.find('volStatus/volName').text, + status = {'name': tree.find('volStatus/volumes/volume/volName').text, 'bricks': []} - for el in tree.findall('volStatus/node'): + for el in tree.findall('volStatus/volumes/volume/node'): brick = {'brick': '%s:%s' % (el.find('hostname').text, el.find('path').text), 'mallinfo': {}, diff --git a/vdsm_cli/vdsClientGluster.py b/vdsm_cli/vdsClientGluster.py index 7799735..25e7dc6 100644 --- a/vdsm_cli/vdsClientGluster.py +++ b/vdsm_cli/vdsClientGluster.py @@ -235,10 +235,11 @@ return status['status']['code'], status['status']['message'] def do_glusterVolumeStatus(self, args): - volumeName = args[0] - params = self._eqSplit(args[1:]) + params = self._eqSplit(args) + volumeName = params.get('volumeName', '') brick = params.get('brick', '') option = params.get('option', '') + status = self.s.glusterVolumeStatus(volumeName, brick, option) pp.pprint(status) return status['status']['code'], status['status']['message'] @@ -421,12 +422,12 @@ )), 'glusterVolumeStatus': (serv.do_glusterVolumeStatus, - ('<volume_name> [brick=<existing_brick>] ' + ('volumeName=<volume_name> [brick=<existing_brick>] ' '[option={detail | clients | mem}]\n\t' '<volume_name> is existing volume name\n\t' - 'detail option gives brick detailed status\n\t' - 'clients option gives clients status\n\t' - 'mem option gives memory status\n\t', + 'option=detail gives brick detailed status\n\t' + 'option=clients gives clients status\n\t' + 'option=mem gives memory status\n\t', 'get volume status of given volume with its all brick or ' 'specified brick' )), -- To view, visit http://gerrit.ovirt.org/9323 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icfb5c622b369d4ecd1ee0010595bec25557fe0c2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Bala.FA <barumuga(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Timothy Asir <tjeyasin(a)redhat.com>

4 7

Change in vdsm[master]: Signed-off-by: Dan Yasny <dyasny@gmail.com>
by dyasny＠gmail.com 28 Nov '12

28 Nov '12

Dan Yasny has uploaded a new change for review. Change subject: Signed-off-by: Dan Yasny <dyasny(a)gmail.com> ...................................................................... Signed-off-by: Dan Yasny <dyasny(a)gmail.com> Cisco VM-FEX support vdsm hooks Change-Id: I45a7fa46919bb39a648dff190c40618395990e91 Signed-off-by: Dan Yasny <dyasny(a)dy-lappie.usersys.redhat.com> --- A vdsm_hooks/vmfex/Makefile.am A vdsm_hooks/vmfex/README A vdsm_hooks/vmfex/before_vm_migrate_destination.py A vdsm_hooks/vmfex/before_vm_start.py 4 files changed, 394 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/7547/1 diff --git a/vdsm_hooks/vmfex/Makefile.am b/vdsm_hooks/vmfex/Makefile.am new file mode 100644 index 0000000..b921275 --- /dev/null +++ b/vdsm_hooks/vmfex/Makefile.am @@ -0,0 +1,36 @@ +# +# Copyright 2011 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 +# + +EXTRA_DIST = \ + before_vm_migrate_destination.py \ + before_vm_start.py \ + +install-data-local: + $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/before_vm_start + $(INSTALL_SCRIPT) $(srcdir)/before_vm_start.py \ + $(DESTDIR)$(vdsmhooksdir)/before_vm_start/50_vmfex + $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/before_vm_migrate_destination + $(INSTALL_SCRIPT) $(srcdir)/before_vm_migrate_destination.py \ + $(DESTDIR)$(vdsmhooksdir)/before_vm_migrate_destination/50_vmfex + +uninstall-local: uninstall-data-sudoers + $(RM) $(DESTDIR)$(vdsmhooksdir)/before_vm_start/50_vmfex + $(RM) $(DESTDIR)$(vdsmhooksdir)/before_vm_migrate_destination/50_vmfex + diff --git a/vdsm_hooks/vmfex/README b/vdsm_hooks/vmfex/README new file mode 100644 index 0000000..1eb7629 --- /dev/null +++ b/vdsm_hooks/vmfex/README @@ -0,0 +1,61 @@ +vmfex vdsm hook +=================== + +Add Cisco VM-FEX Port Profile to Virtual Machine +Sample: + vmfex=NIC1:profile1,NIC2:profile2... + + Will add 2 virtual nics attached to profile1 and profile2 using the vnic + MAC addresses specified, replacing the actual NICs assigned to the VM. + The mapping is by order of NIC<number> in the parameters, mapped to the + order of the "interface" elements in the devices of the VM xml, as well + as the NICs defined for a VM in the RHEV-M admin GUI. + +Libvirt internals: +Replace the existing interface xml: + <interface type="bridge"> + <mac address="<mac>"/> + <model type="virtio"/> + <source bridge="<logical network>"/> + </interface> + +with the following interface xml: + <interface type='network'> + <mac address='<mac>'/> + <source network='direct-pool'/> + <virtualport type='802.1Qbh'> + <parameters profileid='<Port Profile>'/> + </virtualport> + <model type='virtio'/> + </interface> + +Dynamic network with libvirt (define a NIC pool, so libvirt can assign VMs to NICs dynamically): + + <network> + <name>direct-pool</name> + <forward mode="passthrough"> + <interface dev="eth3"/> + <interface dev="eth4"/> + <interface dev="eth5"/> + <interface dev="eth6"/> + <interface dev="eth7"/> + <interface dev="eth8"/> + <interface dev="eth9"/> + <interface dev="eth10"/> + <interface dev="eth11"/> + </forward> + </network> + +Using libvirt, the network is defined like this: + + virsh net-define /tmp/direct-pool.xml + virsh net-start direct-pool + virsh net-autostart direct-pool + +(where /tmp/direct-pool.xml contains the xml above) + +(everything else is autogenerated, and shouldn't be specified +when defining a guest (but whatever is there after definition +should be left in place, e.g. the PCI address)). Note that these +interface definitions are completely static - you never need to modify +them due to migration, or starting up/shutting down the guest. diff --git a/vdsm_hooks/vmfex/before_vm_migrate_destination.py b/vdsm_hooks/vmfex/before_vm_migrate_destination.py new file mode 100755 index 0000000..a80df7f --- /dev/null +++ b/vdsm_hooks/vmfex/before_vm_migrate_destination.py @@ -0,0 +1,109 @@ +#!/usr/bin/python + +import os +import subprocess +import sys +import hooking +import traceback +import libvirtconnection + +''' +Placed in before_vm_migrate_destination + +vmfex hook on migration destination: + +Set up a dynamic NIC pool for incoming migrations to use + + <network> + <name>direct-pool</name> + <forward mode="passthrough"> + <interface dev="eth3"/> + <interface dev="eth4"/> + <interface dev="eth5"/> + <interface dev="eth6"/> + <interface dev="eth7"/> + <interface dev="eth8"/> + <interface dev="eth9"/> + <interface dev="eth10"/> + <interface dev="eth11"/> + </forward> + </network> + +Using libvirt, the network is defined like this: + + virsh net-define /tmp/direct-pool.xml + virsh net-start direct-pool + virsh net-autostart direct-pool + +(where /tmp/direct-pool.xml contains the xml above) + +(everything else is autogenerated, and shouldn't be specified +when defining a guest (but whatever is there after definition +should be left in place, e.g. the PCI address)). Note that these +interface definitions are completely static - you never need to modify +them due to migration, or starting up/shutting down the guest. + +''' + +def getUsableNics(): + # Scan localhost for physical NICs and return list of physical nics + # that have all zeroes MAC + # Example ['eth0','eth1'] + nics = [] + cmd = "find /sys/devices/pci* | grep '/net/' |grep address" + p = subprocess.Popen(cmd,stdout=subprocess.PIPE,shell=True) + s = p.stdout.read().split() + for i in s: + mac = open(i).read().strip() + if mac == '00:00:00:00:00:00': + nics.append(i.split('/')[-2]) + return nics + +def createDirectPool(conn): + xmlstr = """<network> \n <name>direct-pool</name> \n <forward mode="passthrough"> \n """ + for i in getUsableNics(): + s = '<interface dev="' + str(i) + '"/> \n' + xmlstr += s + + xmlstr += """ </forward> \n </network> """ + conn.networkDefineXML(xmlstr) + dpool = conn.networkLookupByName('direct-pool') + dpool.setAutostart(1) + dpool.create() + + + +if os.environ.has_key('vmfex'): + try: + #connect to libvirtd + conn = libvirtconnection.get('qemu:///system') + + #check for running VMs. If there are VMs running, skip creating a dNIC pool + if len(conn.listDomainsID()) == 0: + #check if direct-pool is created + if 'direct-pool' not in conn.listNetworks(): + createDirectPool(conn) + else: + if conn.networkLookupByName('direct-pool').isActive() == 0: + conn.networkLookupByName('direct-pool').create() + conn.networkLookupByName('direct-pool').setAutostart(1) + + #check if the defined dNIC pool didn't change + dpool = conn.networkLookupByName('direct-pool') + definedNics = [] + for i in dpool.split(): + if 'dev=' in i: + definedNics.append(str(i.split('=')[1].split('/')[0].strip("'"))) + #if the defined NIC pool doesn't match the usable NIC list, recreate the network + if set(definedNics) != set(getUsableNics()): + conn.networkLookupByName('direct-pool').destroy() + conn.networkLookupByName('direct-pool').undefine() + createDirectPool(conn) + + if 'direct-pool' not in conn.listNetworks(): + createDirectPool(conn) + + except: + sys.stderr.write('vmfex: [unexpected error]: %s\n' % traceback.format_exc()) + sys.exit(2) + diff --git a/vdsm_hooks/vmfex/before_vm_start.py b/vdsm_hooks/vmfex/before_vm_start.py new file mode 100755 index 0000000..9002e3f --- /dev/null +++ b/vdsm_hooks/vmfex/before_vm_start.py @@ -0,0 +1,188 @@ +#!/usr/bin/python + +import os +import subprocess +import sys +import xml +import hooking +import traceback +from xml.dom import minidom +import libvirtconnection + +''' +Placed in before_vm_start + +vmfex hook: +Add Cisco VM-FEX Port Profile to Virtual Machine +Sample: + vmfex=NIC1:profile1,NIC2:profile2... + + Will add 2 virtual nics attached to profile1 and profile2 using the vnic + MAC addresses specified, replacing the actual NICs assigned to the VM. + The mapping is by order of NIC<number> in the parameters, mapped to the + order of the "interface" elements in the devices of the VM xml, as well + as the NICs defined for a VM in the RHEV-M admin GUI. + +Libvirt internals: +Replace the existing interface xml: + <interface type="bridge"> + <mac address="<mac>"/> + <model type="virtio"/> + <source bridge="<logical network>"/> + </interface> + +with the following interface xml: + <interface type='network'> + <mac address='<mac>'/> + <source network='direct-pool'/> + <virtualport type='802.1Qbh'> + <parameters profileid='<Port Profile>'/> + </virtualport> + <model type='virtio'/> + </interface> + +Dynamic network with libvirt (define a NIC pool, so libvirt can assign VMs to NICs dynamically): + + <network> + <name>direct-pool</name> + <forward mode="passthrough"> + <interface dev="eth3"/> + <interface dev="eth4"/> + <interface dev="eth5"/> + <interface dev="eth6"/> + <interface dev="eth7"/> + <interface dev="eth8"/> + <interface dev="eth9"/> + <interface dev="eth10"/> + <interface dev="eth11"/> + </forward> + </network> + +Using libvirt, the network is defined like this: + + virsh net-define /tmp/direct-pool.xml + virsh net-start direct-pool + virsh net-autostart direct-pool + +(where /tmp/direct-pool.xml contains the xml above) + +(everything else is autogenerated, and shouldn't be specified +when defining a guest (but whatever is there after definition +should be left in place, e.g. the PCI address)). Note that these +interface definitions are completely static - you never need to modify +them due to migration, or starting up/shutting down the guest. + +''' + +def getUsableNics(): + # Scan localhost for physical NICs and return list of physical nics + # that have all zeroes MAC + # Example ['eth0','eth1'] + nics = [] + cmd = "find /sys/devices/pci* | grep '/net/' |grep address" + p = subprocess.Popen(cmd,stdout=subprocess.PIPE,shell=True) + s = p.stdout.read().split() + for i in s: + mac = open(i).read().strip() + if mac == '00:00:00:00:00:00': + nics.append(i.split('/')[-2]) + return nics + +def enumNics(devices): + # Given the domxml of VM devices, return the NIC elements numbered 1 through len()+1 + vnicmap = {} + i = 1 + for interface in devices.getElementsByTagName('interface'): + vnicmap[i] = interface + i += 1 + return vnicmap + +def createDirectPool(conn): + xmlstr = """<network> \n <name>direct-pool</name> \n <forward mode="passthrough"> \n """ + for i in getUsableNics(): + s = '<interface dev="' + str(i) + '"/> \n' + xmlstr += s + + xmlstr += """ </forward> \n </network> """ + conn.networkDefineXML(xmlstr) + dpool = conn.networkLookupByName('direct-pool') + dpool.setAutostart(1) + dpool.create() + + + +if os.environ.has_key('vmfex'): + try: + #connect to libvirtd + conn = libvirtconnection.get('qemu:///system') + + #check for running VMs. If there are VMs running, skip creating a dNIC pool + if len(conn.listDomainsID()) == 0: + #check if direct-pool is created + if 'direct-pool' not in conn.listNetworks(): + createDirectPool(conn) + else: + if conn.networkLookupByName('direct-pool').isActive() == 0: + conn.networkLookupByName('direct-pool').create() + conn.networkLookupByName('direct-pool').setAutostart(1) + + #check if the defined dNIC pool didn't change + dpool = conn.networkLookupByName('direct-pool') + definedNics = [] + for i in dpool.split(): + if 'dev=' in i: + definedNics.append(str(i.split('=')[1].split('/')[0].strip("'"))) + #if the defined NIC pool doesn't match the usable NIC list, recreate the network + if set(definedNics) != set(getUsableNics()): + conn.networkLookupByName('direct-pool').destroy() + conn.networkLookupByName('direct-pool').undefine() + createDirectPool(conn) + + if 'direct-pool' not in conn.listNetworks(): + createDirectPool(conn) + + except: + pass + + + try: + #Get the vmfex line + vmfex = os.environ['vmfex'] + + #Get the VM's xml definition + domxml = hooking.read_domxml() + devices = domxml.getElementsByTagName('devices')[0] + vnicmap = enumNics(devices) + + counter = 0 + + for entry in vmfex.split(','): + sys.stderr.write('vmfex: adding interface to profile: %s\n' % entry) + try: + nicnum = int(entry.split(':')[0][3:]) + profile = entry.split(':')[1] + mynic = vnicmap[nicnum] + #replace type="bridge" with "network" + mynic.setAttribute('type','network') + + source = mynic.getElementsByTagName('source')[0] + source.removeAttribute('bridge') + source.setAttribute('network', 'direct-pool') + + virtualport = domxml.createElement('virtualport') + virtualport.setAttribute('type', '802.1Qbh') + mynic.appendChild(virtualport) + + parameters = domxml.createElement('parameters') + parameters.setAttribute('profileid', profile) + virtualport.appendChild(parameters) + + except: + sys.stderr.write('vmfex: Error in vmfex custom property line: %s\n' % entry) + sys.exit(2) + + hooking.write_domxml(domxml) + except: + sys.stderr.write('vmfex: [unexpected error]: %s\n' % traceback.format_exc()) + sys.exit(2) + -- To view, visit http://gerrit.ovirt.org/7547 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45a7fa46919bb39a648dff190c40618395990e91 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Yasny <dyasny(a)gmail.com>

7 31

Change in vdsm[master]: Add a non-ascii charactor checker to vdsm
by lvroyce＠linux.vnet.ibm.com 27 Nov '12

27 Nov '12

Royce Lv has uploaded a new change for review. Change subject: Add a non-ascii charactor checker to vdsm ...................................................................... Add a non-ascii charactor checker to vdsm non-ascii charactor is not allowed in python code and comments see http://www.python.org/peps/pep-0263.html pep8 will not check this, if non-ascii charactors are carelessly added in comments, autobuild now not shout out, this results in fatal failure when you run .py: Sytax Error: Non-ASCII charactor in xxx This patch is for early discovery for non-ascii charactor. Change-Id: Ie4abdd1eb34db6a70335459e54dc8b38729f8e92 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M Makefile.am M vdsm-tool/Makefile.am A vdsm-tool/non-ascii-check.py 3 files changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/9321/1 diff --git a/Makefile.am b/Makefile.am index e15d709..9c44570 100644 --- a/Makefile.am +++ b/Makefile.am @@ -126,6 +126,7 @@ check-local: find . -path './.git' -prune -type f -o \ -name '*.py' -o -name '*.py.in' | xargs $(PYFLAKES) + find . -type f -name '*.py' | xargs python $(top_srcdir)/vdsm-tool/non-ascii-check.py $(PEP8) --exclude="$(PEP8_BLACKLIST)" --filename '*.py,*.py.in' \ --ignore=E121,E122,E123,E124,E125,E126,E127,E128,E241 \ $(PEP8_WHITELIST) diff --git a/vdsm-tool/Makefile.am b/vdsm-tool/Makefile.am index 997e339..2625d45 100644 --- a/vdsm-tool/Makefile.am +++ b/vdsm-tool/Makefile.am @@ -23,7 +23,9 @@ vdsm-tool EXTRA_DIST = \ - validate_ovirt_certs.py.in + validate_ovirt_certs.py.in \ + non-ascii-check.py \ + $(NULL) dist_vdsmtool_DATA = \ __init__.py \ diff --git a/vdsm-tool/non-ascii-check.py b/vdsm-tool/non-ascii-check.py new file mode 100644 index 0000000..25d6631 --- /dev/null +++ b/vdsm-tool/non-ascii-check.py @@ -0,0 +1,10 @@ +import sys + +if __name__ == '__main__': + fileNames = sys.argv[1:] + for f in fileNames: + try: + open(f).read().decode('ascii') + except UnicodeDecodeError: + print "file %s contains non-ascii charactor" % f + sys.exit(1) -- To view, visit http://gerrit.ovirt.org/9321 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4abdd1eb34db6a70335459e54dc8b38729f8e92 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

4 6

Change in vdsm[master]: miscTests: using MACRO instead of string
by lvroyce＠linux.vnet.ibm.com 27 Nov '12

27 Nov '12

Royce Lv has uploaded a new change for review. Change subject: miscTests: using MACRO instead of string ...................................................................... miscTests: using MACRO instead of string Change-Id: I005dee7f14e239c36cf1d8e6632406991e410ac5 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M tests/miscTests.py 1 file changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/65/9465/1 diff --git a/tests/miscTests.py b/tests/miscTests.py index fb37b72..90bdcbf 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -39,6 +39,7 @@ EXT_SLEEP = "sleep" EXT_PYTHON = "python" EXT_WHOAMI = "whoami" +EXT_CAT = "cat" SUDO_USER = "root" SUDO_GROUP = "root" @@ -59,7 +60,7 @@ def test(self): sleepProcs = [] for i in range(3): - sleepProcs.append(misc.execCmd(["sleep", "3"], sync=False, + sleepProcs.append(misc.execCmd([EXT_SLEEP, "3"], sync=False, sudo=False)) pids = misc.pgrep("sleep") @@ -74,7 +75,7 @@ class GetCmdArgsTests(TestCaseBase): def test(self): - args = ["sleep", "4"] + args = [EXT_SLEEP, "4"] sproc = misc.execCmd(args, sync=False, sudo=False) try: self.assertEquals(misc.getCmdArgs(sproc.pid), tuple(args)) @@ -83,7 +84,7 @@ sproc.wait() def testZombie(self): - args = ["sleep", "0"] + args = [EXT_SLEEP, "0"] sproc = misc.execCmd(args, sync=False, sudo=False) sproc.kill() try: @@ -96,7 +97,7 @@ class PidStatTests(TestCaseBase): def test(self): - args = ["sleep", "3"] + args = [EXT_SLEEP, "3"] sproc = misc.execCmd(args, sync=False, sudo=False) stats = misc.pidStat(sproc.pid) pid = int(stats[0]) @@ -337,7 +338,7 @@ The Doctor: And where do you function? Striker: Eternity. The endless wastes of eternity. """ # (C) BBC - Doctor Who - p = misc.execCmd(["cat"], sync=False) + p = misc.execCmd([EXT_CAT], sync=False) self.log.info("Writing data to std out") p.stdin.write(data) p.stdin.flush() @@ -352,7 +353,7 @@ I'm pretty sure it wasn't the future. """ # (C) BBC - Doctor Who halfPoint = len(data) / 2 - p = misc.execCmd(["cat"], sync=False) + p = misc.execCmd([EXT_CAT], sync=False) self.log.info("Writing data to std out") p.stdin.write(data[:halfPoint]) self.log.info("Writing more data to std out") @@ -383,7 +384,7 @@ data = data * ((4096 / len(data)) * 2) self.assertTrue(data > 4096) - p = misc.execCmd(["cat"], sync=False) + p = misc.execCmd([EXT_CAT], sync=False) self.log.info("Writing data to std out") p.stdin.write(data) p.stdin.flush() @@ -392,7 +393,7 @@ def testWaitTimeout(self): ttl = 2 - p = misc.execCmd(["sleep", str(ttl + 10)], sudo=False, sync=False) + p = misc.execCmd([EXT_SLEEP, str(ttl + 10)], sudo=False, sync=False) startTime = time.time() p.wait(ttl) duration = time.time() - startTime @@ -402,7 +403,7 @@ def testWaitCond(self): ttl = 2 - p = misc.execCmd(["sleep", str(ttl + 10)], sudo=False, sync=False) + p = misc.execCmd([EXT_SLEEP, str(ttl + 10)], sudo=False, sync=False) startTime = time.time() p.wait(cond=lambda: time.time() - startTime > ttl) duration = time.time() - startTime @@ -413,7 +414,7 @@ def testCommunicate(self): data = ("The trouble with the world is that the stupid are cocksure " "and the intelligent are full of doubt") - p = misc.execCmd(["dd"], data=data, sudo=False, sync=False) + p = misc.execCmd([EXT_DD], data=data, sudo=False, sync=False) p.stdin.close() self.assertEquals(p.stdout.read(len(data)).strip(), data) -- To view, visit http://gerrit.ovirt.org/9465 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I005dee7f14e239c36cf1d8e6632406991e410ac5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

3 9

Change in vdsm[master]: remoteFileHandler.py: nit fix for poll mask
by lvroyce＠linux.vnet.ibm.com 27 Nov '12

27 Nov '12

Royce Lv has uploaded a new change for review. Change subject: remoteFileHandler.py: nit fix for poll mask ...................................................................... remoteFileHandler.py: nit fix for poll mask poll() should use POLLERR/POLLHUP instead of EPOLLERR/EPOLLHUP Change-Id: Ic9d51fc2fed7da0a7ce0639c4ce668b28883d4f9 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm/storage/remoteFileHandler.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/9513/1 diff --git a/vdsm/storage/remoteFileHandler.py b/vdsm/storage/remoteFileHandler.py index 8b0041e..5e88bae 100644 --- a/vdsm/storage/remoteFileHandler.py +++ b/vdsm/storage/remoteFileHandler.py @@ -132,7 +132,7 @@ try: res = misc.NoIntrPoll(self._poller.poll, timeout) for fd, event in res: - if event & (select.EPOLLERR | select.EPOLLHUP): + if event & (select.POLLERR | select.POLLHUP): raise Timeout() finally: self._poller.unregister(fd) -- To view, visit http://gerrit.ovirt.org/9513 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9d51fc2fed7da0a7ce0639c4ce668b28883d4f9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

4 7

Change in vdsm[master]: storage/misc.py: fix raise call for pep8
by Douglas Schilling Landgraf 27 Nov '12

27 Nov '12

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: storage/misc.py: fix raise call for pep8 ...................................................................... storage/misc.py: fix raise call for pep8 The commit 08b9f16a6213298b31ca68f2c89556f0b23874a4 introduced the below pep8 error when generating vdsm rpm. vdsm/storage/misc.py:741:33: W602 deprecated form of raising exception This patch fix the raise call. Change-Id: I7f3d2dd8993d9567ac787f738f71f60c8545c8c0 Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M vdsm/storage/misc.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/23/9523/1 diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index 6360dcf..9126080 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -738,7 +738,7 @@ # re-raise the earliest exception if firstException is not None: - raise firstException, None, traceback + raise firstException(None, traceback) def defer(self, func, *args, **kwargs): self._finally.append((func, args, kwargs)) -- To view, visit http://gerrit.ovirt.org/9523 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f3d2dd8993d9567ac787f738f71f60c8545c8c0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

3 10

Change in vdsm[master]: BZ#870024 - Make sure during upgrade that lease files have ...
by Haim Ateya 27 Nov '12

27 Nov '12

Haim Ateya has uploaded a new change for review. Change subject: BZ#870024 - Make sure during upgrade that lease files have correct permission ...................................................................... BZ#870024 - Make sure during upgrade that lease files have correct permission Fix a bug where we tried to initialize sanlock lock before calling the function to set proper permissions. Change-Id: If28c48d2aeedd092ff3b8100dd64cd8ba673e94f Signed-off-by: Haim Ateya <hateya(a)redhat.com> --- M vdsm/storage/imageRepository/formatConverter.py 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/9517/1 diff --git a/vdsm/storage/imageRepository/formatConverter.py b/vdsm/storage/imageRepository/formatConverter.py index 190f9b6..c7952d8 100644 --- a/vdsm/storage/imageRepository/formatConverter.py +++ b/vdsm/storage/imageRepository/formatConverter.py @@ -90,6 +90,10 @@ log = logging.getLogger('Storage.v3DomainConverter') log.debug("Starting conversion for domain %s", domain.sdUUID) + if domain.getStorageType() in sd.FILE_DOMAIN_TYPES: + log.debug("Setting permissions for domain %s", domain.sdUUID) + domain.setMetadataPermissions() + log.debug("Initializing the new cluster lock for domain %s", domain.sdUUID) newClusterLock = safelease.SANLock(domain.sdUUID, domain.getIdsFilePath(), domain.getLeasesFilePath()) @@ -100,8 +104,6 @@ V2META_SECTORSIZE = 512 - if domain.getStorageType() in sd.FILE_DOMAIN_TYPES: - domain.setMetadataPermissions() def v3ResetMetaVolSize(vol): # BZ811880 Verifiying that the volume size is the same size advertised -- To view, visit http://gerrit.ovirt.org/9517 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If28c48d2aeedd092ff3b8100dd64cd8ba673e94f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Haim Ateya <hateya(a)redhat.com>

6 16

Change in vdsm[master]: Sending sigkill to verify svdsm suicide
by ybronhei＠redhat.com 27 Nov '12

27 Nov '12

Yaniv Bronhaim has uploaded a new change for review. Change subject: Sending sigkill to verify svdsm suicide ...................................................................... Sending sigkill to verify svdsm suicide Svdsm was alive after restart of vdsm. svdsm should use pokeParent thread to distinguish vdsm pid status, when it recognizes that vdsm pid is not exist, svdsm kills itself by sending SIGKILL. The patch changes the signal to SIGKILL and verifies that in the except scope we won't get exception before calling to os.kill. Change-Id: I2eb8f1a74f818cd10a08572c9adb5de1c0e21f5a Bug-Id: https://bugzilla.redhat.com/show_bug.cgi?id=875486 Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M vdsm/supervdsmServer.py 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/9196/1 diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index a1bf8e6..0836b1b 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -293,8 +293,9 @@ os.kill(parentPid, 0) sleep(2) except Exception: - os.unlink(ADDRESS) - os.kill(os.getpid(), signal.SIGTERM) + if os.path.exists(ADDRESS): + os.unlink(ADDRESS) + os.kill(os.getpid(), signal.SIGKILL) def main(): -- To view, visit http://gerrit.ovirt.org/9196 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2eb8f1a74f818cd10a08572c9adb5de1c0e21f5a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

5 7

Change in vdsm[master]: vdsm.spec: Add packages versions for rhel7
by Douglas Schilling Landgraf 27 Nov '12

27 Nov '12

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: vdsm.spec: Add packages versions for rhel7 ...................................................................... vdsm.spec: Add packages versions for rhel7 Add macro for RHEL7 packages. Change-Id: Ia556789f9a2456f255d822f7e28877168d603f6e Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M vdsm.spec.in 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/9428/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 3fa3395..087f148 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -79,6 +79,22 @@ %endif %if 0%{?rhel} +%if 0%{?rhel} >= 7 +# Subprocess and thread bug was found on python 2.7.2 +Requires: python >= 2.7.3 +Requires: qemu-kvm >= 2:1.2.0 +Requires: qemu-kvm-img >= 2:1.2.0 +Requires: libvirt >= 0.10.1-1 +Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client +Requires: iscsi-initiator-utils >= 6.2.0.872-14 +Requires: device-mapper-multipath >= 0.4.9-18 +Requires: e2fsprogs >= 1.41.14 +Requires: kernel >= 3.6 +Requires: sanlock >= 2.4-2, sanlock-python +Requires: sed >= 4.2.1-10 +Requires: selinux-policy-targeted >= 3.10.0-149 +Requires: lvm2 >= 2.02.95 +%else Requires: python # Update the qemu-kvm requires when block_stream will be included Requires: qemu-kvm >= 2:0.12.1.2-2.295.el6_3.4 @@ -93,6 +109,7 @@ Requires: initscripts >= 9.03.31-2.el6_3.1 Requires: selinux-policy-targeted >= 3.7.19-80 Requires: lvm2 >= 2.02.95-10.el6_3.2 +%endif %else # Subprocess and thread bug was found on python 2.7.2 Requires: python >= 2.7.3 -- To view, visit http://gerrit.ovirt.org/9428 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia556789f9a2456f255d822f7e28877168d603f6e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

4 22

Change in vdsm[master]: configNetwork: Fix a race between dhcp thread and connectivi...
by wudxw＠linux.vnet.ibm.com 27 Nov '12

27 Nov '12

Mark Wu has uploaded a new change for review. Change subject: configNetwork: Fix a race between dhcp thread and connectivity check ...................................................................... configNetwork: Fix a race between dhcp thread and connectivity check If dhcp is not done before the connectivity check, it can't detect the problem if the host loses connection to engine. This problem is found due to the engine bug(BZ838816): engine wrongly configures dhcp for management network, and then engine can't connect to the vdsm host because the ip address changes. This patch adds an event to synchronize dhcp thread and connectivity check. Change-Id: Id1a1fb8ef4cd88e2144f30cf8dd3f09b8dd8126f Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- M vdsm/configNetwork.py 1 file changed, 36 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/01/7401/1 diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index d55a2cc..0617bbe 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -32,11 +32,11 @@ from vdsm import constants from vdsm import utils import neterrors as ne -from vdsm import define from vdsm import netinfo from vdsm import libvirtconnection CONNECTIVITY_TIMEOUT_DEFAULT = 4 +DHCP_TIMEOUT_DEFAULT = 120 MAX_VLAN_ID = 4094 MAX_BRIDGE_NAME_LEN = 15 ILLEGAL_BRIDGE_CHARS = frozenset(':. \t') @@ -59,11 +59,13 @@ if not line.endswith(' does not exist!')])) return p.returncode -def ifup(iface): +def ifup(iface, dhcpDone=None): "Bring up an interface" p = subprocess.Popen([constants.EXT_IFUP, iface], stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True) out, err = p.communicate() + if dhcpDone != None: + dhcpDone.set() if out.strip(): logging.info(out) if err.strip(): @@ -774,7 +776,8 @@ def addNetwork(network, vlan=None, bonding=None, nics=None, ipaddr=None, netmask=None, mtu=None, gateway=None, force=False, - configWriter=None, bondingOptions=None, bridged=True, **options): + configWriter=None, bondingOptions=None, bridged=True, + dhcpDone=None, **options): nics = nics or () _netinfo = netinfo.NetInfo() bridged = utils.tobool(bridged) @@ -878,7 +881,7 @@ # wait for dhcp in another thread, # so vdsm won't get stuck (BZ#498940) t = threading.Thread(target=ifup, name='ifup-waiting-on-dhcp', - args=(network,)) + args=(network, dhcpDone)) t.daemon = True t.start() else: @@ -1033,17 +1036,28 @@ def editNetwork(oldBridge, newBridge, vlan=None, bonding=None, nics=None, **options): configWriter = ConfigWriter() + dhcpEvt = None + if newBridge == 'ovirtmgmt' and options.get('bootproto') == 'dhcp' and \ + not utils.tobool(options.get('blockingdhcp')): + dhcpEvt = threading.Event() try: delNetwork(oldBridge, configWriter=configWriter, **options) - addNetwork(newBridge, vlan=vlan, bonding=bonding, nics=nics, configWriter=configWriter, **options) + addNetwork(newBridge, vlan=vlan, bonding=bonding, nics=nics, configWriter=configWriter, + dhcpDone=dhcpEvt, **options) + if utils.tobool(options.get('connectivityCheck', False)): + if dhcpEvt != None: + done = dhcpEvt.wait(DHCP_TIMEOUT_DEFAULT) + dhcpEvt = None + if not done: + raise ConfigNetworkError(ne.ERR_BAD_PARAMS, + 'dhcp client got timeout') + if not clientSeen(int(options.get('connectivityTimeout', CONNECTIVITY_TIMEOUT_DEFAULT))): + delNetwork(newBridge, force=True) + raise ConfigNetworkError(ne.ERR_LOST_CONNECTION, + 'connectivity check failed') except: configWriter.restoreBackups() raise - if utils.tobool(options.get('connectivityCheck', False)): - if not clientSeen(int(options.get('connectivityTimeout', CONNECTIVITY_TIMEOUT_DEFAULT))): - delNetwork(newBridge, force=True) - configWriter.restoreBackups() - return define.errCode['noConPeer']['status']['code'] def _validateNetworkSetup(networks={}, bondings={}): _netinfo = netinfo.NetInfo() @@ -1174,6 +1188,7 @@ _netinfo = netinfo.NetInfo() configWriter = ConfigWriter() networksAdded = set() + dhcpEvt = None # keep set netsWithNewBonds to be able remove # a new added network if connectivity check fail. # If a new network needs to be created on top of existing bond, @@ -1235,11 +1250,21 @@ d['nics'] = [d.pop('nic')] d['force'] = force + if network == 'ovirtmgmt' and d.get('bootproto') == 'dhcp' and \ + not utils.tobool(d.get('blockingdhcp')): + dhcpEvt = threading.Event() + logger.debug("Adding network %r" % network) - addNetwork(network, configWriter=configWriter, + addNetwork(network, configWriter=configWriter, dhcpDone=dhcpEvt, implicitBonding=True, **d) if utils.tobool(options.get('connectivityCheck', True)): + if dhcpEvt != None: + done = dhcpEvt.wait(DHCP_TIMEOUT_DEFAULT) + dhcpEvt = None + if not done: + raise ConfigNetworkError(ne.ERR_BAD_PARAMS, + 'dhcp client got timeout') logger.debug('Checking connectivity...') if not clientSeen(int(options.get('connectivityTimeout', CONNECTIVITY_TIMEOUT_DEFAULT))): -- To view, visit http://gerrit.ovirt.org/7401 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1a1fb8ef4cd88e2144f30cf8dd3f09b8dd8126f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>

3 4

Change in vdsm[master]: Remove local mount point if storage server connection fails
by wudxw＠linux.vnet.ibm.com 26 Nov '12

26 Nov '12

Mark Wu has uploaded a new change for review. Change subject: Remove local mount point if storage server connection fails ...................................................................... Remove local mount point if storage server connection fails Change-Id: Ic7aa1a47b7fa3577e83daa82fbad17fdc2ebd51f Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- M vdsm/storage/storageServer.py 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/4298/1 -- To view, visit http://gerrit.ovirt.org/4298 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7aa1a47b7fa3577e83daa82fbad17fdc2ebd51f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>

4 9

Change in vdsm[master]: [wip] hooks: add the nested virtualization hook
by Federico Simoncelli 26 Nov '12

26 Nov '12

Federico Simoncelli has uploaded a new change for review. Change subject: [wip] hooks: add the nested virtualization hook ...................................................................... [wip] hooks: add the nested virtualization hook If the nested virtualization is enabled in your kvm module this hook will expose it to the guests. Change-Id: I08c24c1b932370577e9687d75e292cd7c40f8e5d Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M configure.ac M vdsm.spec.in M vdsm_hooks/Makefile.am A vdsm_hooks/nestedvt/Makefile.am A vdsm_hooks/nestedvt/before_vm_start.py 5 files changed, 92 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/9225/1 diff --git a/configure.ac b/configure.ac index 5d8b238..bd92fb8 100644 --- a/configure.ac +++ b/configure.ac @@ -203,6 +203,7 @@ vdsm_hooks/hugepages/Makefile vdsm_hooks/isolatedprivatevlan/Makefile vdsm_hooks/Makefile + vdsm_hooks/nestedvt/Makefile vdsm_hooks/numa/Makefile vdsm_hooks/pincpu/Makefile vdsm_hooks/promisc/Makefile diff --git a/vdsm.spec.in b/vdsm.spec.in index 5daea0b..47ce21e 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -284,6 +284,14 @@ by using <filterref filter='clean-traffic'/> libvirt filter and by adding custom filter: isolatedprivatevlan-vdsm.xml +%package hook-nestedvt +Summary: Nested Virtualization support for VDSM +BuildArch: noarch + +%description hook-nestedvt +If the nested virtualization is enabled in your kvm module +this hook will expose it to the guests. + %package hook-numa Summary: numa sopport for VDSM BuildArch: noarch @@ -853,6 +861,10 @@ %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_isolatedprivatevlan %config(noreplace) %{_sysconfdir}/libvirt/nwfilter/isolatedprivatevlan-vdsm.xml +%files hook-nestedvt +%defattr(-, root, root, -) +%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_nestedvt + %files hook-numa %defattr(-, root, root, -) %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_numa diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am index e6a8280..4ef163a 100644 --- a/vdsm_hooks/Makefile.am +++ b/vdsm_hooks/Makefile.am @@ -31,6 +31,7 @@ hostusb \ hugepages \ isolatedprivatevlan \ + nestedvt \ numa \ pincpu \ promisc \ diff --git a/vdsm_hooks/nestedvt/Makefile.am b/vdsm_hooks/nestedvt/Makefile.am new file mode 100644 index 0000000..b480407 --- /dev/null +++ b/vdsm_hooks/nestedvt/Makefile.am @@ -0,0 +1,32 @@ +# +# Copyright 2012 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 +# + +include $(top_srcdir)/build-aux/Makefile.subs + +EXTRA_DIST = \ + before_vm_start.py + +install-data-local: + $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/before_vm_start + $(INSTALL_SCRIPT) $(srcdir)/before_vm_start.py \ + $(DESTDIR)$(vdsmhooksdir)/before_vm_start/50_nestedvt + +uninstall-local: + $(RM) $(DESTDIR)$(vdsmhooksdir)/before_vm_start/50_nestedvt diff --git a/vdsm_hooks/nestedvt/before_vm_start.py b/vdsm_hooks/nestedvt/before_vm_start.py new file mode 100755 index 0000000..446a487 --- /dev/null +++ b/vdsm_hooks/nestedvt/before_vm_start.py @@ -0,0 +1,46 @@ +#!/usr/bin/python +# +# Copyright 2012 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 hooking + +cpu_nested_features = { + "kvm_intel": "vmx", + "kvm_amd": "svm", +} + +for kvm_mod in ("kvm_intel", "kvm_amd"): + kvm_mod_path = "/sys/module/%s/parameters/nested" % kvm_mod + try: + with file(kvm_mod_path) as f: + if f.readline().strip() == "Y": + break + except IOError: + pass +else: + kvm_mod = None + +if kvm_mod: + domxml = hooking.read_domxml() + feature_vmx = domxml.createElement("feature") + feature_vmx.setAttribute("name", cpu_nested_features[kvm_mod]) + feature_vmx.setAttribute("policy", "require") + domxml.getElementsByTagName("cpu")[0].appendChild(feature_vmx) + hooking.write_domxml(domxml) -- To view, visit http://gerrit.ovirt.org/9225 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08c24c1b932370577e9687d75e292cd7c40f8e5d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

6 15

Change in vdsm[master]: libvirtev.py: move to site_packages/vdsm
by Dan Kenigsberg 26 Nov '12

26 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: libvirtev.py: move to site_packages/vdsm ...................................................................... libvirtev.py: move to site_packages/vdsm Until we drop this little module, it has to sit within the vdsm package, or else `from vdsm import libvirtconnection` would fail. Change-Id: Ieffbc359880e87a7159906579a18b2e5c63bd763 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm.spec.in M vdsm/Makefile.am 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/9435/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 3fa3395..427db2e 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -627,7 +627,6 @@ %{_datadir}/%{vdsm_name}/API.py* %{_datadir}/%{vdsm_name}/hooking.py* %{_datadir}/%{vdsm_name}/hooks.py* -%{_datadir}/%{vdsm_name}/libvirtev.py* %{_datadir}/%{vdsm_name}/libvirtvm.py* %{_datadir}/%{vdsm_name}/lsblk.py* %{_datadir}/%{vdsm_name}/md_utils.py* @@ -786,6 +785,7 @@ %{python_sitearch}/%{vdsm_name}/define.py* %{python_sitearch}/%{vdsm_name}/exception.py* %{python_sitearch}/%{vdsm_name}/libvirtconnection.py* +%{python_sitearch}/%{vdsm_name}/libvirtev.py* %{python_sitearch}/%{vdsm_name}/netinfo.py* %{python_sitearch}/%{vdsm_name}/qemuImg.py* %{python_sitearch}/%{vdsm_name}/SecureXMLRPCServer.py* diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 76a81c6..ceb1eaa 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -36,7 +36,6 @@ hooks.py \ kaxmlrpclib.py \ ksm.py \ - libvirtev.py \ libvirtvm.py \ logUtils.py \ lsblk.py \ @@ -60,6 +59,7 @@ define.py \ exception.py \ libvirtconnection.py \ + libvirtev.py \ netinfo.py \ qemuImg.py \ SecureXMLRPCServer.py \ -- To view, visit http://gerrit.ovirt.org/9435 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieffbc359880e87a7159906579a18b2e5c63bd763 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

3 13

Change in vdsm[master]: Change paths for RHEV-M 3.0
by Pablo Iranzo Gómez 26 Nov '12

26 Nov '12

Pablo Iranzo Gómez has uploaded a new change for review. Change subject: Change paths for RHEV-M 3.0 ...................................................................... Change paths for RHEV-M 3.0 Change-Id: I07eb1024bd99359de50e0817cc57789eb1ba948a Signed-off-by: Pablo <Pablo.Iranzo(a)gmail.com> --- M contrib/forceVMstart/forceVMstart.py 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/9477/1 diff --git a/contrib/forceVMstart/forceVMstart.py b/contrib/forceVMstart/forceVMstart.py index 98cf2a2..de25b99 100644 --- a/contrib/forceVMstart/forceVMstart.py +++ b/contrib/forceVMstart/forceVMstart.py @@ -7,9 +7,11 @@ # (at your option) any later version. # # Require Packages: python-iniparse +# # Original script by: Douglas Landgraf (dougsland(a)redhat.com) # Modifications by: Vladik Romanovsky (vromanov(a)redhat.com) - +# Modifications for RHEV 3.0 by: Pablo Iranzo Gomez (Pablo.Iranzo(a)redhat.com) +# import getopt import sys @@ -46,7 +48,7 @@ VDSM_PORT = "54321" #DEBUG MODE -DEBUG = "False" # True or False +DEBUG = "True" # True or False ######################################################################### @@ -217,8 +219,8 @@ # Description: get the vmId from the vmName used as argument # ###################################################################### def getVmId(self, vmName): - path = "/rhev/data-center/%s/vms" % (self.spUUID) - + path = "/rhev/data-center/%s/mastersd/master/vms" % (self.spUUID) + # First verify which domainID contain de XML files try: dirList = os.listdir(path) @@ -278,8 +280,8 @@ # Path to XML files # example default path: # /rhev/data-center/1a516f64-f091-4785-9278-362037513408/vms - path = "/rhev/data-center/%s/vms" % (self.spUUID) - + path = "/rhev/data-center/%s/mastersd/master/vms" % (self.spUUID) + # First verify which domainID contain de XML files try: dirList = os.listdir(path) -- To view, visit http://gerrit.ovirt.org/9477 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07eb1024bd99359de50e0817cc57789eb1ba948a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Pablo Iranzo Gómez <Pablo.Iranzo(a)redhat.com>

2 4

Change in vdsm[master]: Fix authors
by Pablo Iranzo Gómez 26 Nov '12

26 Nov '12

Pablo Iranzo Gómez has uploaded a new change for review. Change subject: Fix authors ...................................................................... Fix authors Change-Id: I82a698d4430043f18063b879ee4b7a79a7fbba59 Signed-off-by: Pablo <Pablo.Iranzo(a)gmail.com> --- M contrib/forceVMstart/forceVMstart.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/9476/1 diff --git a/contrib/forceVMstart/forceVMstart.py b/contrib/forceVMstart/forceVMstart.py index 41fe068..98cf2a2 100644 --- a/contrib/forceVMstart/forceVMstart.py +++ b/contrib/forceVMstart/forceVMstart.py @@ -7,6 +7,9 @@ # (at your option) any later version. # # Require Packages: python-iniparse +# Original script by: Douglas Landgraf (dougsland(a)redhat.com) +# Modifications by: Vladik Romanovsky (vromanov(a)redhat.com) + import getopt import sys -- To view, visit http://gerrit.ovirt.org/9476 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82a698d4430043f18063b879ee4b7a79a7fbba59 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Pablo Iranzo Gómez <Pablo.Iranzo(a)redhat.com>

2 4

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches November 2012