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.35.4.3 by spiga, Mon Jul 7 19:53:43 2008 UTC vs.
Revision 1.36 by mcinquil, Thu Jun 19 11:12:00 2008 UTC

# Line 324 | Line 324 | class DBinterface:
324          for job in task.jobs:
325              if not job.runningJob:
326                  raise CrabException( "Missing running object for job %s"%str(job['jobId']) )
327 –
327              id = str(job.runningJob['jobId'])
328              rForJ = None
329              nj_list= []
# Line 346 | Line 345 | class DBinterface:
345              for r in reportList:
346                  if r.getAttribute('id') in [ id, 'all']:
347                      rForJ = r
348 <                    break
350 <
348 >                    break  
349              # Data alignment
350 <            if rForJ.getAttribute('status') not in ['Created', 'Unknown'] and not\
351 <                (job.runningJob['statusScheduler'] == 'Killing' and rForJ.getAttribute('status')!='Killed') \
352 <                and not  (job.runningJob['statusScheduler'] in 'Submitting'  and rForJ.getAttribute('status') in ['Killed','Cleared'])  :
353 <                   # update the status  
354 <                common.logger.debug(3,"Updating DB status for job: " + str(id) + " @: " \
355 <                                      + str(rForJ.getAttribute('status')) )
356 <                job.runningJob['statusScheduler'] = str( rForJ.getAttribute('status') )
357 <                job.runningJob['status'] = str( rForJ.getAttribute('sched_status') )
350 >            jobStatus = str(job.runningJob['statusScheduler'])
351 >            if str(job.runningJob['status']) != 'EE':
352 >                if rForJ.getAttribute('status') not in ['Created', 'Submitting', 'Unknown'] and \
353 >                         job.runningJob['statusScheduler'] != 'Cleared':
354 >                    common.logger.debug(3,"Updating DB status for job: " + str(id) + " @: " \
355 >                                          + str(rForJ.getAttribute('status')) )
356 >                    job.runningJob['statusScheduler'] = str( rForJ.getAttribute('status') )
357 >                    jobStatus = str(job.runningJob['statusScheduler'])
358 >                    job.runningJob['status'] = str( rForJ.getAttribute('sched_status') )
359            
360                  job.runningJob['destination'] = str( rForJ.getAttribute('site') )
361                  dest = str(job.runningJob['destination']).split(':')[0]
362 <              
362 >          
363                  job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') )
364                  exe_exit_code = str(job.runningJob['applicationReturnCode'])
365 <              
365 >          
366                  job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
367                  job_exit_code = str(job.runningJob['wrapperReturnCode'])
368            
369 <            #if str( rForJ.getAttribute('resubmit') ).isdigit():
370 <            #    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))
371 <            #    job.runningJob['submission'] =  int(rForJ.getAttribute('resubmit'))
369 >                #if str( rForJ.getAttribute('resubmit') ).isdigit():
370 >                #    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))
371 >                #    job.runningJob['submission'] =  int(rForJ.getAttribute('resubmit'))
372            
373 <            # TODO cleared='0' field, how should it be handled/mapped in BL? #Fabio
373 >                # TODO cleared='0' field, how should it be handled/mapped in BL? #Fabio
374  
375          common.bossSession.updateDB( task_new )
376          return

Diff Legend

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