vdsm-patches February 2014

vdsm-patches@lists.fedorahosted.org

42 participants
527 discussions

Change in vdsm[master]: Rescan FC when rescanning for new multipath devices
by smizrahi＠redhat.com 23 Jun '14

23 Jun '14

Saggi Mizrahi has uploaded a new change for review. Change subject: Rescan FC when rescanning for new multipath devices ...................................................................... Rescan FC when rescanning for new multipath devices Change-Id: Idec939222676a24452e8825b36db68839bfd2bbc Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M lib/vdsm/utils.py M tests/utilsTests.py M vdsm/storage/Makefile.am A vdsm/storage/fc.py M vdsm/storage/multipath.py 5 files changed, 61 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/19539/1 diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py index f06cad2..e273514 100644 --- a/lib/vdsm/utils.py +++ b/lib/vdsm/utils.py @@ -793,6 +793,24 @@ return functools.partial(self.__call__, obj) +def tee_async(data, outputFiles=[], append=False): + cmd = ["tee"] + if append: + cmd.append("--append") + + cmd.extend(outputFiles) + proc = execCmd(cmd, sync=False) + proc.stdin.write(data) + + def parser(rc, out, err): + if rc != 0: + raise OSError(-1, err) + + return out + + return AsyncProcessOperation(proc, parser) + + def validateMinimalKeySet(dictionary, reqParams): if not all(key in dictionary for key in reqParams): raise ValueError diff --git a/tests/utilsTests.py b/tests/utilsTests.py index 656c121..5b83ec0 100644 --- a/tests/utilsTests.py +++ b/tests/utilsTests.py @@ -18,11 +18,14 @@ # Refer to the README and COPYING files for full details of the license # import errno +import time +import tempfile +import shutil +import os from testrunner import VdsmTestCase as TestCaseBase from vdsm import utils from storage import misc -import time class RetryTests(TestCaseBase): @@ -63,6 +66,33 @@ sproc.wait() +class TeeTests(TestCaseBase): + def setUp(self): + self.dir = tempfile.mkdtemp() + + def tearDown(self): + shutil.rmtree(self.dir) + + def test(self): + d = self.dir + n = 10 + files = [] + for i in range(n): + files.append(os.path.join(d, "%d.tmp" % i)) + + data = "hello" + res = utils.tee_async(data, files).result() + self.assertEquals((data, None), res) + for fname in files: + with open(fname, "r") as f: + self.assertEquals(data, f.read()) + + def testError(self): + res, err = utils.tee_async("hello", ["/"]).result() + self.assertEquals(res, None) + self.assertNotEquals(err, None) + + class CommandPathTests(TestCaseBase): def testExisting(self): cp = utils.CommandPath('sh', 'utter nonsense', '/bin/sh') diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am index 2d3e9a6..a367c9b 100644 --- a/vdsm/storage/Makefile.am +++ b/vdsm/storage/Makefile.am @@ -33,6 +33,7 @@ fileSD.py \ fileUtils.py \ fileVolume.py \ + fc.py \ fuser.py \ glusterSD.py \ glusterVolume.py \ diff --git a/vdsm/storage/fc.py b/vdsm/storage/fc.py new file mode 100644 index 0000000..96aa710 --- /dev/null +++ b/vdsm/storage/fc.py @@ -0,0 +1,8 @@ +from glob import glob +from vdsm import utils + + +def rescan(): + """Issue command to discover new ports if the fc driver supports it""" + # Use tee to make sure we don't do that IO directly + utils.tee_async("1", glob("/sys/class/fc_host/host*/issue_lip")) diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py index 6d6fcbd..076bfca 100644 --- a/vdsm/storage/multipath.py +++ b/vdsm/storage/multipath.py @@ -36,6 +36,7 @@ import iscsi import supervdsm import devicemapper +import fc import storage_exception as se @@ -106,7 +107,8 @@ Should only be called from hsm._rescanDevices() """ - # First ask iSCSI to rescan all its sessions + # First ask fc and iSCSI to rescan all of their sessions + fc.rescan() iscsi.rescan() # Now let multipath daemon pick up new devices -- To view, visit http://gerrit.ovirt.org/19539 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idec939222676a24452e8825b36db68839bfd2bbc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

5 16

Change in vdsm[master]: vm: allow live snapshot to any volume descendant
by Federico Simoncelli 23 Jun '14

23 Jun '14

Federico Simoncelli has uploaded a new change for review. Change subject: vm: allow live snapshot to any volume descendant ...................................................................... vm: allow live snapshot to any volume descendant When a live snapshot fails qemu might not be using the newly-created leaf and the volume cleanup is at management discrection (sometime too risky or even impossible). In this particular situation (active layer not being the volume leaf) a subsequent live snapshot would have failed as the baseVolumeID was not the expected one. This patch relaxes the volumes checks allowing a live snapshot on the volume leaf even when it's not the direct descendant of the current active layer. Similarly also the check in hotunplugDisk has been relaxed so that it's now possible to hotunplug a disk with a failed live snapshot. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1018867 Change-Id: Ib50243c93665b9ab47ae70c779b7a1eb37c5e473 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/vm.py 1 file changed, 31 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/86/20986/1 diff --git a/vdsm/vm.py b/vdsm/vm.py index e716870..14e6a0c 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -3409,7 +3409,7 @@ diskParams['path'] = self.cif.prepareVolumePath(diskParams) try: - drive = self._findDriveByUUIDs(diskParams) + drive = self._findDriveByImage(diskParams) except LookupError: self.log.error("Hotunplug disk failed - Disk not found: %s", diskParams) @@ -3535,19 +3535,25 @@ return device raise LookupError("No such drive: '%s'" % name) + def _findDriveByImage(self, drive): + """Find a drive given is domainID and imageID""" + tgetDrv = (drive["domainID"], drive["imageID"]) + + for device in self._devices[DISK_DEVICES][:]: + if not hasattr(device, "domainID"): + continue + if (device.domainID, device.imageID) == tgetDrv: + return device + + raise LookupError("No such drive: '%s'" % drive) + def _findDriveByUUIDs(self, drive): """Find a drive given its definition""" if "domainID" in drive: - tgetDrv = (drive["domainID"], drive["imageID"], - drive["volumeID"]) - - for device in self._devices[DISK_DEVICES][:]: - if not hasattr(device, "domainID"): - continue - if (device.domainID, device.imageID, - device.volumeID) == tgetDrv: - return device + device = self._findDriveByImage(drive) + if device.volumeID == drive.get("volumeID", None): + return device elif "GUID" in drive: for device in self._devices[DISK_DEVICES][:]: @@ -3697,10 +3703,10 @@ continue # Next drive try: - vmDrive = self._findDriveByUUIDs(baseDrv) + vmDrive = self._findDriveByImage(baseDrv) except LookupError: - # The volume we want to snapshot doesn't exist - self.log.error("The base volume doesn't exist: %s", baseDrv) + # The disk we want to snapshot doesn't exist + self.log.error("The disk doesn't exist: %s", baseDrv) return errCode['snapshotErr'] if vmDrive.hasVolumeLeases: @@ -3711,6 +3717,18 @@ self.log.error("Disk %s is a transient disk", vmDrive.name) return errCode['transientErr'] + volumeInfo = self.cif.irs.getVolumeInfo( + tgetDrv['domainID'], vmDrive.poolID, tgetDrv['imageID'], + tgetDrv['volumeID']) + + if volumeInfo.get("status", {}).get("code") != 0: + self.log.error("Unable to get volume info for: %s", tgetDrv) + return errCode["snapshotErr"] + + if volumeInfo["info"]["voltype"] != "LEAF": + self.log.error("Volume %s is not a volume leaf", tgetDrv) + return errCode["snapshotErr"] + vmDevName = vmDrive.name newDrives[vmDevName] = tgetDrv.copy() -- To view, visit http://gerrit.ovirt.org/20986 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib50243c93665b9ab47ae70c779b7a1eb37c5e473 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

3 3

Change in vdsm[master]: cleanup: Networking code logging and docstring fixes
by asegurap＠redhat.com 23 Jun '14

23 Jun '14

Antoni Segura Puimedon has uploaded a new change for review. Change subject: cleanup: Networking code logging and docstring fixes ...................................................................... cleanup: Networking code logging and docstring fixes Change-Id: Ia50c60e6cd4aab0a4ef49d1d9a2d43b52b187ce2 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M vdsm/netmodels.py M vdsm/sourceRoute.py 2 files changed, 19 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/20553/1 diff --git a/vdsm/netmodels.py b/vdsm/netmodels.py index 554ce4b..e6feeb5 100644 --- a/vdsm/netmodels.py +++ b/vdsm/netmodels.py @@ -139,7 +139,7 @@ class Bridge(NetDevice): - '''This class represents traditional kernel bridges.''' + """This class represents traditional kernel bridges.""" MAX_NAME_LEN = 15 ILLEGAL_CHARS = frozenset(':. \t') @@ -270,7 +270,7 @@ @classmethod def validateOptions(cls, bonding, bondingOptions): - 'Example: BONDING_OPTS="mode=802.3ad miimon=150"' + """Example: BONDING_OPTS="mode=802.3ad miimon=150\"""" with cls._validationBond(bonding) as bond: try: for option in bondingOptions.split(): @@ -348,7 +348,7 @@ @classmethod def validateGateway(cls, gateway): - '''Validates the gateway form.''' + """Validates the gateway form.""" try: cls.validateAddress(gateway) except ConfigNetworkError as cne: diff --git a/vdsm/sourceRoute.py b/vdsm/sourceRoute.py index 73fe075..72519d9 100644 --- a/vdsm/sourceRoute.py +++ b/vdsm/sourceRoute.py @@ -65,7 +65,7 @@ def configure(self, ipaddr, mask, gateway): if gateway in (None, '0.0.0.0') or not ipaddr or not mask: - logging.error("ipaddr, mask or gateway not received") + logging.error('ipaddr, mask or gateway not received') return self.ipaddr = ipaddr @@ -75,10 +75,10 @@ network = netaddr.IPNetwork(str(self.ipaddr) + '/' + str(self.mask)) self.network = "%s/%s" % (network.network, network.prefixlen) - logging.info(("Configuring gateway - ip: %s, network: %s, " + - "subnet: %s, gateway: %s, table: %s, device: %s") % - (self.ipaddr, self.network, self.mask, self.gateway, - self.table, self.device)) + logging.info('Configuring gateway - ip: %s, network: %s, subnet: %s, ' + 'gateway: %s, table: %s, device: %s', self.ipaddr, + self.network, self.mask, self.gateway, self.table, + self.device) self.routes = self._buildRoutes() self.rules = self._buildRules() @@ -87,8 +87,8 @@ self.configurator.configureSourceRoute(self.routes, self.rules, self.device) except IPRoute2Error as e: - logging.error('ip binary failed during source route configuration', - ': %s' % e.message) + logging.error('ip binary failed during source route configuration' + ': %s', e.message) def remove(self): self.configurator.removeSourceRoute(None, None, self.device) @@ -116,13 +116,11 @@ try: route = Route.fromText(entry) except ValueError: - logging.debug("Could not parse route %s" % entry) + logging.debug('Could not parse route %s', entry) else: if route.device == device: - """ - When displaying routes from a table, the table is omitted, - so add it back again - """ + # When displaying routes from a table, the table is + # omitted, so add it back again route.table = table routes.append(route) @@ -133,7 +131,7 @@ if rules: return rules[0].table else: - logging.error("Table not found") + logging.error('Table not found') return None @staticmethod @@ -151,7 +149,7 @@ try: rule = Rule.fromText(entry) except ValueError: - logging.debug("Could not parse rule %s" % entry) + logging.debug('Could not parse rule %s', entry) else: allRules.append(rule) @@ -159,7 +157,7 @@ rules = [rule for rule in allRules if rule.srcDevice == device] if not rules: - logging.error("Routing rules not found for device %s" % device) + logging.error('Routing rules not found for device %s', device) return # Extract its destination network @@ -172,7 +170,7 @@ return rules def remove(self): - logging.info("Removing gateway - device: %s" % self.device) + logging.info('Removing gateway - device: %s', self.device) rules = self._getRules(self.device) if rules: @@ -184,7 +182,7 @@ self.device) except IPRoute2Error as e: logging.error('ip binary failed during source route ' - 'removal: %s' % e.message) + 'removal: %s', e.message) def _isLibvirtInterfaceFallback(self): """ @@ -209,7 +207,7 @@ except libvirtError: # libvirt might not be started or it just fails logging.error('Libvirt failed to answer. It might be the case that' ' this script is being run before libvirt startup. ' - ' Thus, check if vdsm owns %s an alternative way' % + ' Thus, check if vdsm owns %s an alternative way', self.device) return self._isLibvirtInterfaceFallback() trackedInterfaces = [network.get('bridge') or network.get('iface') -- To view, visit http://gerrit.ovirt.org/20553 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia50c60e6cd4aab0a4ef49d1d9a2d43b52b187ce2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

3 5

Change in vdsm[master]: Move fencing logic out of API.py
by smizrahi＠redhat.com 23 Jun '14

23 Jun '14

Saggi Mizrahi has uploaded a new change for review. Change subject: Move fencing logic out of API.py ...................................................................... Move fencing logic out of API.py API.py should not contain logic. In this patch I also: - Separate the `status` action to a different function because it does something completely different from the other action and has different logic. - Refactor for better code reusability readability. - Use real exception internally and have the API layer translate them to actual exceptions. - Don't support port strings in methods, just in the interface. - Don't support string booleans in the methods, just in the interface. - Added shutdownEvent to ClientIF so there is a public standard way of inspecting vdsm shutdown. - Make the fencing logic use betterPopen Change-Id: I944c6548a42612f705a410fb4290215451bca035 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm.spec.in M vdsm/API.py M vdsm/Makefile.am M vdsm/clientIF.py 4 files changed, 25 insertions(+), 72 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/7190/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 23afd6b..f122cb5 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -558,6 +558,7 @@ %{_datadir}/%{vdsm_name}/caps.py* %{_datadir}/%{vdsm_name}/clientIF.py* %{_datadir}/%{vdsm_name}/API.py* +%{_datadir}/%{vdsm_name}/fenceAgent.py* %{_datadir}/%{vdsm_name}/hooking.py* %{_datadir}/%{vdsm_name}/hooks.py* %{_datadir}/%{vdsm_name}/libvirtev.py* diff --git a/vdsm/API.py b/vdsm/API.py index ae04e01..5826d81 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -19,12 +19,9 @@ # import os -import signal import copy -import subprocess import pickle import time -import threading import logging from vdsm import utils @@ -40,6 +37,7 @@ from vdsm.define import doneCode, errCode, Kbytes, Mbytes import caps from vdsm.config import config +import fenceAgent import supervdsm @@ -981,82 +979,32 @@ agent is one of (rsa, ilo, drac5, ipmilan, etc) action can be one of (status, on, off, reboot).""" - def waitForPid(p, inp): - """ Wait until p.pid exits. Kill it if vdsm exists before. """ - try: - p.stdin.write(inp) - p.stdin.close() - while p.poll() is None: - if not self._cif._enabled: - self.log.debug('killing fence script pid %s', p.pid) - os.kill(p.pid, signal.SIGTERM) - time.sleep(1) - try: - # improbable race: p.pid may now belong to another - # process - os.kill(p.pid, signal.SIGKILL) - except: - pass - return - time.sleep(1) - self.log.debug('rc %s inp %s out %s err %s', p.returncode, - hidePasswd(inp), - p.stdout.read(), p.stderr.read()) - except: - self.log.error("Error killing fence script", exc_info=True) - - def hidePasswd(text): - cleantext = '' - for line in text.splitlines(True): - if line.startswith('passwd='): - line = 'passwd=XXXX\n' - cleantext += line - return cleantext - self.log.debug('fenceNode(addr=%s,port=%s,agent=%s,user=%s,' + 'passwd=%s,action=%s,secure=%s,options=%s)', addr, port, agent, username, 'XXXX', action, secure, options) - if action not in ('status', 'on', 'off', 'reboot'): - raise ValueError('illegal action ' + action) + secure = utils.tobool(secure) + port = int(port) - script = constants.EXT_FENCE_PREFIX + agent + if action == "status": + try: + power = fenceAgent.getFenceStatus(addr, port, agent, username, + password, secure, options) + + return {'status': doneCode, + 'power': power} + + except fenceAgent.FenceStatusCheckError as e: + return {'status': {'code': 1, 'message': str(e)}} try: - p = subprocess.Popen([script], stdin=subprocess.PIPE, - stdout=subprocess.PIPE, stderr=subprocess.PIPE, - close_fds=True) - except OSError, e: - if e.errno == os.errno.ENOENT: - return errCode['fenceAgent'] - raise + fenceAgent.fenceNode(addr, port, agent, username, password, secure, + options, self._cif.shutdownEvent) - inp = ('agent=fence_%s\nipaddr=%s\nlogin=%s\noption=%s\n' + - 'passwd=%s\n') % (agent, addr, username, action, password) - if port != '': - inp += 'port=%s\n' % (port,) - if utils.tobool(secure): - inp += 'secure=yes\n' - inp += options - if action == 'status': - out, err = p.communicate(inp) - self.log.debug('rc %s in %s out %s err %s', p.returncode, - hidePasswd(inp), out, err) - if not 0 <= p.returncode <= 2: - return {'status': {'code': 1, - 'message': out + err}} - message = doneCode['message'] - if p.returncode == 0: - power = 'on' - elif p.returncode == 2: - power = 'off' - else: - power = 'unknown' - message = out + err - return {'status': {'code': 0, 'message': message}, - 'power': power} - threading.Thread(target=waitForPid, args=(p, inp)).start() - return {'status': doneCode} + return {'status': doneCode} + + except fenceAgent.UnsupportedFencingAgentError: + return errCode['fenceAgent'] def ping(self): "Ping the server. Useful for tests" diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 62ba982..4a7bc57 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -32,6 +32,7 @@ clientIF.py \ configNetwork.py \ debugPluginClient.py \ + fenceAgent.py \ guestIF.py \ hooking.py \ hooks.py \ @@ -52,7 +53,8 @@ tc.py \ vdsmDebugPlugin.py \ vmChannels.py \ - vm.py + vm.py \ + $(NULL) dist_vdsmpylib_PYTHON = \ __init__.py \ diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index 8ba25a7..8760437 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -96,6 +96,7 @@ self.lastRemoteAccess = 0 self._memLock = threading.Lock() self._enabled = True + self.shutdownEvent = threading.Event() self._netConfigDirty = False self._prepareMOM() threading.Thread(target=self._recoverExistingVms, @@ -219,6 +220,7 @@ for binding in self.bindings.values(): binding.prepareForShutdown() self._enabled = False + self.shutdownEvent.set() self.channelListener.stop() self._hostStats.stop() if self.mom: -- To view, visit http://gerrit.ovirt.org/7190 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I944c6548a42612f705a410fb4290215451bca035 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

7 23

Change in vdsm[master]: Use more fine lock for hsm.deleteImage().
by ewarszaw＠redhat.com 23 Jun '14

23 Jun '14

Eduardo has uploaded a new change for review. Change subject: Use more fine lock for hsm.deleteImage(). ...................................................................... Use more fine lock for hsm.deleteImage(). When removing an image from a specific SD, lock the image in this SD exclusively. Related to: BZ#960952. Change-Id: Iab04d548610cd86eb70e1fd13a29a3508778cc1d Signed-off-by: Eduardo <ewarszaw(a)redhat.com> --- M vdsm/storage/hsm.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/16413/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 5639c13..09c5404 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -1437,7 +1437,8 @@ self.getPool(spUUID) # Validates that the pool is connected. WHY? dom = self.validateSdUUID(sdUUID) - vars.task.getExclusiveLock(STORAGE, imgUUID) + imageResourcesNamespace = sd.getNamespace(sdUUID, IMAGE_NAMESPACE) + vars.task.getExclusiveLock(imageResourcesNamespace, imgUUID) vars.task.getSharedLock(STORAGE, sdUUID) allVols = dom.getAllVolumes() volsByImg = sd.getVolsOfImage(allVols, imgUUID) -- To view, visit http://gerrit.ovirt.org/16413 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iab04d548610cd86eb70e1fd13a29a3508778cc1d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

4 4

Change in vdsm[master]: [WIP] metaSize calculation as a module function.
by ewarszaw＠redhat.com 23 Jun '14

23 Jun '14

Eduardo has uploaded a new change for review. Change subject: [WIP] metaSize calculation as a module function. ...................................................................... [WIP] metaSize calculation as a module function. Change-Id: If90ba75d11c4962f2e52150e5f381cd93d0e8f35 Signed-off-by: Eduardo <ewarszaw(a)redhat.com> --- M vdsm/storage/blockSD.py 1 file changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/11690/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 9b9674e..aa4059a 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -269,6 +269,27 @@ return +def metaSize(vgName): + ''' Calc the minimal meta volume size in MB''' + # In any case the metadata volume cannot be less than 512MB for the + # case of 512 bytes per volume metadata, 2K for domain metadata and + # extent size of 128MB. In any case we compute the right size on line. + vg = lvm.getVG(vgName) + minmetasize = (SD_METADATA_SIZE / sd.METASIZE * int(vg.extent_size) + + (1024 * 1024 - 1)) / (1024 * 1024) + metaratio = int(vg.extent_size) / sd.METASIZE + metasize = (int(vg.extent_count) * sd.METASIZE + + (1024 * 1024 - 1)) / (1024 * 1024) + metasize = max(minmetasize, metasize) + if metasize > int(vg.free) / (1024 * 1024): + raise se.VolumeGroupSizeError("volume group has not enough extents %s" + " (Minimum %s), VG may be too small" % + (vg.extent_count, + (1024 * 1024) / sd.METASIZE)) + log.info("size %s MB (metaratio %s)" % (metasize, metaratio)) + return metasize + + class VGTagMetadataRW(object): log = logging.getLogger("storage.Metadata.VGTagMetadataRW") METADATA_TAG_PREFIX = "MDT_" @@ -449,27 +470,6 @@ lvmActivationNamespace) @classmethod - def metaSize(cls, vgroup): - ''' Calc the minimal meta volume size in MB''' - # In any case the metadata volume cannot be less than 512MB for the - # case of 512 bytes per volume metadata, 2K for domain metadata and - # extent size of 128MB. In any case we compute the right size on line. - vg = lvm.getVG(vgroup) - minmetasize = (SD_METADATA_SIZE / sd.METASIZE * int(vg.extent_size) + - (1024 * 1024 - 1)) / (1024 * 1024) - metaratio = int(vg.extent_size) / sd.METASIZE - metasize = (int(vg.extent_count) * sd.METASIZE + - (1024 * 1024 - 1)) / (1024 * 1024) - metasize = max(minmetasize, metasize) - if metasize > int(vg.free) / (1024 * 1024): - raise se.VolumeGroupSizeError( - "volume group has not enough extents %s (Minimum %s), VG may " - "be too small" % (vg.extent_count, - (1024 * 1024) / sd.METASIZE)) - cls.log.info("size %s MB (metaratio %s)" % (metasize, metaratio)) - return metasize - - @classmethod def create(cls, sdUUID, domainName, domClass, vgUUID, storageType, version): """ Create new storage domain @@ -509,7 +509,7 @@ raise se.StorageDomainIsMadeFromTooManyPVs() # Create metadata service volume - metasize = cls.metaSize(vgName) + metasize = metaSize(vgName) lvm.createLV(vgName, sd.METADATA, "%s" % (metasize)) # Create the mapping right now so the index 0 is guaranteed # to belong to the metadata volume. Since the metadata is at @@ -721,7 +721,7 @@ lvm.extendVG(self.sdUUID, devices, force) self.updateMapping() - newsize = self.metaSize(self.sdUUID) + newsize = metaSize(self.sdUUID) lvm.extendLV(self.sdUUID, sd.METADATA, newsize) def mapMetaOffset(self, vol_name, slotSize): -- To view, visit http://gerrit.ovirt.org/11690 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If90ba75d11c4962f2e52150e5f381cd93d0e8f35 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

4 14

Change in vdsm[master]: [WIP]add createVm support of cputune
by lvroyce＠linux.vnet.ibm.com 23 Jun '14

23 Jun '14

Royce Lv has uploaded a new change for review. Change subject: [WIP]add createVm support of cputune ...................................................................... [WIP]add createVm support of cputune allow engine to pass other cputune params through vm create, createVm now uses nice to config vm share value, this patch uses 'shares' in vmdef directly (1024 by default) Change-Id: I76e9b9d291d4801965163774ba45d15b39a77471 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm/libvirtvm.py 1 file changed, 13 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/8445/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index fd80c69..9b38a36 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -737,10 +737,13 @@ self.dom.appendChild(cpu) def appendTunable(self): - #CPU-pinning support - # see http://www.ovirt.org/wiki/Features/Design/cpu-pinning + cputune = self.doc.createElement('cputune') + cputuneParams = {'shares':1024} + if 'cputune' in self.conf: + cputuneParam = self.conf['cputune'] if 'cpuPinning' in self.conf: - cputune = self.doc.createElement('cputune') + #CPU-pinning support + # see http://www.ovirt.org/wiki/Features/Design/cpu-pinning cpuPinning = self.conf.get('cpuPinning') try: emulatorset = cpuPinning.pop('emulator') @@ -754,7 +757,13 @@ vcpupin.setAttribute('vcpu', cpuPin) vcpupin.setAttribute('cpuset', cpuPinning[cpuPin]) cputune.appendChild(vcpupin) - self.dom.appendChild(cputune) + + for item in cputuneParams.keys(): + m = self.doc.createElement(item) + m.appendChild(self.doc.createTextNode(cputuneParams[item])) + cputune.appendChild(m) + + self.dom.appendChild(cputune) def _appendAgentDevice(self, path, name): """ @@ -1338,13 +1347,6 @@ if self._initTimePauseCode == 'ENOSPC': self.cont() self.conf['pid'] = self._getPid() - - nice = int(self.conf.get('nice', '0')) - nice = max(min(nice, 19), 0) - try: - self._dom.setSchedulerParameters({'cpu_shares': (20 - nice) * 51}) - except: - self.log.warning('failed to set Vm niceness', exc_info=True) def _run(self): self.log.info("VM wrapper has started") -- To view, visit http://gerrit.ovirt.org/8445 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76e9b9d291d4801965163774ba45d15b39a77471 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

11 37

Change in vdsm[master]: [WIP] VDSM <=> Engine data optimization
by Vinzenz Feenstra 18 Jun '14

18 Jun '14

Vinzenz Feenstra has uploaded a new change for review. Change subject: [WIP] VDSM <=> Engine data optimization ...................................................................... [WIP] VDSM <=> Engine data optimization Change-Id: Ifa0a7a86a351a8c2d891f22802a95d1fe1bc1df4 Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M vdsm/API.py M vdsm/BindingXMLRPC.py M vdsm/vm.py M vdsm_api/vdsmapi-schema.json 4 files changed, 499 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/14541/1 diff --git a/vdsm/API.py b/vdsm/API.py index ee72116..ebf331d 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -334,6 +334,66 @@ return errCode['noVM'] return v.migrateStatus() + def getRuntimeStats(self): + """ + Retrieve runtime statistics for the specific VM + """ + v = self._cif.vmContainer.get(self._UUID) + if not v: + return errCode['noVM'] + return { + 'status': doneCode, + 'runtimeStats': { + self._UUID: v.getRuntimeStats().copy()}} + + def getStatus(self): + """ + Retrieve VM status information for the specific VM + """ + v = self._cif.vmContainer.get(self._UUID) + if not v: + return errCode['noVM'] + return { + 'status': doneCode, + 'vmStatus': { + self._UUID: v.getStatus().copy()}} + + def getDeviceStats(self): + """ + Retrieve device statistics for the specific VM + """ + v = self._cif.vmcontainer.get(self._uuid) + if not v: + return errCode['noVM'] + return { + 'status': doneCode, + 'deviceStats': { + self._UUID: v.getDeviceStats().copy()}} + + def getConfInfo(self): + """ + Retrieve configuration information for the specific VM + """ + v = self._cif.vmcontainer.get(self._uuid) + if not v: + return errCode['noVM'] + return { + 'status': doneCode, + 'info': { + self._UUID: v.getInfo().copy()}} + + def getGuestDetails(self): + """ + Retrieve guest information for the specific VM + """ + v = self._cif.vmcontainer.get(self._uuid) + if not v: + return errCode['noVM'] + return { + 'status': doneCode, + 'guestDetails': { + self._UUID: v.getGuestDetails().copy()}} + def getStats(self): """ Obtain statistics of the specified VM diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py index 9a4db12..912018c 100644 --- a/vdsm/BindingXMLRPC.py +++ b/vdsm/BindingXMLRPC.py @@ -314,6 +314,52 @@ vm = API.VM(vmId) return vm.getStats() + def vmGetRuntimeStats(self, vmIds): + result = {} + for vmId in vmIds: + vm = API.VM(vmId) + result.update(vm.getRuntimeStats()['runtimeStats']) + return { + 'status': doneCode, + 'runtimeStats': result} + + def vmGetStatus(self, vmIds): + result = {} + for vmId in vmIds: + vm = API.VM(vmId) + result.update(vm.getStatus()['vmStatus']) + return { + 'status': doneCode, + 'vmStatus': result} + + def vmGetAllDeviceStats(self): + vms = self.getVMList() + result = {} + for vm in vms['vmList']: + v = API.VM(vm['vmId']) + result.update(v.getDeviceStats()['deviceStats']) + return { + 'status': doneCode, + 'deviceStats': result} + + def vmGetConfInfo(self, vmIds): + result = {} + for vmId in vmIds: + vm = API.VM(vmId) + result.update(vm.getConfInfo()['vmConfInfo']) + return { + 'status': doneCode, + 'vmConfInfo': result} + + def vmGetGuestDetails(self, vmIds): + result = {} + for vmId in vmIds: + vm = API.VM(vmId) + result.update(vm.getGuestDetails()['guestDetails']) + return { + 'status': doneCode, + 'guestDetails': result} + def getAllVmStats(self): """ Get statistics of all running VMs. diff --git a/vdsm/vm.py b/vdsm/vm.py index ddb09c8..6d57649 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -26,6 +26,7 @@ import tempfile import pickle from copy import deepcopy +import json from vdsm import utils from vdsm.define import NORMAL, ERROR, doneCode, errCode @@ -1115,6 +1116,65 @@ self.conf['status'] = self.lastStatus return self.conf + def _hashObject(self, o): + return str(hash(json.dumps(o))) + + def _getHashes(self, stats): + return { + 'info': self._hashObject(self._getInfo(stats)), + 'status': self._hashObject(self._getStatus(stats)), + 'guestDetals': self._hashObject(self._getGuestDetails(stats))} + + def _extractKeys(self, dictObject, keys): + extracted = {} + for k in keys: + v = dictObject.get(k) + if v: + extracted[k] = v + return extracted + + def getRuntimeStats(self): + allStats = self.getStats() + USED_KEYS = ('cpuSys', 'cpuUser', 'memUsage', 'elapsedTime', 'status', + 'statsAge') + stats = self._extractKeys(allStats, USED_KEYS) + stats['hashes'] = self._getHashes(allStats) + if 'hash' in allStats: + stats['hashes']['config'] = allStats['hash'] + return stats + + def _getStatus(self, stats): + USED_KEYS = ('timeOffset', 'monitorResponse', 'clientIp', 'lastLogin', + 'username', 'session', 'guestIPs') + return self._extractKeys(stats, USED_KEYS) + + def getStatus(self): + return self._getStatus(self.getStats()) + + def _getDeviceStats(self, stats): + USED_KEYS = ('network', 'disks', 'disksUsage', 'balloonInfo', + 'memoryStats') + return self._extractKeys(stats, USED_KEYS) + + def getDeviceStats(self): + return self._getDeviceStats(self.getStats()) + + def _getInfo(self, stats): + USED_KEYS = ('acpiEnable', 'vmType', 'guestName', 'guestOS', + 'kvmEnable', 'pauseCode', 'displayIp', 'displayPort', + 'displaySecurePort', 'pid') + return self._extractKeys(stats, USED_KEYS) + + def getInfo(self): + return self._getInfo(self.getStats()) + + def _getGuestDetails(self, stats): + USED_KEYS = ('appList', 'netIfaces') + return self._extractKeys(stats, USED_KEYS) + + def getGuestDetails(self): + return self._getGuestDetails(self.getStats()) + def getStats(self): # used by API.Vm.getStats diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 4ff8c7a..33be905 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -4850,6 +4850,339 @@ 'data': {'vmID': 'UUID'}, 'returns': 'VmDefinition'} +## +# @VmRuntimeStatsHashes: +# +# Hashes of several statistics and information around VMs +# +# @info: Hash for VmConfInfo data +# +# @config: Hash of the VM configuration XML +# +# @status: Hash of the VmStatusInfo data +# +# @guestDetails: Hash of the VmGuestDetails data +# +# Since: 4.10.3 +## +{ 'type': 'VmRuntimeStatsHashes', + 'data': { 'info': 'str', 'config': 'str', 'status': 'str', + 'guestDetails': 'str'}} + +## +# @VmRuntimeStats: +# +# Frequently changed and required data around VMs +# +# @cpuSys: Ratio of CPU time spent by qemu on other than guest time +# +# @cpuUser: Ratio of CPU time spent by the guest VM +# +# @memUsage: The percent of memory in use by the guest +# +# @elapsedTime: The number of seconds that the VM has been running +# +# @status: The current status of the given VM +# +# @statsAge: The age of these statistics in seconds +# +# @hashes: Hashes of several statistics and information around VMs +# +# Since: 4.10.3 +## +{ 'type': 'VmRuntimeStats', + 'data': { 'cpuSys': 'float', 'cpuUser': 'float', 'memUsage': 'uint', + 'elapsedTime': 'uint', 'status': 'VmStatus', 'statsAge': 'float', + 'hashes': 'VmRuntimeStatsHashes'}} + +## +# @VmRuntimeStatsResult: +# +# Union result of VmRuntimeStats or ExitedVmStats +# +# @exited: Indicates if the result is VmRuntimeStats or ExitedVmStats +# +# Since: 4.10.3 +## +{'type': 'VmRuntimeStatsResult', + 'data': { 'exited': 'bool' }, + 'union': ['VmRuntimeStats', 'ExitedVmStats']} + +## +# @VmRuntimeStatsMap: +# +# A mapping of VM runtime statistics indexed by vm id (UUID). +# +# Since: 4.10.3 +## +{'map': 'VmRuntimeStatsMap', + 'key': 'UUID', 'value': 'VmRuntimeStatsResult' }} + + +## +# @VM.getRuntimeStats: +# +# Get runtime information about a list of VMs +# +# @vmIDs: a list of UUIDs for VMs to query +# +# Returns: +# VmRuntimeStatsMap +# +# Since: 4.10.3 +## +{'command': {'class': 'VM', 'name': 'getRuntimeStats'}, + 'data': {'vmIDs': ['UUID']}, + 'returns': 'VmRuntimeStatsMap'} + +## +# @VmStatusInfo: +# +# Information to the status of a VM and less frequently changed information +# +# @timeOffset: The time difference from host to the VM in seconds +# +# @monitorResponse: Indicates if the qemu monitor is responsive +# +# @clientIp: The IP address of the client connected to the display +# +# @username: the username associated with the current session +# +# @session: The current state of user interaction with the VM +# +# @guestIPs: A space separated string of assigned IPv4 addresses +# +# @pauseCode: Indicates the reason a VM has been paused +# +# Since: 4.10.3 +## +{ 'type': 'VmStatusInfo', + 'data': { 'timeOffset': 'uint', 'monitorResponse': 'int', 'clientIp': 'str', + 'username': 'str', 'session': 'GuestSessionState', + 'guestIPs': 'str', 'pauseCode': 'str'}} + +## +# @VmStatusInfoResult: +# +# Union result of VmStatusInfo or ExitedVmStats +# +# @exited: Indicates if the result is VmStatusInfo or ExitedVmStats +# +# Since: 4.10.3 +## +{'type': 'VmStatusInfoResult', + 'data': { 'exited': 'bool' }, + 'union': ['VmStatusInfo', 'ExitedVmStats']} + +## +# @VmStatusInfoMap: +# +# A mapping of VM status information indexed by vm id (UUID). +# +# Since: 4.10.3 +## +{'map': 'VmStatusInfoMap', + 'key': 'UUID', 'value': 'VmStatusInfoResult'} + +## +# @VM.getStatus: +# +# Get status information about a list of VMs +# +# @vmIDs: a list of UUIDs for VMs to query +# +# Returns: +# VmStatusMap +# +# Since: 4.10.3 +## +{'command': {'class': 'VM', 'name': 'getStatus'}, + 'data': {'vmIDs': ['UUID']}, + 'returns': 'VmStatusInfoMap'} + +## +# @VmConfInfo: +# +# VM configuration information +# +# @acpiEnable: Indicates if ACPI is enabled inside the VM +# +# @displayPort: The port in use for unencrypted display data +# +# @displaySecurePort: The port in use for encrypted display data +# +# @displayType: The type of display in use +# +# @displayIp: The IP address to use for accessing the VM display +# +# @pid: The process ID of the underlying qemu process +# +# @vmType: The type of VM +# +# @kvmEnable: Indicates if KVM hardware acceleration is enabled +# +# @cdrom: #optional The path to an ISO image used in the VM's CD-ROM device +# +# @boot: #optional An alias for the type of device used to boot the VM +# +# Since: 4.10.3 +## +{ 'type': 'VmConfInfo', + 'data': { 'acpiEnable': 'bool', 'vmType': 'VmType', + 'kvmEnable': 'bool', 'displayIp': 'str', 'displayPort': 'uint', + 'displaySecurePort': 'uint', 'displayType': 'VmDisplayType', + 'pid': 'uint', '*boot': 'VmBootMode', '*cdrom': 'str'}} + +## +# @VmConfInfoResult: +# +# Union result of VmConfInfo or ExitedVmStats +# +# @exited: Indicates if the result is VmConfInfo or ExitedVmStats +# +# Since: 4.10.3 +## +{'type': 'VmConfInfoResult', + 'data': { 'exited': 'bool' }, + 'union': ['VmConfInfo', 'ExitedVmStats']} + +## +# @VmConfInfoMap: +# +# A mapping of VM config information indexed by vm id (UUID). +# +# Since: 4.10.3 +## +{'map': 'VmConfInfoMap', + 'key': 'UUID', 'value': 'VmConfInfoResult' }} + +## +# @VM.getConfInfo: +# +# Get configuration information about a list of VMs +# +# @vmIDs: a list of UUIDs for VMs to query +# +# Returns: +# VmConfInfoMap +# +# Since: 4.10.3 +## +{'command': {'class': 'VM', 'name': 'getConfInfo'}, + 'data': {'vmIDs': ['UUID']}, + 'returns': 'VmConfInfoMap'} + +## +# @VmDeviceStats: +# +# VM device statistics containing information for getting statistics and SLA +# information. +# +# @memoryStats: Memory statistics as reported by the guest agent +# +# @balloonInfo: Guest memory balloon information +# +# @disksUsage: Info about mounted filesystems as reported by the agent +# +# @network: Network bandwidth/utilization statistics +# +# @disks: Disk bandwidth/utilization statistics +# +# Since: 4.10.3 +## +{ 'type': 'VmDeviceStats', + 'data': { 'network': 'NetworkInterfaceStatsMap', 'disks': 'VmDiskStatsMap', + 'disksUsage': ['GuestMountInfo'], 'balloonInfo': 'BalloonInfo', + 'memoryStats': 'GuestMemoryStats' }} + +## +# @VmDeviceStatsResult: +# +# Union result of VmDeviceStats or ExitedVmStats +# +# @exited: Indicates if the result is VmDeviceStats or ExitedVmStats +# +# Since: 4.10.3 +## +{'type': 'VmDeviceStatsResult', + 'data': { 'exited': 'bool' }, + 'union': ['VmDeviceStats', 'ExitedVmStats']} + +## +# @VmDeviceStatsMap: +# +# A mapping of VM device statistics indexed by vm id (UUID). +# +# Since: 4.10.3 +## +{'map': 'VmDeviceStatsMap', + 'key': 'UUID', 'value': 'VmDeviceStatsResult' }} + +## +# @VM.getAllDeviceStats: +# +# Get device statistics from all VMs +# +# Returns: +# VmDeviceStatsMap +# +# Since: 4.10.3 +## +{'command': {'class': 'VM', 'name': 'getAllDeviceStats'}, + 'returns': 'VmDeviceStatsMap'} + +## +# @VmGuestDetails: +# +# Non-frequent changed details from guest OSes +# +# @appsList: A list of installed applications with their versions +# +# @netIfaces: Network device address info as reported by the agent +# +# Since: 4.10.3 +## +{ 'type': 'VmGuestDetails', + 'data': { 'appsList': ['str'], 'netIfaces': ['GuestNetworkDeviceInfo'] }} + +## +# @VmGuestDetailsResult: +# +# Union result of VmDeviceStats or ExitedVmStats +# +# @exited: Indicates if the result is VmGuestDetails or ExitedVmStats +# +# Since: 4.10.3 +## +{'type': 'VmGuestDetailsResult', + 'data': { 'exited': 'bool' }, + 'union': ['VmGuestDetails', 'ExitedVmStats']} + +## +# @VmGuestDetailsMap: +# +# A mapping of detailed information of guests indexed by vm id (UUID). +# +# Since: 4.10.3 +## +{'map': 'VmGuestDetailsMap', + 'key': 'UUID', 'value': 'VmGuestDetailsResult' }} + +## +# @VM.getGuestDetails: +# +# Get details from the guest OS from a list of VMs +# +# @vmIDs: a list of UUIDs for VMs to query +# +# Returns: +# VmGuestDetailsMap +# +# Since: 4.10.3 +## +{'command': {'class': 'VM', 'name': 'getGuestDetails'}, + 'data': {'vmIDs': ['UUID']}, + 'returns': 'VmGuestDetailsMap'} ## # @VM.getMigrationStatus: -- To view, visit http://gerrit.ovirt.org/14541 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa0a7a86a351a8c2d891f22802a95d1fe1bc1df4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

3 11

Change in vdsm[master]: sp: Nest try-finally for temporary secure change
by Nir Soffer 15 Jun '14

15 Jun '14

Nir Soffer has uploaded a new change for review. Change subject: sp: Nest try-finally for temporary secure change ...................................................................... sp: Nest try-finally for temporary secure change There were two instances where the same try-finally block was used for both acquiring a lock and setting the pool as secure for a block of code: acquire lock try: set secure code that needs both lock and secure state finally: set unsecure release lock This type of usage is incorrect. try-finally block should be used for one change to ensure that the change is finally reverted, and to make the intention of the code clear. This patch use nested try-finally blocks, one for the lock, and one for the secure state: acquire lock try: set secure try: code that needs both lock and secure state finally: set unsecure finally: release lock Because of the extra nesting, comments inside the nested code were reformatted and missing punctuation was added. I considered replacing the nested try-finally with a secured context manager, but since the current code uses try-except-finally, using a context manager would create an even deeper nesting or extracting some new private methods. To keep minimal changes, I avoid this direction. It seems that the secure state block can become smaller - some method inside the secured block are @unsecured. I kept the secure block semantics are they are now, and will check minimizing the secured block in a later patch. Change-Id: Ia9054063db0eeacd156a8e586681496515f80e2b Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 48 insertions(+), 48 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/23955/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index a020e1e..c26f7a8 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -566,40 +566,41 @@ fileUtils.createdir(self.poolPath) self._acquireTemporaryClusterLock(msdUUID, leaseParams) - try: self._setSecure() - # Mark 'master' domain - # We should do it before actually attaching this domain to the pool - # During 'master' marking we create pool metadata and each attached - # domain should register there - self.createMaster(poolName, msd, masterVersion, leaseParams) - self.__rebuild(msdUUID=msdUUID, masterVersion=masterVersion) - # Attach storage domains to the storage pool - # Since we are creating the pool then attach is done from the hsm - # and not the spm therefore we must manually take the master domain - # lock - # TBD: create will receive only master domain and further attaches - # should be done under SPM - - # Master domain was already attached (in createMaster), - # no need to reattach - for sdUUID in domList: - # No need to attach the master - if sdUUID != msdUUID: - self.attachSD(sdUUID) - except Exception: - self.log.error("Create pool %s canceled ", poolName, exc_info=True) try: - fileUtils.cleanupdir(self.poolPath) - self.__cleanupDomains(domList, msdUUID, masterVersion) - except: - self.log.error("Cleanup failed due to an unexpected error", - exc_info=True) - raise - finally: - self._setUnsecure() + # Mark 'master' domain. We should do it before actually + # attaching this domain to the pool During 'master' marking we + # create pool metadata and each attached domain should register + # there. + self.createMaster(poolName, msd, masterVersion, leaseParams) + self.__rebuild(msdUUID=msdUUID, masterVersion=masterVersion) + # Attach storage domains to the storage pool. Since we are + # creating the pool then attach is done from the hsm and not + # the spm therefore we must manually take the master domain + # lock. + # TBD: create will receive only master domain and further + # attaches should be done under SPM. + # Master domain was already attached (in createMaster), no need + # to reattach. + for sdUUID in domList: + # No need to attach the master + if sdUUID != msdUUID: + self.attachSD(sdUUID) + except Exception: + self.log.error("Create pool %s canceled ", poolName, + exc_info=True) + try: + fileUtils.cleanupdir(self.poolPath) + self.__cleanupDomains(domList, msdUUID, masterVersion) + except: + self.log.error("Cleanup failed due to an unexpected error", + exc_info=True) + raise + finally: + self._setUnsecure() + finally: self._releaseTemporaryClusterLock(msdUUID) self.stopMonitoringDomains() @@ -697,29 +698,28 @@ # The host id must be set for createMaster(...). self.id = hostId temporaryLock = False - - # As in the create method we need to temporarily set the object - # secure in order to change the domains map. - # TODO: it is clear that reconstructMaster and create (StoragePool) - # are extremely similar and they should be unified. - self._setSecure() - try: - self.createMaster(poolName, futureMaster, masterVersion, - leaseParams) - self.setMasterDomain(msdUUID, masterVersion) + # As in the create method we need to temporarily set the object + # secure in order to change the domains map. + # TODO: it is clear that reconstructMaster and create (StoragePool) + # are extremely similar and they should be unified. + self._setSecure() + try: + self.createMaster(poolName, futureMaster, masterVersion, + leaseParams) + self.setMasterDomain(msdUUID, masterVersion) - for sdUUID in domDict: - domDict[sdUUID] = domDict[sdUUID].capitalize() + for sdUUID in domDict: + domDict[sdUUID] = domDict[sdUUID].capitalize() - # Add domain to domain list in pool metadata. - self.log.info("Set storage pool domains: %s", domDict) - self._backend.setDomainsMap(domDict) + # Add domain to domain list in pool metadata. + self.log.info("Set storage pool domains: %s", domDict) + self._backend.setDomainsMap(domDict) - self.refresh(msdUUID=msdUUID, masterVersion=masterVersion) + self.refresh(msdUUID=msdUUID, masterVersion=masterVersion) + finally: + self._setUnsecure() finally: - self._setUnsecure() - if temporaryLock: self._releaseTemporaryClusterLock(msdUUID) self.stopMonitoringDomains() -- To view, visit http://gerrit.ovirt.org/23955 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia9054063db0eeacd156a8e586681496515f80e2b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

7 13

Change in vdsm[master]: netinfo: Retrieve bonding options differing from defaults (WIP)
by osvoboda＠redhat.com 13 Jun '14

13 Jun '14

Ondřej Svoboda has uploaded a new change for review. Change subject: netinfo: Retrieve bonding options differing from defaults (WIP) ...................................................................... netinfo: Retrieve bonding options differing from defaults (WIP) On failure, an empty dictionary is returned. Tests are yet to be created. Change-Id: Ief6d366b1b761627c7203cf236b75ef538af3e26 Bug-Url: https://bugzilla.redhat.com/987813 Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M lib/vdsm/netinfo.py M tests/functional/networkTests.py M tests/functional/supervdsmFuncTests.py M vdsm/supervdsmServer 4 files changed, 53 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/24456/1 diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index dbacb2f..fe48f81 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -41,7 +41,7 @@ from .ipwrapper import routeShowGateways, routeShowAllDefaultGateways from . import libvirtconnection from .ipwrapper import linkShowDev -from .utils import anyFnmatch +from .utils import anyFnmatch, execCmd, memoized, CommandPath from .netconfpersistence import RunningConfig @@ -68,9 +68,11 @@ _BONDING_LOADBALANCE_MODES = frozenset(('0', '2', '4', '5', '6')) _IFCFG_ZERO_SUFFIXED = frozenset( ('IPADDR0', 'GATEWAY0', 'PREFIX0', 'NETMASK0')) +_TEE_BINARY = CommandPath('tee', '/usr/bin/tee') LIBVIRT_NET_PREFIX = 'vdsm-' DUMMY_BRIDGE = ';vdsmdummy;' +DUMMY_BOND = ';vdsmdummybond;' DEFAULT_MTU = '1500' REQUIRED_BONDINGS = frozenset(('bond0', 'bond1', 'bond2', 'bond3', 'bond4')) @@ -531,9 +533,44 @@ return info +@memoized +def _getDefaultBondingOptions(): + teeCmd = _TEE_BINARY.cmd + + rc, _, err = execCmd([teeCmd, BONDING_MASTERS], + data='+' + DUMMY_BOND, sudo=True) + if rc: + raise OSError('Creating a reference bond failed: %s.', err) + + try: + opts = bondOpts(DUMMY_BOND) + finally: + rc, _, _ = execCmd([teeCmd, BONDING_MASTERS], + data='-' + DUMMY_BOND, sudo=True) + + return opts + + +def _getBondingOptions(bond): + try: + defaults = _getDefaultBondingOptions() + opts = bondOpts(bond) + + except Exception as e: + logging.exception('Reading bonding options failed.') + return {} + + for key, val in dict(opts).iteritems(): + if key in defaults and val == defaults[key]: + del opts[key] + + return opts + + def _bondinfo(link): info = _devinfo(link) - info.update({'hwaddr': link.address, 'slaves': slaves(link.name)}) + info.update({'hwaddr': link.address, 'slaves': slaves(link.name), + 'options': _getBondingOptions(bond)}) return info diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 695a29f..f2a785d 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -41,7 +41,7 @@ from vdsm.utils import RollbackContext from vdsm.netinfo import (operstate, prefix2netmask, getRouteDeviceTo, - getDhclientIfaces) + getDhclientIfaces, _getBondingOptions) from vdsm import ipwrapper from vdsm.utils import pgrep @@ -1728,3 +1728,9 @@ NOCHK) self.assertEqual(status, SUCCESS, msg) self.assertNetworkDoesntExist(NETWORK_NAME) + + def testGetBondingOptions(self): + # TODO: Create a bond with mode and miimon options set and check + # that no other options are returned. + + _getBondingOptions('bond0') diff --git a/tests/functional/supervdsmFuncTests.py b/tests/functional/supervdsmFuncTests.py index 4596306..fa94291 100644 --- a/tests/functional/supervdsmFuncTests.py +++ b/tests/functional/supervdsmFuncTests.py @@ -37,3 +37,9 @@ self.dropPrivileges() proxy = supervdsm.getProxy() self.assertTrue(proxy.ping()) + + @testValidation.ValidateRunningAsRoot + def testDefaultBondingOptions(self): + proxy = supervdsm.getProxy() + print proxy.defaultBondingOptions() + raise Exception() diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer index 21351c3..ce07dea 100755 --- a/vdsm/supervdsmServer +++ b/vdsm/supervdsmServer @@ -49,7 +49,7 @@ except ImportError: _glusterEnabled = False -from vdsm import utils +from vdsm import netinfo, utils from vdsm.tool import restore_nets from parted_utils import getDevicePartedInfo as _getDevicePartedInfo from md_utils import getMdDeviceUuidMap as _getMdDeviceUuidMap -- To view, visit http://gerrit.ovirt.org/24456 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief6d366b1b761627c7203cf236b75ef538af3e26 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

4 97

← Newer
1
...
4
5
6
7
8
9
10
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches February 2014