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.44 by spiga, Sun Aug 31 22:00:21 2008 UTC vs.
Revision 1.50 by mcinquil, Mon Dec 8 20:23:47 2008 UTC

# Line 56 | Line 56 | class DBinterface:
56          Return task with all/list of jobs
57          """
58          try:
59 <            task = common.bossSession.load(1,jobsList)[0]
59 >            task = common.bossSession.load(1,jobsList)
60          except Exception, e :
61              common.logger.debug(3, "Error while getting task : " +str(traceback.format_exc()))
62              raise CrabException('Error while getting task '+str(e))
# Line 67 | Line 67 | class DBinterface:
67          Return a task with a single job
68          """
69          try:
70 <            task = common.bossSession.load(1,str(n))[0]
70 >            task = common.bossSession.load(1,str(n))
71          except Exception, e :
72              common.logger.debug(3, "Error while getting job : " +str(traceback.format_exc()))
73              raise CrabException('Error while getting job '+str(e))
# Line 333 | Line 333 | class DBinterface:
333                  if r.getAttribute('id') in [ id, 'all']:
334                      rForJ = r
335                      break
336 <            ## Check the submission number and create new running jobs on the client side          
337 <            if rForJ.getAttribute('resubmit') != 'None' and (rForJ.getAttribute('status') not in ['Killed','Killing','Done']) :
336 >            ## Check the submission number and create new running jobs on the client side
337 >            if rForJ.getAttribute('resubmit') != 'None' and (rForJ.getAttribute('status') not in ['Cleared','Killed','Done','Done (Failed)']) :
338                  if int(job.runningJob['submission']) < int(rForJ.getAttribute('resubmit')) + 1:
339                      nj_list.append(id)
340 <                    self.newRunJobs(nj_list)
340 >            if len(nj_list) > 0: self.newRunJobs(nj_list)
341  
342          task_new = self.getTask()
343  
# Line 348 | Line 348 | class DBinterface:
348              for r in reportList:
349                  if r.getAttribute('id') in [ id, 'all']:
350                      rForJ = r
351 <                    break
351 >                    break
352                    
353              # Data alignment
354 <            if rForJ.getAttribute('status') not in ['Created', 'Unknown'] and not\
355 <                (job.runningJob['statusScheduler'] == 'Killing' and rForJ.getAttribute('status')!='Killed') \
356 <                and not  (job.runningJob['statusScheduler'] in 'Submitting'  and rForJ.getAttribute('status') in ['Killed','Cleared'])  :
354 >            if rForJ.getAttribute('status') not in ['Created', 'Unknown']:
355                     # update the status  
356                  common.logger.debug(3,"Updating DB status for job: " + str(id) + " @: " \
357                                        + str(rForJ.getAttribute('status')) )
# Line 374 | Line 372 | class DBinterface:
372                
373                  job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
374                  job_exit_code = str(job.runningJob['wrapperReturnCode'])
375 +
376 +                ## unsing 'standardInput' field for 'ended' tag ['Y','N']
377 +                job['standardInput'] = str( rForJ.getAttribute('ended') )
378            
379              #if str( rForJ.getAttribute('resubmit') ).isdigit():
380              #    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))

Diff Legend

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