| 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') ) |
| 359 |
> |
if (rForJ.getAttribute('status') == 'Done' or rForJ.getAttribute('status') == 'Done (Failed)')\ |
| 360 |
> |
and rForJ.getAttribute('sched_status') == 'E' : |
| 361 |
> |
job.runningJob['status'] = 'SD' |
| 362 |
> |
else: |
| 363 |
> |
job.runningJob['status'] = str( rForJ.getAttribute('sched_status') ) |
| 364 |
|
|
| 365 |
< |
job.runningJob['destination'] = str( rForJ.getAttribute('site') ) |
| 366 |
< |
dest = str(job.runningJob['destination']).split(':')[0] |
| 367 |
< |
|
| 368 |
< |
job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') ) |
| 369 |
< |
exe_exit_code = str(job.runningJob['applicationReturnCode']) |
| 370 |
< |
|
| 371 |
< |
job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') ) |
| 372 |
< |
job_exit_code = str(job.runningJob['wrapperReturnCode']) |
| 365 |
> |
job.runningJob['destination'] = str( rForJ.getAttribute('site') ) |
| 366 |
> |
dest = str(job.runningJob['destination']).split(':')[0] |
| 367 |
> |
|
| 368 |
> |
job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') ) |
| 369 |
> |
exe_exit_code = str(job.runningJob['applicationReturnCode']) |
| 370 |
> |
|
| 371 |
> |
job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') ) |
| 372 |
> |
job_exit_code = str(job.runningJob['wrapperReturnCode']) |
| 373 |
|
|
| 374 |
|
#if str( rForJ.getAttribute('resubmit') ).isdigit(): |
| 375 |
|
# job['submissionNumber'] = int(rForJ.getAttribute('resubmit')) |
