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

Comparing COMP/CRAB/python/DBinterface.py (file contents):
Revision 1.61 by slacapra, Wed Jun 10 11:40:52 2009 UTC vs.
Revision 1.72 by lolass, Mon Jan 21 11:22:46 2013 UTC

# Line 80 | Line 80 | class DBinterface:
80          """
81          opt={}
82          if optsToSave.get('server_mode',0) == 1: opt['serverName']=optsToSave['server_name']
83 +        if common.scheduler.name().upper() not in ['LSF', 'CAF', 'SGE', 'PBS']:
84 +            checkNewSiteDB()
85          opt['name']= getUserName()+ '_' + string.split(common.work_space.topDir(),'/')[-2]+'_'+common.work_space.task_uuid()
86 <        task = Task( opt )
86 >        task = Task( opt )
87          try:
88              common.bossSession.saveTask( task )
89          except Exception, e :
# Line 206 | Line 208 | class DBinterface:
208          if server_mode == 1:
209              # init client server params...
210              CliServerParams(self)      
211 <            headerTask= "Task Id = %-40s " %(task['name'])
211 >            headerTask = "Task Id = %-40s\n" %(task['name'])
212 >            headerTask+=  '--------------------------------------------------------------------------------------------\n'
213              displayReport(self,headerTask,lines)
214              common.logger.info(showWebMon(self.server_name))
215          if (jid ) or (server_mode == 0):
# Line 215 | Line 218 | class DBinterface:
218                  common.bossSession.getRunningInstance(job)
219                  toPrint = "%-5s %-50s " % (job['jobId'],job.runningJob['schedulerId'])
220                  lines.append(toPrint)
221 <            header+= "%-5s %-50s " % ('Job:','ID' )
221 >            header+= "%-5s %-50s\n " % ('Job:','ID' )
222 >            header+=  '--------------------------------------------------------------------------------------------\n'
223              displayReport(self,header,lines)
224          return  
225  
# Line 323 | Line 327 | class DBinterface:
327      def deserXmlStatus(self, reportList):
328  
329          task = self.getTask()
330 +        if int(self.cfg_params.get('WMBS.automation',0)) == 1:
331 +            if len(reportList) ==0:
332 +                msg = 'You are using CRAB with WMBS the server is still creating your jobs.\n'
333 +                msg += '\tPlease wait...'
334 +                raise CrabException(msg)
335 +            newJobs =  len(reportList) - len(task.jobs)
336 +            if newJobs != 0:
337 +                isNew=True  
338 +                if len(task.jobs):isNew=False
339 +                jobL=[]  
340 +                for i in range(1,newJobs+1):
341 +                    jobL.append(len(task.jobs)+i)
342 +                self.createJobs_(jobL,isNew)
343 +
344          for job in task.jobs:
345              if not job.runningJob:
346                  raise CrabException( "Missing running object for job %s"%str(job['jobId']) )
# Line 334 | Line 352 | class DBinterface:
352                  if r.getAttribute('id') in [ id, 'all']:
353                      rForJ = r
354                      break
355 +
356 +            # check if rForJ is None
357 +            if rForJ is None:
358 +                common.logger.debug( "Missing XML element for job %s, skip update status"%str(id) )
359 +                continue
360 +            
361              ## Check the submission number and create new running jobs on the client side
362              if rForJ.getAttribute('resubmit') != 'None' and (rForJ.getAttribute('status') not in ['Cleared','Killed','Done','Done (Failed)','Not Submitted', 'Cancelled by user']) :
363                  if int(job.runningJob['submission']) < int(rForJ.getAttribute('resubmit')) + 1:
# Line 352 | Line 376 | class DBinterface:
376                      break
377                    
378              # Data alignment
379 <            if rForJ.getAttribute('status') not in ['Created', 'Unknown']:
379 >            if rForJ.getAttribute('status') not in ['Unknown']: # ['Created', 'Unknown']:
380                     # update the status  
381                  common.logger.debug("Updating DB status for job: " + str(id) + " @: " \
382                                        + str(rForJ.getAttribute('status')) )
# Line 374 | Line 398 | class DBinterface:
398                  job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
399                  job_exit_code = str(job.runningJob['wrapperReturnCode'])
400  
401 <                ## unsing 'standardInput' field for 'ended' tag ['Y','N']
378 <                job['standardInput'] = str( rForJ.getAttribute('ended') )
401 >                job['closed'] = str( rForJ.getAttribute('ended') )
402  
403                  job.runningJob['state'] = str( rForJ.getAttribute('action') )
404            
405 <            #if str( rForJ.getAttribute('resubmit') ).isdigit():
406 <            #    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))
384 <            #    job.runningJob['submission'] =  int(rForJ.getAttribute('resubmit'))
405 >                # Needed for unique naming of the output.
406 >                job['arguments'] = "%d %s"%(job.runningJob['jobId'], str(rForJ.getAttribute('submission')).strip() )
407            
386            # TODO cleared='0' field, how should it be handled/mapped in BL? #Fabio
387
408          common.bossSession.updateDB( task_new )
409          return
410  
# Line 395 | Line 415 | class DBinterface:
415                  return False
416          return True
417  
418 +    # Method to update arguments w.r.t. resubmission number in order to grant unique output
419 +    def updateResubAttribs(self, jobsL):
420 +        task = self.getTask(jobsL)
421 +        for j in task.jobs:
422 +            common.bossSession.getRunningInstance(j)
423 +            try:
424 +                resubNum = int(str(j['arguments']).split(' ')[1]) + 1
425 +            except Exception, e:
426 +                resubNum = j.runningJob['submission']
427 +            newArgs = "%d %d"%(j.runningJob['jobId'], resubNum)
428 +            j['arguments'] = newArgs
429 +
430 +        common.bossSession.updateDB(task)
431 +        return
432  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines