vdsm-patches October 2012

vdsm-patches@lists.fedorahosted.org

61 participants
441 discussions

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]: 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]: bz#849886 allow multilib in bootstrap when download package
by lvroyce＠linux.vnet.ibm.com 04 Dec '12

04 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]: 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]: 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]: 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 27 Nov '12

27 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

← Newer
1
...
18
19
20
21
22
23
24
...
45
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches October 2012