vdsm-patches December 2012

vdsm-patches@lists.fedorahosted.org

51 participants
408 discussions

Change in vdsm[master]: Add correct TUNSETIFF ioctl value for IBM Power (ppc64) in t...
by Pradipta Kumar Banerjee 19 Dec '12

19 Dec '12

Pradipta Banerjee has uploaded a new change for review. Change subject: Add correct TUNSETIFF ioctl value for IBM Power (ppc64) in tcTests.py ...................................................................... Add correct TUNSETIFF ioctl value for IBM Power (ppc64) in tcTests.py The existing _TUNSETIFF value is specific for x86 arch. This patch adds the value for ppc64 arch Change-Id: I0a3831761aed81932466e29d88f5eb50bf5ce23d Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- M tests/tcTests.py 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/10202/1 diff --git a/tests/tcTests.py b/tests/tcTests.py index 1983ea1..5f7da75 100644 --- a/tests/tcTests.py +++ b/tests/tcTests.py @@ -38,6 +38,7 @@ from nose.plugins.skip import SkipTest import tc +import platform EXT_IP = "/sbin/ip" @@ -88,8 +89,12 @@ class _Tap(_Interface): _IFF_TAP = 0x0002 - _TUNSETIFF = 0x400454ca _IFF_NO_PI = 0x1000 + arch = platform.machine() + if arch == 'x86_64': + _TUNSETIFF = 0x400454ca + elif arch == 'ppc64': + _TUNSETIFF = 0x800454ca _deviceListener = None -- To view, visit http://gerrit.ovirt.org/10202 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a3831761aed81932466e29d88f5eb50bf5ce23d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Pradipta Banerjee <bpradip(a)in.ibm.com>

3 15

Change in vdsm[master]: Fix blockSD pep8.
by asegurap＠redhat.com 18 Dec '12

18 Dec '12

Antoni Segura Puimedon has uploaded a new change for review. Change subject: Fix blockSD pep8. ...................................................................... Fix blockSD pep8. Change-Id: I2ed4ce2a5748a911f76da02f762e5bda9352b905 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M vdsm/storage/blockSD.py 1 file changed, 123 insertions(+), 74 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/10213/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 61ec996..b5447cd 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -73,7 +73,8 @@ MAX_PVS_LIMIT = 10 # BZ#648051 MAX_PVS = config.getint('irs', 'maximum_allowed_pvs') if MAX_PVS > MAX_PVS_LIMIT: - log.warning("maximum_allowed_pvs = %d ignored. MAX_PVS = %d", MAX_PVS, MAX_PVS_LIMIT) + log.warning("maximum_allowed_pvs = %d ignored. MAX_PVS = %d", MAX_PVS, + MAX_PVS_LIMIT) MAX_PVS = MAX_PVS_LIMIT PVS_METADATA_SIZE = MAX_PVS * 142 @@ -111,8 +112,10 @@ # Key dec, enc DMDK_PV_REGEX: (decodePVInfo, encodePVInfo), DMDK_VGUUID: (str, str), - DMDK_LOGBLKSIZE: (functools.partial(sd.intOrDefault, DEFAULT_BLOCKSIZE), str), - DMDK_PHYBLKSIZE: (functools.partial(sd.intOrDefault, DEFAULT_BLOCKSIZE), str), + DMDK_LOGBLKSIZE: (functools.partial(sd.intOrDefault, DEFAULT_BLOCKSIZE), + str), + DMDK_PHYBLKSIZE: (functools.partial(sd.intOrDefault, DEFAULT_BLOCKSIZE), + str), }) INVALID_CHARS = re.compile(r"[^a-zA-Z0-9_+.\-/=!:#]") @@ -173,7 +176,7 @@ res[vPar]['imgs'].append(vImg) return dict((k, sd.ImgsPar(tuple(v['imgs']), v['parent'])) - for k, v in res.iteritems()) + for k, v in res.iteritems()) def deleteVolumes(sdUUID, vols): @@ -193,8 +196,8 @@ count = size / BS cmd = tuple(constants.CMD_LOWPRIO) cmd += (constants.EXT_DD, "oflag=%s" % misc.DIRECTFLAG, "if=/dev/zero", - "of=%s" % lvm.lvPath(sdUUID, volUUID), "bs=%s" % BS, - "count=%s" % count) + "of=%s" % lvm.lvPath(sdUUID, volUUID), "bs=%s" % BS, + "count=%s" % count) p = misc.execCmd(cmd, sudo=False, sync=False) return p @@ -208,7 +211,7 @@ # Prepare for zeroing try: lvm.changelv(sdUUID, volUUIDs, (("-a", "y"), ("--deltag", imgUUID), - ("--addtag", sd.REMOVED_IMAGE_PREFIX + imgUUID))) + ("--addtag", sd.REMOVED_IMAGE_PREFIX + imgUUID))) except se.StorageException as e: log.error("Can't activate or change LV tags in SD %s. " "failing Image %s pre zeroing operation for vols: %s. %s", @@ -250,17 +253,18 @@ proc.returncode, proc.stderr.read(1000)) else: log.debug("%s/%s was zeroed and will be deleted", - sdUUID, volUUID) + sdUUID, volUUID) toDelete.append(vol) if toDelete: try: deleteVolumes(sdUUID, toDelete) except se.CannotRemoveLogicalVolume: # TODO: Add the list of removed fail volumes to the exception. - log.error("Remove failed for some of VG: %s zeroed volumes: %s", - sdUUID, toDelete, exc_info=True) + log.error("Remove failed for some of VG: %s zeroed volumes: " + "%s", sdUUID, toDelete, exc_info=True) - log.debug("finished with VG:%s LVs: %s, img: %s", sdUUID, volUUIDs, imgUUID) + log.debug("finished with VG:%s LVs: %s, img: %s", sdUUID, volUUIDs, + imgUUID) return @@ -289,15 +293,18 @@ newMetadata = set(lines) # Remove all items that do not exist in the new metadata - toRemove = [self.METADATA_TAG_PREFIX + lvmTagEncode(item) for item in currentMetadata.difference(newMetadata)] + toRemove = [self.METADATA_TAG_PREFIX + lvmTagEncode(item) for item in + currentMetadata.difference(newMetadata)] # Add all missing items that do no exist in the old metadata - toAdd = [self.METADATA_TAG_PREFIX + lvmTagEncode(item) for item in newMetadata.difference(currentMetadata)] + toAdd = [self.METADATA_TAG_PREFIX + lvmTagEncode(item) for item in + newMetadata.difference(currentMetadata)] if len(toAdd) == 0 and len(toRemove) == 0: return - self.log.debug("Updating metadata adding=%s removing=%s", ", ".join(toAdd), ", ".join(toRemove)) + self.log.debug("Updating metadata adding=%s removing=%s", + ", ".join(toAdd), ", ".join(toRemove)) lvm.changeVGTags(self._vgName, delTags=toRemove, addTags=toAdd) @@ -346,8 +353,12 @@ f.seek(self._offset) f.write(data) -LvBasedSDMetadata = lambda vg, lv: DictValidator(PersistentDict(LvMetadataRW(vg, lv, 0, SD_METADATA_SIZE)), BLOCK_SD_MD_FIELDS) -TagBasedSDMetadata = lambda vg: DictValidator(PersistentDict(VGTagMetadataRW(vg)), BLOCK_SD_MD_FIELDS) +LvBasedSDMetadata = lambda vg, lv: DictValidator( + PersistentDict(LvMetadataRW(vg, lv, 0, SD_METADATA_SIZE)), + BLOCK_SD_MD_FIELDS) +TagBasedSDMetadata = lambda vg: DictValidator( + PersistentDict(VGTagMetadataRW(vg)), + BLOCK_SD_MD_FIELDS) def selectMetadata(sdUUID): @@ -362,7 +373,8 @@ def metadataValidity(vg): """ Return the metadata validity: - mdathreshold - False if the VG's metadata exceeded its threshold, else True + mdathreshold - False if the VG's metadata exceeded its threshold, + else True mdavalid - False if the VG's metadata size too small, else True """ mdaStatus = {'mdavalid': True, 'mdathreshold': True} @@ -380,7 +392,7 @@ class BlockStorageDomain(sd.StorageDomain): mountpoint = os.path.join(sd.StorageDomain.storage_repository, - sd.DOMAIN_MNT_POINT, sd.BLOCKSD_DIR) + sd.DOMAIN_MNT_POINT, sd.BLOCKSD_DIR) def __init__(self, sdUUID): domaindir = os.path.join(self.mountpoint, sdUUID) @@ -424,12 +436,16 @@ rmanager = rm.ResourceManager.getInstance() # Register lvm activation resource namespace for the underlying VG - lvmActivationFactory = resourceFactories.LvmActivationFactory(self.sdUUID) - lvmActivationNamespace = sd.getNamespace(self.sdUUID, LVM_ACTIVATION_NAMESPACE) + lvmActivationFactory = resourceFactories.LvmActivationFactory( + self.sdUUID) + lvmActivationNamespace = sd.getNamespace(self.sdUUID, + LVM_ACTIVATION_NAMESPACE) try: - rmanager.registerNamespace(lvmActivationNamespace, lvmActivationFactory) + rmanager.registerNamespace(lvmActivationNamespace, + lvmActivationFactory) except Exception: - self.log.warn("Resource namespace %s already registered", lvmActivationNamespace) + self.log.warn("Resource namespace %s already registered", + lvmActivationNamespace) @classmethod def metaSize(cls, vgroup): @@ -439,17 +455,22 @@ # 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) + (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 = (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)) + 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): + def create(cls, sdUUID, domainName, domClass, vgUUID, storageType, + version): """ Create new storage domain 'sdUUID' - Storage Domain UUID 'domainName' - storage domain name @@ -459,8 +480,8 @@ 'version' - DOMAIN_VERSIONS """ cls.log.info("sdUUID=%s domainName=%s domClass=%s vgUUID=%s " - "storageType=%s version=%s", sdUUID, domainName, domClass, vgUUID, - storageType, version) + "storageType=%s version=%s", sdUUID, domainName, domClass, + vgUUID, storageType, version) if not misc.isAscii(domainName) and not sd.supportsUnicode(version): raise se.UnicodeArgumentException() @@ -534,21 +555,25 @@ # Do we really need to keep the VGUUID? # no one reads it from here anyway initialMetadata = { - sd.DMDK_VERSION: version, - sd.DMDK_SDUUID: sdUUID, - sd.DMDK_TYPE: storageType, - sd.DMDK_CLASS: domClass, - sd.DMDK_DESCRIPTION: domainName, - sd.DMDK_ROLE: sd.REGULAR_DOMAIN, - sd.DMDK_POOLS: [], - sd.DMDK_LOCK_POLICY: '', - sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC: sd.DEFAULT_LEASE_PARAMS[sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC], - sd.DMDK_LEASE_TIME_SEC: sd.DEFAULT_LEASE_PARAMS[sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC], - sd.DMDK_IO_OP_TIMEOUT_SEC: sd.DEFAULT_LEASE_PARAMS[sd.DMDK_IO_OP_TIMEOUT_SEC], - sd.DMDK_LEASE_RETRIES: sd.DEFAULT_LEASE_PARAMS[sd.DMDK_LEASE_RETRIES], - DMDK_VGUUID: vgUUID, - DMDK_LOGBLKSIZE: logBlkSize, - DMDK_PHYBLKSIZE: phyBlkSize, + sd.DMDK_VERSION: version, + sd.DMDK_SDUUID: sdUUID, + sd.DMDK_TYPE: storageType, + sd.DMDK_CLASS: domClass, + sd.DMDK_DESCRIPTION: domainName, + sd.DMDK_ROLE: sd.REGULAR_DOMAIN, + sd.DMDK_POOLS: [], + sd.DMDK_LOCK_POLICY: '', + sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC: sd.DEFAULT_LEASE_PARAMS[ + sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC], + sd.DMDK_LEASE_TIME_SEC: sd.DEFAULT_LEASE_PARAMS[ + sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC], + sd.DMDK_IO_OP_TIMEOUT_SEC: sd.DEFAULT_LEASE_PARAMS[ + sd.DMDK_IO_OP_TIMEOUT_SEC], + sd.DMDK_LEASE_RETRIES: sd.DEFAULT_LEASE_PARAMS[ + sd.DMDK_LEASE_RETRIES], + DMDK_VGUUID: vgUUID, + DMDK_LOGBLKSIZE: logBlkSize, + DMDK_PHYBLKSIZE: phyBlkSize, } initialMetadata.update(mapping) @@ -557,7 +582,8 @@ # Mark VG with Storage Domain Tag try: - lvm.replaceVGTag(vgName, STORAGE_UNREADY_DOMAIN_TAG, STORAGE_DOMAIN_TAG) + lvm.replaceVGTag(vgName, STORAGE_UNREADY_DOMAIN_TAG, + STORAGE_DOMAIN_TAG) except se.StorageException: raise se.VolumeGroupUninitialized(vgName) @@ -603,16 +629,18 @@ 'volFormat' - volume format RAW/QCOW2 'preallocate' - sparse/preallocate """ - blockVolume.BlockVolume.validateCreateVolumeParams(volFormat, preallocate, srcVolUUID) + blockVolume.BlockVolume.validateCreateVolumeParams( + volFormat, preallocate, srcVolUUID) - def createVolume(self, imgUUID, size, volFormat, preallocate, diskType, volUUID, desc, srcImgUUID, srcVolUUID): + def createVolume(self, imgUUID, size, volFormat, preallocate, diskType, + volUUID, desc, srcImgUUID, srcVolUUID): """ Create a new volume """ repoPath = self._getRepoPath() - return blockVolume.BlockVolume.create(repoPath, self.sdUUID, - imgUUID, size, volFormat, preallocate, diskType, - volUUID, desc, srcImgUUID, srcVolUUID) + return blockVolume.BlockVolume.create( + repoPath, self.sdUUID, imgUUID, size, volFormat, preallocate, + diskType, volUUID, desc, srcImgUUID, srcVolUUID) @classmethod def getMetaDataMapping(cls, vgName, oldMapping={}): @@ -620,7 +648,8 @@ firstExtent = int(firstExtent) if firstExtent != 0: cls.log.error("INTERNAL: metadata ext is not 0") - raise se.MetaDataMappingError("vg %s: metadata extent is not the first extent" % vgName) + raise se.MetaDataMappingError("vg %s: metadata extent is not the " + "first extent" % vgName) pvlist = lvm.listPVNames(vgName) @@ -659,7 +688,8 @@ except KeyError: prevInfo = oldMapping["PV%d" % (prevDevNum,)] - mapOffset = int(prevInfo["mapoffset"]) + int(prevInfo["pecount"]) + mapOffset = int(prevInfo["mapoffset"]) + \ + int(prevInfo["pecount"]) pvInfo["mapoffset"] = mapOffset mapping["PV%d" % devNum] = pvInfo @@ -670,7 +700,8 @@ def updateMapping(self): # First read existing mapping from metadata with self._metadata.transaction(): - mapping = self.getMetaDataMapping(self.sdUUID, self.readMetadataMapping()) + mapping = self.getMetaDataMapping(self.sdUUID, + self.readMetadataMapping()) for key in set(self._metadata.keys() + mapping.keys()): if DMDK_PV_REGEX.match(key): if key in mapping: @@ -725,14 +756,16 @@ offset = int(stripPrefix(tag, blockVolume.TAG_PREFIX_MD)) if tag.startswith(blockVolume.TAG_PREFIX_MDNUMBLKS): - size = int(stripPrefix(tag, blockVolume.TAG_PREFIX_MDNUMBLKS)) + size = int(stripPrefix(tag, + blockVolume.TAG_PREFIX_MDNUMBLKS)) if offset is not None and size != blockVolume.VOLUME_MDNUMBLKS: # I've found everything I need break if offset is None: - self.log.warn("Could not find mapping for lv %s/%s", self.sdUUID, lv.name) + self.log.warn("Could not find mapping for lv %s/%s", + self.sdUUID, lv.name) continue occupiedSlots.append((offset, size)) @@ -762,7 +795,8 @@ dev, ext = lvm.getFirstExt(self.sdUUID, vol_name) self.log.debug("vol %s dev %s ext %s" % (vol_name, dev, ext)) for pv in self.readMetadataMapping().values(): - self.log.debug("MAPOFFSET: pv %s -- dev %s ext %s" % (pv, dev, ext)) + self.log.debug("MAPOFFSET: pv %s -- dev %s ext %s" % + (pv, dev, ext)) pestart = int(pv["pestart"]) pecount = int(pv["pecount"]) if (os.path.basename(dev) == pv["guid"] and @@ -770,9 +804,12 @@ offs = int(ext) + int(pv["mapoffset"]) if offs < SD_METADATA_SIZE / sd.METASIZE: - raise se.MetaDataMappingError("domain %s: vol %s MD offset %s is bad - will overwrite SD's MD" % (self.sdUUID, vol_name, offs)) + raise se.MetaDataMappingError( + "domain %s: vol %s MD offset %s is bad - will " + "overwrite SD's MD" % (self.sdUUID, vol_name, offs)) return offs - raise se.MetaDataMappingError("domain %s: can't map PV %s ext %s" % (self.sdUUID, dev, ext)) + raise se.MetaDataMappingError("domain %s: can't map PV %s ext %s" % + (self.sdUUID, dev, ext)) def readMetadataMapping(self): meta = self.getMetadata() @@ -871,7 +908,8 @@ try: lvm.removeLVs(sdUUID, lv.name) except se.CannotRemoveLogicalVolume, e: - cls.log.warning("Remove logical volume failed %s/%s %s", sdUUID, lv.name, str(e)) + cls.log.warning("Remove logical volume failed %s/%s %s", + sdUUID, lv.name, str(e)) lvm.removeVG(sdUUID) return True @@ -918,7 +956,7 @@ # Drop non image tags and strip prefix taglen = len(blockVolume.TAG_PREFIX_IMAGE) images = [i[taglen:] for i in tags - if i.startswith(blockVolume.TAG_PREFIX_IMAGE)] + if i.startswith(blockVolume.TAG_PREFIX_IMAGE)] return images def rmDCVolLinks(self, imgPath, volsImgs): @@ -947,7 +985,7 @@ def deleteImage(self, sdUUID, imgUUID, volsImgs): toDel = tuple(vName for vName, v in volsImgs.iteritems() - if v.imgs[0] == imgUUID) + if v.imgs[0] == imgUUID) deleteVolumes(sdUUID, toDel) self.rmDCImgDir(imgUUID, volsImgs) @@ -984,8 +1022,8 @@ if self.hasVolumeLeases(): # TODO: use the sanlock specific offset when present leaseSlot = self.produceVolume(imgUUID, volUUID).getMetaOffset() - leaseOffset = ((leaseSlot + blockVolume.RESERVED_LEASES) - * self.logBlkSize * sd.LEASE_BLOCKS) + leaseOffset = ((leaseSlot + blockVolume.RESERVED_LEASES) * + self.logBlkSize * sd.LEASE_BLOCKS) return self.getLeasesFilePath(), leaseOffset return None, None @@ -1024,8 +1062,8 @@ # to the public the code that created ext2 file system instead of ext3. # In order to make up for it we are trying to add journal here, just # to be sure (and we have fixed the file system creation). - # If there is a journal already tune2fs will do nothing, indicating this - # condition only with exit code. However, we do not really care. + # If there is a journal already tune2fs will do nothing, indicating + # this condition only with exit code. However, we do not really care. cmd = [constants.EXT_TUNE2FS, "-j", masterfsdev] misc.execCmd(cmd, sudo=True) @@ -1037,7 +1075,8 @@ rc, out = ex raise se.BlockStorageDomainMasterMountError(masterfsdev, rc, out) - cmd = [constants.EXT_CHOWN, "%s:%s" % (constants.METADATA_USER, constants.METADATA_GROUP), masterDir] + cmd = [constants.EXT_CHOWN, "%s:%s" % + (constants.METADATA_USER, constants.METADATA_GROUP), masterDir] (rc, out, err) = misc.execCmd(cmd, sudo=True) if rc != 0: self.log.error("failed to chown %s", masterDir) @@ -1088,12 +1127,14 @@ try: vgName = masterDir.rsplit("/", 2)[1] - masterDev = os.path.join("/dev/mapper", vgName.replace("-", "--") + "-" + MASTERLV) + masterDev = os.path.join( + "/dev/mapper", vgName.replace("-", "--") + "-" + MASTERLV) except KeyError: # Umount succeeded after all return - cls.log.warn("master mount resource is `%s`, trying to disconnect underlying storage", masterDev) + cls.log.warn("master mount resource is `%s`, trying to disconnect " + "underlying storage", masterDev) iscsi.disconnectFromUndelyingStorage(masterDev) @classmethod @@ -1101,7 +1142,8 @@ """ Unmount the master metadata file system. Should be called only by SPM. """ - # fuser processes holding mount point and validate that the umount succeeded + # fuser processes holding mount point and validate that the umount + # succeeded cls.__handleStuckUmount(masterdir) try: masterMount = mount.getMountFromTarget(masterdir) @@ -1123,7 +1165,8 @@ return if len(pids) == 0: - cls.log.warn("Unmount failed because of errors that fuser can't solve") + cls.log.warn("Unmount failed because of errors that fuser " + "can't solve") else: for pid in pids: try: @@ -1132,12 +1175,17 @@ except OSError, e: if e.errno == errno.ESRCH: # No such process pass - elif e.errno == errno.EPERM: # Operation not permitted - cls.log.warn("Could not kill pid %d because operation was not permitted", pid) + elif e.errno == errno.EPERM: # Op. not permitted + cls.log.warn("Could not kill pid %d because " + "operation was not permitted", + pid) else: - cls.log.warn("Could not kill pid %d because an unexpected error", exc_info=True) + cls.log.warn("Could not kill pid %d because an" + " unexpected error", + exc_info=True) except: - cls.log.warn("Could not kill pid %d because an unexpected error", exc_info=True) + cls.log.warn("Could not kill pid %d because an " + "unexpected error", exc_info=True) # Try umount, take 2 try: @@ -1178,7 +1226,8 @@ def extendVolume(self, volumeUUID, size, isShuttingDown=None): self._extendlock.acquire() try: - lvm.extendLV(self.sdUUID, volumeUUID, size) # , isShuttingDown) # FIXME + # FIXME: following line. + lvm.extendLV(self.sdUUID, volumeUUID, size) # , isShuttingDown) finally: self._extendlock.release() -- To view, visit http://gerrit.ovirt.org/10213 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ed4ce2a5748a911f76da02f762e5bda9352b905 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

3 9

Change in vdsm[master]: caps nits
by smizrahi＠redhat.com 18 Dec '12

18 Dec '12

Saggi Mizrahi has uploaded a new change for review. Change subject: caps nits ...................................................................... caps nits Change-Id: I231ede3f64010a3f9d3801914bc46088600befd2 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/caps.py 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/10047/1 diff --git a/vdsm/caps.py b/vdsm/caps.py index d1297c9..987a918 100644 --- a/vdsm/caps.py +++ b/vdsm/caps.py @@ -299,8 +299,8 @@ def _getIfaceByIP(addr, fileName='/proc/net/route'): remote = struct.unpack('I', socket.inet_aton(addr))[0] for line in itertools.islice(file(fileName), 1, None): - iface, dest, gateway, flags, refcnt, use, metric, \ - mask, mtu, window, irtt = line.split() + (iface, dest, gateway, flags, refcnt, use, metric, + mask, mtu, window, irtt) = line.split() dest = int(dest, 16) mask = int(mask, 16) if remote & mask == dest & mask: @@ -311,8 +311,8 @@ def _getKeyPackages(): def kernelDict(): try: - ver, rel = file('/proc/sys/kernel/osrelease').read(). \ - strip().split('-', 1) + with open('/proc/sys/kernel/osrelease', "r") as f: + ver, rel = f.read().strip().split('-', 1) except: logging.error('kernel release not found', exc_info=True) ver, rel = '0', '0' -- To view, visit http://gerrit.ovirt.org/10047 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I231ede3f64010a3f9d3801914bc46088600befd2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

4 7

Change in vdsm[master]: Fix configNetworkTests.ConfigWriter monkeypatch.
by asegurap＠redhat.com 18 Dec '12

18 Dec '12

Antoni Segura Puimedon has uploaded a new change for review. Change subject: Fix configNetworkTests.ConfigWriter monkeypatch. ...................................................................... Fix configNetworkTests.ConfigWriter monkeypatch. ConfigWriter creates NET_CONF_PREF from netinfo's NET_CONF_PREF at import time, it being a class variable, so the current scope Monkey patch of just netinfo was not sufficient. Change-Id: I6925c59650aaa81fa925a4be3bcd72dcbebbb415 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M tests/configNetworkTests.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/61/10161/1 diff --git a/tests/configNetworkTests.py b/tests/configNetworkTests.py index 07291db..eb89df9 100644 --- a/tests/configNetworkTests.py +++ b/tests/configNetworkTests.py @@ -355,6 +355,8 @@ (netinfo, 'NET_CONF_BACK_DIR', os.path.join(self._tempdir, 'netback')), (netinfo, 'NET_CONF_DIR', self._tempdir), + (configNetwork.ConfigWriter, 'NET_CONF_PREF', + os.path.join(self._tempdir, 'ifcfg-')) ]): #after vdsm package is installed, the 'vdsm' account will be #created if no 'vdsm' account, we should skip this test -- To view, visit http://gerrit.ovirt.org/10161 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6925c59650aaa81fa925a4be3bcd72dcbebbb415 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

3 16

Change in vdsm[master]: Fix miscTests:ExecCmd.testNice failing due to race
by smizrahi＠redhat.com 18 Dec '12

18 Dec '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Fix miscTests:ExecCmd.testNice failing due to race ...................................................................... Fix miscTests:ExecCmd.testNice failing due to race Change-Id: I9df2a3b437fe1eb380beebf10ef049f2d49104a6 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M tests/miscTests.py 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/10207/1 diff --git a/tests/miscTests.py b/tests/miscTests.py index f54907f..cfa2f90 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -1037,8 +1037,12 @@ def testNice(self): cmd = ["sleep", "10"] proc = misc.execCmd(cmd, sudo=False, nice=10, sync=False) - nice = misc.pidStat(proc.pid)[18] - self.assertEquals(nice, 10) + + def test(): + nice = misc.pidStat(proc.pid)[18] + self.assertEquals(nice, 10) + + utils.retry(AssertionError, test, tries=10, sleep=0.1) proc.kill() proc.wait() -- To view, visit http://gerrit.ovirt.org/10207 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9df2a3b437fe1eb380beebf10ef049f2d49104a6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

4 7

Change in vdsm[master]: Check if log file exist on startup
by ybronhei＠redhat.com 18 Dec '12

18 Dec '12

Yaniv Bronhaim has uploaded a new change for review. Change subject: Check if log file exist on startup ...................................................................... Check if log file exist on startup If file isn't exist we need to continue. Otherwise, os.access returns false and we report permission error. Change-Id: I300adc5ac3d9b12fee49023a54e5ffb4dee98da1 Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M vdsm/vdsm 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/10194/1 diff --git a/vdsm/vdsm b/vdsm/vdsm index ec291b7..fa149a4 100755 --- a/vdsm/vdsm +++ b/vdsm/vdsm @@ -114,6 +114,9 @@ def __assertLogPermission(): logfile = constants.P_VDSM_LOG + "/vdsm.log" + if not os.path.exists(logfile): + return + if not os.access(logfile, os.W_OK): syslog.syslog("error in accessing vdsm log file") sys.exit(1) -- To view, visit http://gerrit.ovirt.org/10194 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I300adc5ac3d9b12fee49023a54e5ffb4dee98da1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

6 13

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

18 Dec '12

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

4 7

Change in vdsm[master]: spec: require policycoreutils and skip sebool errors
by Federico Simoncelli 18 Dec '12

18 Dec '12

Federico Simoncelli has uploaded a new change for review. Change subject: spec: require policycoreutils and skip sebool errors ...................................................................... spec: require policycoreutils and skip sebool errors In order to avoid a policycoreutils bug (rhbz 883355) when selinux is disabled we now require the version 2.1.13-44 (or newer) of Fedora. Additionally we now skip any error in the rpm scriptlets for the sebool configuration (sebool-config) since they could interfere with the rpm installation potentially leaving multiple packages installed. Change-Id: Iefd5f53c9118eeea6817ce9660ea18abcfd1955c Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm.spec.in 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/9840/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 9830afe..34b8eb8 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -123,6 +123,7 @@ Requires: sanlock >= 2.4-2, sanlock-python Requires: sed >= 4.2.1-10 Requires: selinux-policy-targeted >= 3.10.0-149 +Requires: policycoreutils >= 2.1.13-44 Requires: lvm2 >= 2.02.95 %endif @@ -475,7 +476,7 @@ /usr/sbin/usermod -a -G %{qemu_group},%{vdsm_group} %{snlk_user} %post -%{_bindir}/vdsm-tool sebool-config +%{_bindir}/vdsm-tool sebool-config || : # set the vdsm "secret" password for libvirt %{_bindir}/vdsm-tool set-saslpasswd @@ -517,7 +518,7 @@ /bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \ /etc/sysctl.conf - %{_bindir}/vdsm-tool sebool-unconfig + %{_bindir}/vdsm-tool sebool-unconfig || : /usr/sbin/saslpasswd2 -p -a libvirt -d vdsm@ovirt -- To view, visit http://gerrit.ovirt.org/9840 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iefd5f53c9118eeea6817ce9660ea18abcfd1955c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

4 12

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

18 Dec '12

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

6 35

Change in vdsm[master]: caps.py: osversion() validate OVIRT
by Douglas Schilling Landgraf 17 Dec '12

17 Dec '12

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: caps.py: osversion() validate OVIRT ...................................................................... caps.py: osversion() validate OVIRT Currently we are only validating RHEV-H node. This patch will validate oVirt node as well in osversion(). Change-Id: I58efd4660f94b2f68ead470a54f0f301a1b9b4ba Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=873917 Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M vdsm/caps.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/10070/1 diff --git a/vdsm/caps.py b/vdsm/caps.py index d1297c9..2e35d75 100644 --- a/vdsm/caps.py +++ b/vdsm/caps.py @@ -226,7 +226,7 @@ osname = getos() try: - if osname == OSName.RHEVH: + if osname == OSName.RHEVH or osname == OSName.OVIRT: d = _parseKeyVal(file('/etc/default/version')) version = d.get('VERSION', '') release = d.get('RELEASE', '') -- To view, visit http://gerrit.ovirt.org/10070 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58efd4660f94b2f68ead470a54f0f301a1b9b4ba Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

4 8

← Newer
1
...
29
30
31
32
33
34
35
...
41
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches December 2012