vdsm-patches August 2012

vdsm-patches@lists.fedorahosted.org

61 participants
390 discussions

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]: 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]: Bz#839919 remoteFileHandler.py: Add storage into python path
by wudxw＠linux.vnet.ibm.com 22 Nov '12

22 Nov '12

Mark Wu has uploaded a new change for review. Change subject: Bz#839919 remoteFileHandler.py: Add storage into python path ...................................................................... Bz#839919 remoteFileHandler.py: Add storage into python path pickle need import modules in vdsm/storage, so add it to python path. Actually it's already done for RPC server side. This patch adds it for client side, and merge the code. Change-Id: Id23c3d0be6eb2e2212172613ea8f3b0c58edce06 Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- M vdsm/storage/remoteFileHandler.py 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/6354/1 -- To view, visit http://gerrit.ovirt.org/6354 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id23c3d0be6eb2e2212172613ea8f3b0c58edce06 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>

3 5

Change in vdsm[master]: change misc.retry to make it more general
by lvroyce＠linux.vnet.ibm.com 22 Nov '12

22 Nov '12

Royce Lv has uploaded a new change for review. Change subject: change misc.retry to make it more general ...................................................................... change misc.retry to make it more general add argument list to misc.retry to make it usable for function with arguments. Change-Id: I2b7d87629762d4d8f248d50fa4da71a0af3645d8 Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- M vdsm/storage/misc.py M vdsm/supervdsm.py 2 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/32/4032/1 -- To view, visit http://gerrit.ovirt.org/4032 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b7d87629762d4d8f248d50fa4da71a0af3645d8 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]: Add local storage xmlrpc functional test
by lvroyce＠linux.vnet.ibm.com 22 Nov '12

22 Nov '12

Hello Adam Litke, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/5860 to review the following change. Change subject: Add local storage xmlrpc functional test ...................................................................... Add local storage xmlrpc functional test Add defintion parser for functional test case reusable, add local storage xmlrpc tests it can be extend to nfs and iscsi type Change-Id: I4e2e80fa88d66d9bc1a4ba855e2df51ba8165e0a Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Signed-off-by: Adam Litke <agl(a)us.ibm.com> --- M configure.ac M tests/functional/Makefile.am A tests/functional/xmlrpcTests.py M vdsm.spec.in 4 files changed, 198 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/60/5860/1 -- To view, visit http://gerrit.ovirt.org/5860 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e2e80fa88d66d9bc1a4ba855e2df51ba8165e0a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>

3 6

Change in vdsm[master]: confNet: report missing net params as ERR_BAD_PARAMS
by Dan Kenigsberg 21 Nov '12

21 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: confNet: report missing net params as ERR_BAD_PARAMS ...................................................................... confNet: report missing net params as ERR_BAD_PARAMS Change-Id: I6e6b48332f27d1b976a8cd8069d252133ff32378 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/configNetwork.py 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/6959/1 -- To view, visit http://gerrit.ovirt.org/6959 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e6b48332f27d1b976a8cd8069d252133ff32378 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

3 4

Change in vdsm[master]: Added an option to create a watchdog device.
by shaohef＠linux.vnet.ibm.com 20 Nov '12

20 Nov '12

ShaoHe Feng has uploaded a new change for review. Change subject: Added an option to create a watchdog device. ...................................................................... Added an option to create a watchdog device. A support for a watchdog device was added to the "devices" configuration. Also add the watchdog event callback. model of watchdog: 'i6300esb' default model, emulating a PCI Intel 6300ESB 'ib700' emulating an ISA iBase IB700 action of watchdog: 'reset' default, forcefully reset the guest 'shutdown' gracefully shutdown the guest (not recommended) 'poweroff' forcefully power off the guest 'pause' pause the guest 'none' do nothing 'dump' automatically dump the guest The watchdog device can used to detect guest crash, and if choose 'dump' action, the libvirt will dump the guest automatically. The directory to save dump files can be configured by auto_dump_path in file /etc/libvirt/qemu.conf. The watchdog device requires an additional driver and management daemon in the guest. Just enabling the watchdog in the vdsm "devices" configuration does not do anything useful on its own. Change-Id: I2b7970a9050ab0279fe03371b9a77692fba30af8 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- M vdsm/libvirtconnection.py M vdsm/libvirtev.py M vdsm/libvirtvm.py M vdsm/vm.py 4 files changed, 102 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/7535/1 diff --git a/vdsm/libvirtconnection.py b/vdsm/libvirtconnection.py index e525996..25e2494 100644 --- a/vdsm/libvirtconnection.py +++ b/vdsm/libvirtconnection.py @@ -63,6 +63,12 @@ elif eventid == libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB: path, type, status = args[:-1] v._onBlockJobEvent(path, type, status) + elif eventid == libvirt.VIR_DOMAIN_EVENT_ID_WATCHDOG: + wdargs = args[:-1] + action = libvirtev.watchdogActionToString(wdargs[0]) + cif.log.debug("watchdog event: Domain %s(%s). Action: %s", + dom.name(), dom.ID(), action) + v._onWatchdogEvent(dom.name(), dom.ID(), action) else: v.log.warning('unknown eventid %s args %s', eventid, args) except: @@ -118,7 +124,8 @@ libvirt.VIR_DOMAIN_EVENT_ID_RTC_CHANGE, libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, libvirt.VIR_DOMAIN_EVENT_ID_GRAPHICS, - libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB): + libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + libvirt.VIR_DOMAIN_EVENT_ID_WATCHDOG): conn.domainEventRegisterAny(None, ev, __eventCallback, (cif, ev)) for name in dir(libvirt.virConnect): diff --git a/vdsm/libvirtev.py b/vdsm/libvirtev.py index 92a7a0e..b12b916 100644 --- a/vdsm/libvirtev.py +++ b/vdsm/libvirtev.py @@ -444,6 +444,16 @@ return eventStrings[event] +def watchdogActionToString(action): + actionStrings = ("No action, watchdog ignored", + "Guest CPUs are paused", + "Guest CPUs are reset", + "Guest is forcably powered off", + "Guest is requested to gracefully shutdown", + "No action, a debug message logged") + return actionStrings[action] + + def myDomainEventCallback1(conn, dom, event, detail, opaque): print ("myDomainEventCallback1 EVENT: Domain %s(%s) %s %d" % (dom.name(), dom.ID(), eventToString(event), detail)) diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index e95e94b..cc75d78 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -1188,6 +1188,20 @@ m.setAttribute('model', self.specParams['model']) return m +class WatchdogDevice(LibvirtVmDevice): + def getXML(self): + """ + Create domxml for a watchdog device. + + <watchdog model='i6300esb' action='dump'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </watchdog> + """ + m = self.createXmlElem(self.type, None, ['address']) + m.setAttribute('model', self.specParams['model']) + if 'action' in self.specParams: + m.setAttribute('action', self.specParams['action']) + return m class RedirDevice(LibvirtVmDevice): def getXML(self): @@ -1331,6 +1345,7 @@ self._getUnderlyingVideoDeviceInfo() self._getUnderlyingControllerDeviceInfo() self._getUnderlyingBalloonDeviceInfo() + self._getUnderlyingWatchdogDeviceInfo() # Obtain info of all unknown devices. Must be last! self._getUnderlyingUnknownDeviceInfo() @@ -1420,6 +1435,7 @@ vm.CONTROLLER_DEVICES: ControllerDevice, vm.GENERAL_DEVICES: GeneralDevice, vm.BALLOON_DEVICES: BalloonDevice, + vm.WATCHDOG_DEVICES: WatchdogDevice, vm.REDIR_DEVICES: RedirDevice} for devType, devClass in devMap.items(): @@ -2031,6 +2047,10 @@ self.saveState() + def _onWatchdogEvent(self, name, vmid, action): + self.log.debug("Watchdog event comes from guest %s(%s). " + "Action: %s", name, vmid, action) + def changeCD(self, drivespec): return self._changeBlockDev('cdrom', 'hdc', drivespec) @@ -2374,6 +2394,38 @@ dev['address'] = address dev['alias'] = alias + def _getUnderlyingWatchdogDeviceInfo(self): + """ + Obtain watchdog device info from libvirt. + """ + watchdogxml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ + getElementsByTagName('devices')[0]. \ + getElementsByTagName('watchdog') + for x in watchdogxml: + action = x.getAttribute('action') + # Ignore watchdog device without address. + if not x.getElementsByTagName('address'): + continue + + address = self._getUnderlyingDeviceAddress(x) + alias = x.getElementsByTagName('alias')[0].getAttribute('name') + + for dev in self._devices[vm.WATCHDOG_DEVICES]: + if not hasattr(dev, 'address'): + dev.address = address + dev.alias = alias + if not "action" in dev.specParams: + dev.specParams['action'] = action + + for dev in self.conf['devices']: + if ((dev['type'] == vm.WATCHDOG_DEVICES) and + not dev.get('address')): + dev['address'] = address + dev['alias'] = alias + if ((dev['type'] == vm.WATCHDOG_DEVICES) and + not "action" in dev['specParams']): + dev['specParams']['action'] = action + def _getUnderlyingVideoDeviceInfo(self): """ Obtain video devices info from libvirt. diff --git a/vdsm/vm.py b/vdsm/vm.py index 949a3ee..d24d1a4 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -45,6 +45,7 @@ GENERAL_DEVICES = 'general' BALLOON_DEVICES = 'balloon' REDIR_DEVICES = 'redir' +WATCHDOG_DEVICES = 'watchdog' """ A module containing classes needed for VM communication. @@ -310,7 +311,8 @@ self._devices = {DISK_DEVICES: [], NIC_DEVICES: [], SOUND_DEVICES: [], VIDEO_DEVICES: [], CONTROLLER_DEVICES: [], GENERAL_DEVICES: [], - BALLOON_DEVICES: [], REDIR_DEVICES: []} + BALLOON_DEVICES: [], REDIR_DEVICES: [], + WATCHDOG_DEVICES: [],} def _get_lastStatus(self): SHOW_PAUSED_STATES = ('Powering down', 'RebootInProgress', 'Up') @@ -381,11 +383,24 @@ 'index': 0, 'truesize': 0}) return removables + def _removeRedundantDevices(self, devices): + counters = 0 + for dev in self.conf['devices']: + if (dev['type'] == devices): + counters += 1 + if (counters > 1): + self.conf['devices'].remove(dev) + if (counters > 1): + self.log.warning("%d redundant %s devices are removed", + counters-1, devices) + return counters + def getConfDevices(self): devices = {DISK_DEVICES: [], NIC_DEVICES: [], SOUND_DEVICES: [], VIDEO_DEVICES: [], CONTROLLER_DEVICES: [], GENERAL_DEVICES: [], - BALLOON_DEVICES: [], REDIR_DEVICES: []} + BALLOON_DEVICES: [], REDIR_DEVICES: [], + WATCHDOG_DEVICES: []} for dev in self.conf.get('devices'): try: devices[dev['type']].append(dev) @@ -417,8 +432,23 @@ devices[CONTROLLER_DEVICES] = self.getConfController() devices[GENERAL_DEVICES] = [] devices[BALLOON_DEVICES] = [] + devices[WATCHDOG_DEVICES] = [] devices[REDIR_DEVICES] = [] else: + # libvirt only support one watchdog device + # before getting devices list, check WATCHDOG_DEVICES and + # try to remove redundant watchdog devices + self._removeRedundantDevices(WATCHDOG_DEVICES) + # must assign the model for watchdog device to libvirt + # but the action can be assigned default by libvirt + # so ignore the action + for dev in self.conf['devices']: + if (dev['type'] == WATCHDOG_DEVICES): + if not 'specParams' in dev: + dev['specParams'] = {} + if not 'model' in dev['specParams']: + dev['specParams']['model'] = 'i6300esb' + devices = self.getConfDevices() # Normalize vdsm images -- To view, visit http://gerrit.ovirt.org/7535 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b7970a9050ab0279fe03371b9a77692fba30af8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>

12 35

Change in vdsm[master]: Adding hooks support for NIC hotplug
by itzikb＠mellanox.com 20 Nov '12

20 Nov '12

Itzik Brown has uploaded a new change for review. Change subject: Adding hooks support for NIC hotplug ...................................................................... Adding hooks support for NIC hotplug Adding the ability to write hooks for events of NIC hotplug and hotunplug. Hooks are: before_nic_plug and after_nic_unplug Change-Id: I253104ee9831a881e2fb06f0a658631662611d77 Signed-off-by: Itzik Brown <itzikb(a)mellanox.com> --- M vdsm.spec.in M vdsm/hooks.py M vdsm/libvirtvm.py M vdsm_hooks/Makefile.am 4 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/24/7224/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 23afd6b..0d5f82d 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -658,6 +658,8 @@ %dir %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy %dir %{_libexecdir}/%{vdsm_name}/hooks/before_vm_set_ticket %dir %{_libexecdir}/%{vdsm_name}/hooks/after_vm_set_ticket +%dir %{_libexecdir}/%{vdsm_name}/hooks/before_nic_plug +%dir %{_libexecdir}/%{vdsm_name}/hooks/after_nic_unplug %dir %{_libexecdir}/%{vdsm_name}/hooks/before_vdsm_start %dir %{_libexecdir}/%{vdsm_name}/hooks/after_vdsm_stop %{_datadir}/%{vdsm_name}/addNetwork diff --git a/vdsm/hooks.py b/vdsm/hooks.py index 5b79cee..64263b3 100644 --- a/vdsm/hooks.py +++ b/vdsm/hooks.py @@ -174,6 +174,14 @@ raiseError=False, params=params) +def before_nic_hotplug(domxml, vmconf={}): + return _runHooksDir(domxml, 'before_vm_hotplug', vmconf=vmconf) + + +def after_nic_unplug(domxml, vmconf={}): + return _runHooksDir(domxml, 'after_vm_unplug', vmconf=vmconf) + + def before_vdsm_start(): return _runHooksDir(None, 'before_vdsm_start', raiseError=False) diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index 3b7cfc5..4ae54f7 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -1395,12 +1395,14 @@ nicParams = params.get('nic', {}) nic = NetworkInterfaceDevice(self.conf, self.log, **nicParams) nicXml = nic.getXML().toprettyxml(encoding='utf-8') + nicXml = hooks.before_nic_hotplug(nicXml, self.conf) self.log.debug("Hotplug NIC xml: %s" % (nicXml)) try: self._dom.attachDevice(nicXml) except libvirt.libvirtError, e: self.log.error("Hotplug failed", exc_info=True) + nicXml = hooks.after_nic_unplug(nicXml, self.conf) if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: return errCode['noVM'] return {'status' : {'code': errCode['hotplugNic']['status']['code'], @@ -1454,6 +1456,7 @@ try: self._dom.detachDevice(nicXml) + hooks.after_nic_unplug(nicXml, self.conf) except libvirt.libvirtError, e: self.log.error("Hotunplug failed", exc_info=True) if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am index e6a8280..36919d9 100644 --- a/vdsm_hooks/Makefile.am +++ b/vdsm_hooks/Makefile.am @@ -74,6 +74,8 @@ after_vm_destroy \ before_vm_set_ticket \ after_vm_set_ticket \ + before_nic_plug \ + after_nic_unplug \ before_vdsm_start \ after_vdsm_stop -- To view, visit http://gerrit.ovirt.org/7224 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I253104ee9831a881e2fb06f0a658631662611d77 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Itzik Brown <itzikb(a)mellanox.com>

5 20

Change in vdsm[master]: join supervdsm subprocess after terminated to avoid defunct ...
by lvroyce＠linux.vnet.ibm.com 14 Nov '12

14 Nov '12

Royce Lv has uploaded a new change for review. Change subject: join supervdsm subprocess after terminated to avoid defunct status ...................................................................... join supervdsm subprocess after terminated to avoid defunct status After validateAccess there leaves a defunct process clear it by join after termination Change-Id: I0cdcfb3b467e9226f14a4ebc2845ff2db0f19b5f Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm/supervdsmServer.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/03/6503/1 -- To view, visit http://gerrit.ovirt.org/6503 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cdcfb3b467e9226f14a4ebc2845ff2db0f19b5f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

5 5

← Newer
1
...
11
12
13
14
15
16
17
...
39
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches August 2012