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.34 by spiga, Mon Jun 9 14:40:31 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 349 | Line 348 | class DBinterface:
348                      break  
349              # Data alignment
350              jobStatus = str(job.runningJob['statusScheduler'])
351 <            if rForJ.getAttribute('statusScheduler') not in ['Created', 'Submitting', 'Unknown'] and \
352 <                     job.runningJob['statusScheduler'] != 'Cleared':
353 <                job.runningJob['statusScheduler'] = str( rForJ.getAttribute('status') )
354 <                jobStatus = str(job.runningJob['statusScheduler'])
355 <                job.runningJob['status'] = str( rForJ.getAttribute('sched_status') )
356 <
357 <            job.runningJob['destination'] = str( rForJ.getAttribute('site') )
358 <            dest = str(job.runningJob['destination']).split(':')[0]
359 <
360 <            job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') )
361 <            exe_exit_code = str(job.runningJob['applicationReturnCode'])
362 <
363 <            job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
364 <            job_exit_code = str(job.runningJob['wrapperReturnCode'])
365 <
366 <            #if str( rForJ.getAttribute('resubmit') ).isdigit():
367 <            #    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))
368 <            #    job.runningJob['submission'] =  int(rForJ.getAttribute('resubmit'))
369 <
370 <            # TODO cleared='0' field, how should it be handled/mapped in BL? #Fabio
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 >          
363 >                job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') )
364 >                exe_exit_code = str(job.runningJob['applicationReturnCode'])
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'))
372 >          
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