Dan Kenigsberg has uploaded a new change for review.

Change subject: pep8: have a space after all operators, not before colon ......................................................................

pep8: have a space after all operators, not before colon

Change-Id: I24a0b990395242dff75ed72b42dce944060e0b26 Signed-off-by: Dan Kenigsberg danken@redhat.com --- M vds_bootstrap/vds_bootstrap.py M vds_bootstrap/vds_bootstrap_complete.py M vdsm/dumpStorageTable.py.in M vdsm/sos/vdsm.py.in M vdsm/storage/blockSD.py M vdsm/storage/image.py M vdsm/storage/iscsi.py M vdsm/storage/resourceManager.py M vdsm/storage/sp.py M vdsm/storage/storage_mailbox.py M vdsm/storage/threadPool.py M vdsm_reg/deployUtil.py.in M vdsm_reg/engine.py.in 13 files changed, 131 insertions(+), 131 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/9436/1

diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py index 867d6f4..502fb2f 100755 --- a/vds_bootstrap/vds_bootstrap.py +++ b/vds_bootstrap/vds_bootstrap.py @@ -149,7 +149,7 @@ MINIMAL_SUPPORTED_PLATFORM = "5.5"

# Required packages -REQ_PACK = ('SDL.x86_64','bridge-utils.x86_64','mesa-libGLU.x86_64', +REQ_PACK = ('SDL.x86_64', 'bridge-utils.x86_64', 'mesa-libGLU.x86_64', 'openssl.x86_64', 'rsync.x86_64')

if rhel6based: @@ -163,9 +163,9 @@ 'glusterfs-geo-replication') else: # Devel packages - DEVEL_PACK = ('gdb','tcpdump','strace','ltrace','sysstat','ntp', - 'pstack','vim-common','vim-enhanced', - 'systemtap','systemtap-runtime') + DEVEL_PACK = ('gdb', 'tcpdump', 'strace', 'ltrace', 'sysstat', 'ntp', + 'pstack', 'vim-common', 'vim-enhanced', + 'systemtap', 'systemtap-runtime') # VDS packages VDS_PACK = ('kvm', 'kmod-kvm', 'kvm-tools', VDSM_NAME, VDSM_NAME+'-cli', 'qcairo', 'qffmpeg-libs', 'qspice-libs', 'qpixman', 'log4cpp', @@ -494,7 +494,7 @@ self.req_pack.append(pack)

for p in self.req_pack: - logging.debug('>>> %s should be installed',p) + logging.debug('>>> %s should be installed', p) logging.debug('Check VDS packages ...') for pack in VDS_PACK: self.res, self.message = deployUtil.getPackageInfo("VDS", pack, 'status') @@ -503,7 +503,7 @@ self.vds_pack.append(pack)

for p in self.vds_pack: - logging.debug('>>> %s should be installed',p) + logging.debug('>>> %s should be installed', p) logging.debug('Check development packages ...') for pack in DEVEL_PACK: self.res, self.message = deployUtil.getPackageInfo("DEVEL", pack, 'status') @@ -512,11 +512,11 @@ self.devel_pack.append(pack)

for p in self.devel_pack: - logging.debug('>>> %s should be installed',p) + logging.debug('>>> %s should be installed', p)

def _installPackage(self, pack, type, update=0): nReturn = 0 - logging.debug('Installing %s %d',pack, update ) + logging.debug('Installing %s %d', pack, update ) if type == "REQ" or type == "DEVEL": self.res, self.message = deployUtil.installAndVerify(type, pack, "install") res = "OK" @@ -578,7 +578,7 @@ # install/update packages while self.req_pack: logging.debug('Install required packages ...') - self.rc = self._installPackage(self.req_pack.pop(),"REQ") + self.rc = self._installPackage(self.req_pack.pop(), "REQ") if self.rc: return

@@ -587,17 +587,17 @@ logging.debug('Update VDS packages ... %s', self.vds_pack.__repr__()) for pack in VDS_PACK: if pack not in self.vds_pack: - self.rc = self._installPackage(pack,"VDS", 1) + self.rc = self._installPackage(pack, "VDS", 1) if self.rc: return while self.vds_pack: - self.rc = self._installPackage(self.vds_pack.pop(),"VDS") + self.rc = self._installPackage(self.vds_pack.pop(), "VDS") if self.rc: return

while self.devel_pack: logging.debug('Install development packages ...') - self._installPackage(self.devel_pack.pop(),"DEVEL") + self._installPackage(self.devel_pack.pop(), "DEVEL")

def packagesExplorer(self): """ @@ -1064,7 +1064,7 @@ installGlusterService = False bridgeName = None opts, args = getopt.getopt(sys.argv[1:], "v:r:O:t:f:S:n:u:B:Vg") - for o,v in opts: + for o, v in opts: if o == "-v": deployUtil.setBootstrapInterfaceVersion(int(v)) if o == "-r": diff --git a/vds_bootstrap/vds_bootstrap_complete.py b/vds_bootstrap/vds_bootstrap_complete.py index 7711d82..eadf74c 100755 --- a/vds_bootstrap/vds_bootstrap_complete.py +++ b/vds_bootstrap/vds_bootstrap_complete.py @@ -72,7 +72,7 @@ installVirtualizationService = True installGlusterService = False opts, args = getopt.getopt(sys.argv[1:], "v:c:Vg") - for o,v in opts: + for o, v in opts: if o == "-v": deployUtil.setBootstrapInterfaceVersion(int(v)) if o == "-c": diff --git a/vdsm/dumpStorageTable.py.in b/vdsm/dumpStorageTable.py.in index ea42ab0..d173e6e 100644 --- a/vdsm/dumpStorageTable.py.in +++ b/vdsm/dumpStorageTable.py.in @@ -48,17 +48,17 @@ if len(cont) < 2: continue

- self.vmList[vmUUID] = {'Name':vmName, 'Refs': []} + self.vmList[vmUUID] = {'Name': vmName, 'Refs': []} for x in range(1, len(cont)): image = cont[x].split(' ')[0].split('/')[0] if not image in images: - sd = self.serverConncetion.getImageDomainsList(pool,image)['domainslist'] + sd = self.serverConncetion.getImageDomainsList(pool, image)['domainslist'] if len(sd) > 0: sd = sd[0] images.append(image) self._setSdInfo(sd) - disks.append([sd,image]) - self.vmList[vmUUID]['Refs'].append([sd,image]) + disks.append([sd, image]) + self.vmList[vmUUID]['Refs'].append([sd, image])

self._getImages(disks)

@@ -66,7 +66,7 @@

if not sd in self.domainsList.keys(): sd_info = self.serverConncetion.getStorageDomainInfo(sd)['info'] - self.domainsList[sd] = {'Name':sd_info['name'], 'Role':sd_info['role'], 'Refs':[]} + self.domainsList[sd] = {'Name': sd_info['name'], 'Role': sd_info['role'], 'Refs': []}

def _getSds(self, pool):

@@ -109,7 +109,7 @@ for vol in volumes['uuidlist']: res = self.serverConncetion.getVolumeInfo(sd, pool, image, vol) volParents[vol] = res['info']['parent'] - imageDomVol = '%s:%s:%s' % (sd, image,vol) + imageDomVol = '%s:%s:%s' % (sd, image, vol) self.volumesList[imageDomVol] = []

if res['info']['voltype'] == 'LEAF': @@ -119,7 +119,7 @@ leafvol = vol self.volumesList[imageDomVol].append('Template')

- self.imagesList[imageDom] = self._buildVolumesChain(leafvol,vollen,volParents, sd, image) + self.imagesList[imageDom] = self._buildVolumesChain(leafvol, vollen, volParents, sd, image)

def _buildVolumesChain(self, leafvol, vollen, volParents, sd, image):

@@ -127,7 +127,7 @@

volChain[(vollen-1)]=leafvol next = leafvol - for k in range(1,(vollen+1)): + for k in range(1, (vollen+1)): prev = next next = volParents[prev] if next in volParents.keys(): @@ -138,7 +138,7 @@ else: app = '%s' % (next)

- imageDomVol = '%s:%s:%s' % (sd, image,prev) + imageDomVol = '%s:%s:%s' % (sd, image, prev) templList = self.volumesList[imageDomVol] if len(templList) == 0: templList.append(app) diff --git a/vdsm/sos/vdsm.py.in b/vdsm/sos/vdsm.py.in index 031e2a3..5f09f8d 100644 --- a/vdsm/sos/vdsm.py.in +++ b/vdsm/sos/vdsm.py.in @@ -45,7 +45,7 @@

optionList = [("logsize", 'max size (MiB) to collect per log file', '', False)]

- def __addCopySpecLogLimit(self,path, logsize=None): + def __addCopySpecLogLimit(self, path, logsize=None): """ Glob the files in path and ensure that the sorted cumulative list of globbed files isn't larger than logsize in MiB if diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index ce45da7..bb98b60 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -108,10 +108,10 @@ # TBD: Do we really need this key? BLOCK_SD_MD_FIELDS.update({ # 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_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), })

INVALID_CHARS = re.compile(r"[^a-zA-Z0-9_+.-/=!:#]") @@ -341,8 +341,8 @@ 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): mdProvider = LvBasedSDMetadata(sdUUID, sd.METADATA) @@ -358,7 +358,7 @@ 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} + mdaStatus = {'mdavalid': True, 'mdathreshold': True} mda_size = int(vg.vg_mda_size) mda_free = int(vg.vg_mda_free)

@@ -477,7 +477,7 @@

numOfPVs = len(lvm.listPVNames(vgName)) if version in VERS_METADATA_LV and numOfPVs > MAX_PVS: - cls.log.debug("%d > %d" , numOfPVs, MAX_PVS) + cls.log.debug("%d > %d", numOfPVs, MAX_PVS) raise se.StorageDomainIsMadeFromTooManyPVs()

# Create metadata service volume @@ -528,21 +528,21 @@ # 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) @@ -711,7 +711,7 @@ return self.getFreeMetadataSlot(slotSize)

def _getOccupiedMetadataSlots(self): - stripPrefix = lambda s, pfx : s[len(pfx):] + stripPrefix = lambda s, pfx: s[len(pfx):] occupiedSlots = [] for lv in lvm.getLV(self.sdUUID): if lv.name in SPECIAL_LVS: diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py index 0265dcc..a098489 100644 --- a/vdsm/storage/image.py +++ b/vdsm/storage/image.py @@ -48,9 +48,9 @@ SWAP_DISK_TYPE = 4 TEMP_DISK_TYPE = 5

-DISK_TYPES = {UNKNOWN_DISK_TYPE:'UNKNOWN', SYSTEM_DISK_TYPE:'SYSTEM', - DATA_DISK_TYPE:'DATA', SHARED_DISK_TYPE:'SHARED', - SWAP_DISK_TYPE:'SWAP', TEMP_DISK_TYPE:'TEMP'} +DISK_TYPES = {UNKNOWN_DISK_TYPE: 'UNKNOWN', SYSTEM_DISK_TYPE: 'SYSTEM', + DATA_DISK_TYPE: 'DATA', SHARED_DISK_TYPE: 'SHARED', + SWAP_DISK_TYPE: 'SWAP', TEMP_DISK_TYPE: 'TEMP'}

# What volumes to synchronize SYNC_VOLUMES_ALL = 'ALL' @@ -61,7 +61,7 @@ UNKNOWN_OP = 0 COPY_OP = 1 MOVE_OP = 2 -OP_TYPES = {UNKNOWN_OP:'UNKNOWN', COPY_OP:'COPY', MOVE_OP:'MOVE'} +OP_TYPES = {UNKNOWN_OP: 'UNKNOWN', COPY_OP: 'COPY', MOVE_OP: 'MOVE'}

RENAME_RANDOM_STRING_LEN = 8

@@ -562,7 +562,7 @@ # only base may have a different parent image pimg = imgUUID

- return {'srcChain':srcChain, 'dstChain':dstChain} + return {'srcChain': srcChain, 'dstChain': dstChain}

def _interImagesCopy(self, destDom, srcSdUUID, imgUUID, chains): srcLeafVol = chains['srcChain'][-1] diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py index a0c3067..aaf1237 100644 --- a/vdsm/storage/iscsi.py +++ b/vdsm/storage/iscsi.py @@ -429,7 +429,7 @@

def getDefaultInitiatorName(): with open("/etc/iscsi/initiatorname.iscsi", "r") as f: - return f.read().strip().split("=",1)[1] + return f.read().strip().split("=", 1)[1]

def findUnderlyingStorage(devPath): diff --git a/vdsm/storage/resourceManager.py b/vdsm/storage/resourceManager.py index ef544eb..b343566 100644 --- a/vdsm/storage/resourceManager.py +++ b/vdsm/storage/resourceManager.py @@ -150,11 +150,11 @@ Internal request object, don't use directly """ _log = logging.getLogger("ResourceManager.Request") - namespace = property(lambda self : self._namespace) - name = property(lambda self : self._name) - fullName = property(lambda self : "%s.%s" % (self._namespace, self._name)) - lockType = property(lambda self : self._lockType) - syncRoot = property(lambda self : self._syncRoot) + namespace = property(lambda self: self._namespace) + name = property(lambda self: self._name) + fullName = property(lambda self: "%s.%s" % (self._namespace, self._name)) + lockType = property(lambda self: self._lockType) + syncRoot = property(lambda self: self._syncRoot)

def __init__(self, namespace, name, lockType, callback): self._syncRoot = threading.RLock() @@ -166,7 +166,7 @@ self._doneEvent = threading.Event() self._callback = callback self.reqID = str(uuid4()) - self._log = SimpleLogAdapter(self._log, {"ResName" : self.fullName, "ReqID" : self.reqID}) + self._log = SimpleLogAdapter(self._log, {"ResName": self.fullName, "ReqID": self.reqID})

# Because findCaller is expensive. We make sure it wll be printed before # calculating it @@ -237,17 +237,17 @@ This object will auto release the referenced resource unless autorelease is set to `False` """ _log = logging.getLogger("ResourceManager.ResourceRef") - namespace = property(lambda self : self._namespace) - name = property(lambda self : self._name) - fullName = property(lambda self : "%s.%s" % (self._namespace, self._name)) + namespace = property(lambda self: self._namespace) + name = property(lambda self: self._name) + fullName = property(lambda self: "%s.%s" % (self._namespace, self._name))

# States whether this reference is pointing to an owned reference - isValid = property(lambda self : self._isValid) + isValid = property(lambda self: self._isValid)

def __init__(self, namespace, name, wrappedObject=None, resRefID=str(uuid4())): self._namespace = namespace self._name = name - self._log = SimpleLogAdapter(self._log, {"ResName" : self.fullName, "ResRefID" : resRefID}) + self._log = SimpleLogAdapter(self._log, {"ResName": self.fullName, "ResRefID": resRefID})

self.__wrappedObject = wrappedObject if wrappedObject is not None: @@ -259,7 +259,7 @@

def __wrapObj(self): for attr in dir(self.__wrappedObject): - if hasattr(self,attr) or attr in ('close', 'switchLockType'): + if hasattr(self, attr) or attr in ('close', 'switchLockType'): continue

setattr(self, attr, partial(self.__methodProxy, attr)) diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index ac5e1db..72443c6 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -86,11 +86,11 @@

SP_MD_FIELDS = { # Key dec, enc - PMDK_DOMAINS : (domainListDecoder, domainListEncoder), - PMDK_POOL_DESCRIPTION : (unicodeDecoder, unicodeEncoder), - PMDK_LVER : (int, str), - PMDK_SPM_ID : (int, str), - PMDK_MASTER_VER : (int, str) + PMDK_DOMAINS: (domainListDecoder, domainListEncoder), + PMDK_POOL_DESCRIPTION: (unicodeDecoder, unicodeEncoder), + PMDK_LVER: (int, str), + PMDK_SPM_ID: (int, str), + PMDK_MASTER_VER: (int, str) }

# Calculate how many domains can be in the pool before overflowing the Metadata @@ -1368,24 +1368,24 @@ disktotal, diskfree = st.diskUtilization vgmdtotal, vgmdfree = st.vgMdUtilization res[sdUUID] = { - 'finish' : st.lastCheck, - 'result' : { - 'code' : code, - 'lastCheck' : '%.1f' % (now - st.lastCheck), - 'delay' : str(st.readDelay), - 'valid' : (st.error is None) + 'finish': st.lastCheck, + 'result': { + 'code': code, + 'lastCheck': '%.1f' % (now - st.lastCheck), + 'delay': str(st.readDelay), + 'valid': (st.error is None) }, - 'disktotal' : disktotal, - 'diskfree' : diskfree, + 'disktotal': disktotal, + 'diskfree': diskfree,

- 'mdavalid' : st.vgMdHasEnoughFreeSpace, - 'mdathreshold' : st.vgMdFreeBelowThreashold, - 'mdasize' : vgmdtotal, - 'mdafree' : vgmdfree, + 'mdavalid': st.vgMdHasEnoughFreeSpace, + 'mdathreshold': st.vgMdFreeBelowThreashold, + 'mdasize': vgmdtotal, + 'mdafree': vgmdfree,

- 'masterValidate' : { - 'mount' : st.masterMounted, - 'valid' : st.masterValid + 'masterValidate': { + 'mount': st.masterMounted, + 'valid': st.masterValid } } return res @@ -1449,14 +1449,14 @@ stats['disktotal'] = repoStats[item]['disktotal'] stats['diskfree'] = repoStats[item]['diskfree'] if not repoStats[item]['mdavalid']: - alerts.append({'code':se.SmallVgMetadata.code, - 'message':se.SmallVgMetadata.message}) + alerts.append({'code': se.SmallVgMetadata.code, + 'message': se.SmallVgMetadata.message}) self.log.warning("VG %s's metadata size too small %s", dom.sdUUID, repoStats[item]['mdasize'])

if not repoStats[item]['mdathreshold']: - alerts.append({'code':se.VgMetadataCriticallyFull.code, - 'message':se.VgMetadataCriticallyFull.message}) + alerts.append({'code': se.VgMetadataCriticallyFull.code, + 'message': se.VgMetadataCriticallyFull.message}) self.log.warning("VG %s's metadata size exceeded critical size: \ mdasize=%s mdafree=%s", dom.sdUUID, repoStats[item]['mdasize'], repoStats[item]['mdafree']) @@ -1479,7 +1479,7 @@ for item in domDict: try: dom = sdCache.produce(item) - except se.StorageDomainDoesNotExist : + except se.StorageDomainDoesNotExist: self.log.warn("Storage domain %s does not exist", item) continue

diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py index f678a04..c74fccc 100644 --- a/vdsm/storage/storage_mailbox.py +++ b/vdsm/storage/storage_mailbox.py @@ -57,7 +57,7 @@ MESSAGES_PER_MAILBOX = SLOTS_PER_MAILBOX - 1 # Last message slot is reserved for metadata (checksum, extendable mailbox, etc)

_zeroCheck = misc.checksum(EMPTYMAILBOX, CHECKSUM_BYTES) -pZeroChecksum = struct.pack('<l',_zeroCheck) # Assumes CHECKSUM_BYTES equals 4!!! +pZeroChecksum = struct.pack('<l', _zeroCheck) # Assumes CHECKSUM_BYTES equals 4!!!

def dec2hex(n): return "%x" % n @@ -102,9 +102,9 @@ domain = misc.packUuid(volumeData['domainID']) volume = misc.packUuid(volumeData['volumeID']) # Build base payload - payload = MESSAGE_VERSION + EXTEND_CODE + domain + volume + self.newSize.rjust(SIZE_CHARS,"0") + payload = MESSAGE_VERSION + EXTEND_CODE + domain + volume + self.newSize.rjust(SIZE_CHARS, "0") # Pad payload with zeros - self.payload = payload.ljust(MESSAGE_SIZE,"0") + self.payload = payload.ljust(MESSAGE_SIZE, "0")

self.log.debug('new extend msg created: domain: %s, volume: %s', volumeData['domainID'], volumeData['volumeID'])

@@ -135,8 +135,8 @@

volume = {} volume['poolID'] = pool.spUUID - volume['domainID'] = misc.unpackUuid(payload[sdOffset : sdOffset+PACKED_UUID_SIZE]) - volume['volumeID'] = misc.unpackUuid(payload[volumeOffset : volumeOffset+PACKED_UUID_SIZE]) + volume['domainID'] = misc.unpackUuid(payload[sdOffset: sdOffset+PACKED_UUID_SIZE]) + volume['volumeID'] = misc.unpackUuid(payload[volumeOffset: volumeOffset+PACKED_UUID_SIZE]) size = int(payload[sizeOffset:sizeOffset + SIZE_CHARS], 16)

cls.log.info("processRequest: extending volume %s " @@ -289,18 +289,18 @@ # rc = True

- newMsg = newMsgs[start : start + MESSAGE_SIZE] + newMsg = newMsgs[start: start + MESSAGE_SIZE]

if newMsg == CLEAN_MESSAGE: del self._activeMessages[i] self._used_slots_array[i] = 0 self._msgCounter -= 1 - self._outgoingMail = self._outgoingMail[0 : start] + MESSAGE_SIZE * "\0" + self._outgoingMail[start + MESSAGE_SIZE : ] + self._outgoingMail = self._outgoingMail[0: start] + MESSAGE_SIZE * "\0" + self._outgoingMail[start + MESSAGE_SIZE: ] continue

msg = self._activeMessages[i] self._activeMessages[i] = CLEAN_MESSAGE - self._outgoingMail = self._outgoingMail[0 : start] + CLEAN_MESSAGE + self._outgoingMail[start + MESSAGE_SIZE : ] + self._outgoingMail = self._outgoingMail[0: start] + CLEAN_MESSAGE + self._outgoingMail[start + MESSAGE_SIZE: ]

try: self.log.debug("HSM_MailboxMonitor(%s/%s) - Checking reply: %s", self._msgCounter, MESSAGES_PER_MAILBOX, repr(newMsg)) @@ -338,9 +338,9 @@

def _sendMail(self): self.log.info("HSM_MailMonitor sending mail to SPM - " + str(self._outCmd)) - chk = misc.checksum(self._outgoingMail[0 : MAILBOX_SIZE-CHECKSUM_BYTES], CHECKSUM_BYTES) - pChk = struct.pack('<l',chk) # Assumes CHECKSUM_BYTES equals 4!!! - self._outgoingMail = self._outgoingMail[0 : MAILBOX_SIZE-CHECKSUM_BYTES] + pChk + chk = misc.checksum(self._outgoingMail[0: MAILBOX_SIZE-CHECKSUM_BYTES], CHECKSUM_BYTES) + pChk = struct.pack('<l', chk) # Assumes CHECKSUM_BYTES equals 4!!! + self._outgoingMail = self._outgoingMail[0: MAILBOX_SIZE-CHECKSUM_BYTES] + pChk misc.execCmd(self._outCmd, data=self._outgoingMail, sudo=False)

@@ -393,7 +393,7 @@ try: #self.log.debug("No requests in queue, going to sleep until new requests arrive") # Check if a new message is waiting to be sent - message = self._queue.get(block=True,timeout=self._monitorInterval) + message = self._queue.get(block=True, timeout=self._monitorInterval) self._handleMessage(message) message = None sendMail = True @@ -542,9 +542,9 @@

def _validateMailbox(self, mailbox, mailboxIndex): chkStart = MAILBOX_SIZE-CHECKSUM_BYTES - chk = misc.checksum(mailbox[0 : chkStart], CHECKSUM_BYTES) - pChk = struct.pack('<l',chk) # Assumes CHECKSUM_BYTES equals 4!!! - if pChk != mailbox[chkStart : chkStart+CHECKSUM_BYTES]: + chk = misc.checksum(mailbox[0: chkStart], CHECKSUM_BYTES) + pChk = struct.pack('<l', chk) # Assumes CHECKSUM_BYTES equals 4!!! + if pChk != mailbox[chkStart: chkStart+CHECKSUM_BYTES]: self.log.error("SPM_MailMonitor: mailbox %s checksum failed, not clearing mailbox, clearing newMail.", str(mailboxIndex)) return False elif pChk == pZeroChecksum: return False # Ignore messages of empty mailbox @@ -573,7 +573,7 @@ # Most mailboxes are probably empty so it costs less to check that all messages start with 0 than # to validate the mailbox, therefor this is done after we find a non empty message in mailbox if not isMailboxValidated: - if not self._validateMailbox(newMail[mailboxStart : mailboxStart + MAILBOX_SIZE], host): + if not self._validateMailbox(newMail[mailboxStart: mailboxStart + MAILBOX_SIZE], host): #Cleaning invalid mbx in newMail newMail = newMail[:mailboxStart] + EMPTYMAILBOX + newMail[mailboxStart + MAILBOX_SIZE:] break @@ -581,13 +581,13 @@ isMailboxValidated = True

- newMsg = newMail[msgStart : msgStart+MESSAGE_SIZE] + newMsg = newMail[msgStart: msgStart+MESSAGE_SIZE] msgOffset = msgId * MESSAGE_SIZE if newMsg == CLEAN_MESSAGE: # Should probably put a setter on outgoingMail which would take the lock self._outLock.acquire() try: - self._outgoingMail = self._outgoingMail[0:msgOffset] + CLEAN_MESSAGE + self._outgoingMail[msgOffset+MESSAGE_SIZE : self._outMailLen] + self._outgoingMail = self._outgoingMail[0:msgOffset] + CLEAN_MESSAGE + self._outgoingMail[msgOffset+MESSAGE_SIZE: self._outMailLen] finally: self._outLock.release() send = True @@ -605,14 +605,14 @@

# We only get here if there is a novel request try: - msgType = newMail[msgStart+1 : msgStart+5] + msgType = newMail[msgStart+1: msgStart+5] if msgType in self._messageTypes: # Use message class to process request according to message specific logic id = str(uuid.uuid4()) - self.log.debug("SPM_MailMonitor: processing request: %s" % repr(newMail[msgStart : msgStart+MESSAGE_SIZE])) + self.log.debug("SPM_MailMonitor: processing request: %s" % repr(newMail[msgStart: msgStart+MESSAGE_SIZE])) res = self.tp.queueTask(id, runTask, (self._messageTypes[msgType], msgId, - newMail[msgStart : msgStart+MESSAGE_SIZE]) + newMail[msgStart: msgStart+MESSAGE_SIZE]) ) if not res: raise Exception() @@ -663,9 +663,9 @@ self._outLock.acquire() try: msgOffset = msgID*MESSAGE_SIZE - self._outgoingMail = self._outgoingMail[0:msgOffset] + msg.payload + self._outgoingMail[msgOffset+MESSAGE_SIZE : self._outMailLen] + self._outgoingMail = self._outgoingMail[0:msgOffset] + msg.payload + self._outgoingMail[msgOffset+MESSAGE_SIZE: self._outMailLen] mailboxOffset = (msgID / SLOTS_PER_MAILBOX) * MAILBOX_SIZE - mailbox = self._outgoingMail[mailboxOffset : mailboxOffset + MAILBOX_SIZE] + mailbox = self._outgoingMail[mailboxOffset: mailboxOffset + MAILBOX_SIZE] cmd = self._outCmd + ['bs=' + str(MAILBOX_SIZE), 'seek=' + str(mailboxOffset / MAILBOX_SIZE)] #self.log.debug("Running command: %s, for message id: %s", str(cmd), str(msgID)) (rc, out, err) = misc.execCmd(cmd, sudo=False, data=mailbox) diff --git a/vdsm/storage/threadPool.py b/vdsm/storage/threadPool.py index 22633b7..7edaeb2 100644 --- a/vdsm/storage/threadPool.py +++ b/vdsm/storage/threadPool.py @@ -252,13 +252,13 @@ pool = ThreadPool(100)

# Insert tasks into the queue and let them run - print "Running tasks: ", pool.getRunningTasks(),"\n" + print "Running tasks: ", pool.getRunningTasks(), "\n" pool.queueTask(sortTask, (1000, 100000), taskCallback) - print "Running tasks: ", pool.getRunningTasks(),"\n" + print "Running tasks: ", pool.getRunningTasks(), "\n" pool.queueTask(waitTask, 5, taskCallback) pool.queueTask(sortTask, (200, 200000), taskCallback) pool.queueTask(waitTask, 2, taskCallback) - print "Running tasks: ", pool.getRunningTasks(),"\n" + print "Running tasks: ", pool.getRunningTasks(), "\n" pool.queueTask(sortTask, (3, 30000), taskCallback) pool.queueTask(waitTask, 7, taskCallback)

diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in index 0fe1275..6613ad3 100644 --- a/vdsm_reg/deployUtil.py.in +++ b/vdsm_reg/deployUtil.py.in @@ -90,8 +90,8 @@ CORE_DUMP_PATH = '/var/lib/vdsm/core' CORE_PATTERN = '/proc/sys/kernel/core_pattern' XML_QUOTES = { - "\n":' ', - "'":'~' + "\n": ' ', + "'": '~' }

# Regular expression used to validate content of SSH public keys: @@ -136,7 +136,7 @@ if input is not None: logging.debug(input) stdin = subprocess.PIPE - p = subprocess.Popen(argv , stdin=stdin, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p = subprocess.Popen(argv, stdin=stdin, stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, err = p.communicate(input) rc = p.returncode logging.debug(out) @@ -340,7 +340,7 @@ elif arch == "ppc64": if os.path.exists('/proc/device-tree/system-id'): #eg. output IBM,03061C14A - return file('/proc/device-tree/system-id').readline().replace(",","") + return file('/proc/device-tree/system-id').readline().replace(",", "")

logging.error("getMachineUUID: Could not find machine's UUID.")

@@ -810,12 +810,12 @@

#Create temp file fh, abs_path = mkstemp() - new_file = open(abs_path,'w') + new_file = open(abs_path, 'w') old_file = open(fileName) #Iterate over the existing file, while replacing if needed. for line in old_file: #Note: the line below must not have spaces before or after the '=', since it'll fail bash scripts ! - newLine = re.sub('^[#\s]*%s\s*=.*' % key , '%s=%s' % (key, value), line) + newLine = re.sub('^[#\s]*%s\s*=.*' % key, '%s=%s' % (key, value), line) if re.match('^%s=%s$' % (re.escape(key), re.escape(value)), newLine): logging.debug("_updateFileLine: replacing " + str(line) + " with: " + newLine) fReplaced = True @@ -1023,7 +1023,7 @@ if fReturn: try: lstBridgeOptions.append('blockingdhcp=true') - out, err, ret = _logExec([os.path.join(vdsmDir, SCRIPT_NAME_ADD) , bridgeName, vlan, bonding, nic] + lstBridgeOptions) + out, err, ret = _logExec([os.path.join(vdsmDir, SCRIPT_NAME_ADD), bridgeName, vlan, bonding, nic] + lstBridgeOptions) if ret: raise Exception('Failed to add bridge') except: diff --git a/vdsm_reg/engine.py.in b/vdsm_reg/engine.py.in index f29d129..d03d978 100644 --- a/vdsm_reg/engine.py.in +++ b/vdsm_reg/engine.py.in @@ -133,7 +133,7 @@ config = {} config["vdc_host_port"] = VDC_HOST_PORT for line in vdsm_config: - line = line.strip().replace(" ","").split("=") + line = line.strip().replace(" ", "").split("=") if "vdc_host_name" in line: item, config["vdc_host_name"] = line[0], line[1] if "vdc_host_port" in line: @@ -161,7 +161,7 @@ self.ncs.screen.setColor(customColorset(1), "black", "magenta") heading.setColors(customColorset(1)) elements.setField(heading, 0, 0, anchorLeft = 1) - engine_grid = Grid(2,2) + engine_grid = Grid(2, 2) engine_grid.setField(Label("Management Server:"), 0, 0, anchorLeft = 1) self.engine_server = Entry(25, "") self.engine_server.setCallback(self.validEngineServerCallback) @@ -170,14 +170,14 @@ self.engine_server_port.setCallback(self.validEngineServerPortCallback) engine_grid.setField(self.engine_server, 1, 0, anchorLeft = 1, padding=(2, 0, 0, 1)) engine_grid.setField(self.engine_server_port, 1, 1, anchorLeft = 1, padding=(2, 0, 0, 0)) - elements.setField(engine_grid, 0, 1, anchorLeft = 1, padding = (0,0,0,0)) + elements.setField(engine_grid, 0, 1, anchorLeft = 1, padding = (0, 0, 0, 0)) elements.setField(Label(""), 0, 2, anchorLeft = 1) self.verify_engine_cert = Checkbox("Connect to @ENGINENAME@ and Validate Certificate", isOn=True) - elements.setField(self.verify_engine_cert, 0, 3, anchorLeft = 1, padding = (0,0,0,0)) + elements.setField(self.verify_engine_cert, 0, 3, anchorLeft = 1, padding = (0, 0, 0, 0)) elements.setField(Label(""), 0, 4, anchorLeft = 1)

elements.setField(Label("Optional password for adding node through @ENGINENAME@ UI"), 0, 5, anchorLeft = 1) - pw_elements = Grid(3,3) + pw_elements = Grid(3, 3)

pw_elements.setField(Label("Password: "), 0, 1, anchorLeft = 1) self.root_password_1 = Entry(15, password=1) @@ -192,7 +192,7 @@ self.pw_resp = PASSWORD_MATCH

elements.setField(pw_elements, 0, 6, anchorLeft=1) - elements.setField(self.pw_msg, 0, 7, padding = (0,0,0,0)) + elements.setField(self.pw_msg, 0, 7, padding = (0, 0, 0, 0))

inputFields = [self.engine_server, self.engine_server_port, self.verify_engine_cert, self.root_password_1, self.root_password_2] @@ -202,7 +202,7 @@

try: engine_server = getEngineConfig() - engine_server,engine_port = engine_server.split(":") + engine_server, engine_port = engine_server.split(":") if engine_server.startswith("None"): self.engine_server.set("") else:

-- To view, visit http://gerrit.ovirt.org/9436 To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange Gerrit-Change-Id: I24a0b990395242dff75ed72b42dce944060e0b26 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com