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.1 by spiga, Fri Jul 4 14:09:13 2008 UTC vs.
Revision 1.40 by spiga, Mon Jul 7 19:53:13 2008 UTC

# Line 349 | Line 349 | class DBinterface:
349                      break
350  
351              # Data alignment
352 <            if rForJ.getAttribute('status') not in ['Created', 'Submitting', 'Unknown'] and \
353 <                not (job.runningJob['statusScheduler'] == 'Killing' and rForJ.getAttribute('status')!='Killed') \
354 <                and not  (job.runningJob['statusScheduler'] in 'Submitting'  and rForJ.getAttribute('status') in ['Killed','Aborted','Cleared'])  :
352 >            if rForJ.getAttribute('status') not in ['Created', 'Unknown'] and not\
353 >                (job.runningJob['statusScheduler'] == 'Killing' and rForJ.getAttribute('status')!='Killed') \
354 >                and not  (job.runningJob['statusScheduler'] in 'Submitting'  and rForJ.getAttribute('status') in ['Killed','Cleared'])  :
355                     # update the status  
356                  common.logger.debug(3,"Updating DB status for job: " + str(id) + " @: " \
357                                        + str(rForJ.getAttribute('status')) )
358                  job.runningJob['statusScheduler'] = str( rForJ.getAttribute('status') )
359                  job.runningJob['status'] = str( rForJ.getAttribute('sched_status') )
360            
361 <            job.runningJob['destination'] = str( rForJ.getAttribute('site') )
362 <            dest = str(job.runningJob['destination']).split(':')[0]
363 <          
364 <            job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') )
365 <            exe_exit_code = str(job.runningJob['applicationReturnCode'])
366 <          
367 <            job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
368 <            job_exit_code = str(job.runningJob['wrapperReturnCode'])
361 >                job.runningJob['destination'] = str( rForJ.getAttribute('site') )
362 >                dest = str(job.runningJob['destination']).split(':')[0]
363 >              
364 >                job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') )
365 >                exe_exit_code = str(job.runningJob['applicationReturnCode'])
366 >              
367 >                job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
368 >                job_exit_code = str(job.runningJob['wrapperReturnCode'])
369            
370              #if str( rForJ.getAttribute('resubmit') ).isdigit():
371              #    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))

Diff Legend

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