ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/Splitter.py
(Generate patch)

Comparing COMP/CRAB/python/Splitter.py (file contents):
Revision 1.7 by spiga, Wed Feb 11 22:13:03 2009 UTC vs.
Revision 1.10 by spiga, Tue Mar 31 23:39:38 2009 UTC

# Line 290 | Line 290 | class JobSplitter:
290          screenOutput = "List of jobs and available destination sites:\n\n"
291          noSiteBlock = []
292          bloskNoSite = []
293 +        allBlock = []
294  
295          blockCounter = 0
296          for block in blocks:
297              if block in jobsOfBlock.keys() :
298                  blockCounter += 1
299 +                allBlock.append( blockCounter )
300                  screenOutput += "Block %5i: jobs %20s: sites: %s\n" % (blockCounter,spanRanges(jobsOfBlock[block]),
301                      ','.join(self.blackWhiteListParser.checkWhiteList(self.blackWhiteListParser.checkBlackList(blockSites[block],[block]),[block])))
302                  if len(self.blackWhiteListParser.checkWhiteList(self.blackWhiteListParser.checkBlackList(blockSites[block],[block]),[block])) == 0:
# Line 327 | Line 329 | class JobSplitter:
329  
330              common.logger.message(msg)
331  
332 +        if bloskNoSite == allBlock:
333 +            raise CrabException('No jobs created')
334 +
335          return
336  
337  
# Line 354 | Line 359 | class JobSplitter:
359          thefiles = Fileset(name='FilesToSplit')
360          fileList = pubdata.getListFiles()
361          for f in fileList:
357 –           # print f
362              block = f['Block']['Name']
359 –          #  if not blocks.has_key(block):
360 –          #      blocks[block] = reader.listFileBlockLocation(block)
363              try:
364                  f['Block']['StorageElementList'].extend(blockSites[block])
365              except:
# Line 399 | Line 401 | class JobSplitter:
401                  #need to check single file location
402                  jobDestination.append(res['locations'])  
403                  count +=1
402 –        #print jobDestination
404         # prepare dict output
405          dictOut = {}
406          dictOut['args'] = list_of_lists
# Line 419 | Line 420 | class JobSplitter:
420                  for loc in file['locations']:
421                      if tmp_check < 1 :
422                          locations.append(loc)
423 <                    tmp_check = tmp_check + 1
423 >                tmp_check = tmp_check + 1
424                  ### qui va messo il check per la locations
425          res['lfns'] = lfns
426          res['locations'] = locations

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines