| 351 |
|
# Data alignment |
| 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']) : |
| 354 |
> |
and not (job.runningJob['statusScheduler'] in 'Submitting' and rForJ.getAttribute('status') in ['Killed','Aborted','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 |
< |
if rForJ.getAttribute('status') == 'Done' and rForJ.getAttribute('sched_status') == 'E' : |
| 360 |
< |
job.runningJob['status'] = 'SD' |
| 361 |
< |
else: |
| 362 |
< |
job.runningJob['status'] = str( rForJ.getAttribute('sched_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] |
