| 107 |
|
|
| 108 |
|
return |
| 109 |
|
|
| 110 |
< |
def createJobs_(self, jobsL): |
| 110 |
> |
def createJobs_(self, jobsL, isNew=True): |
| 111 |
|
""" |
| 112 |
|
Fill crab DB with the jobs filed |
| 113 |
|
""" |
| 116 |
|
jobs = [] |
| 117 |
|
for id in jobsL: |
| 118 |
|
parameters = {} |
| 119 |
< |
parameters['jobId'] = str(id) |
| 119 |
> |
parameters['jobId'] = int(id) |
| 120 |
> |
parameters['taskId'] = 1 |
| 121 |
|
parameters['name'] = task['name'] + '_' + 'job' + str(id) |
| 122 |
|
job = Job(parameters) |
| 123 |
|
jobs.append(job) |
| 124 |
|
common.bossSession.getRunningInstance(job) |
| 125 |
|
job.runningJob['status'] = 'C' |
| 126 |
< |
task.addJobs(jobs) |
| 126 |
> |
## added to support second step creation |
| 127 |
> |
## maybe it is not needed. TO CLARIFY |
| 128 |
> |
if isNew: |
| 129 |
> |
task.addJobs(jobs) |
| 130 |
> |
else: |
| 131 |
> |
task.appendJobs(jobs) |
| 132 |
|
try: |
| 133 |
|
common.bossSession.updateDB( task ) |
| 134 |
|
except Exception, e : |
| 183 |
|
""" |
| 184 |
|
task = self.getTask(jobs) |
| 185 |
|
|
| 180 |
– |
Jobs = task.getJobs() |
| 186 |
|
print "--------------------------" |
| 187 |
< |
for Job in Jobs: |
| 187 |
> |
for Job in task.jobs: |
| 188 |
|
print "Id: ",Job['jobId'] |
| 189 |
|
print "Dest: ", Job['dlsDestination'] |
| 190 |
|
print "Output: ", Job['outputFiles'] |
| 191 |
|
print "Args: ",Job['arguments'] |
| 192 |
+ |
print "Service: ",Job.runningJob['service'] |
| 193 |
|
print "--------------------------" |
| 194 |
|
return |
| 195 |
|
|
| 321 |
|
def deserXmlStatus(self, reportList): |
| 322 |
|
|
| 323 |
|
task = self.getTask() |
| 318 |
– |
|
| 324 |
|
for job in task.jobs: |
| 325 |
|
if not job.runningJob: |
| 326 |
|
raise CrabException( "Missing running object for job %s"%str(job['jobId']) ) |
| 327 |
|
|
| 328 |
|
id = str(job.runningJob['jobId']) |
| 324 |
– |
# TODO linear search, probably it can be optized with binary search |
| 329 |
|
rForJ = None |
| 330 |
+ |
nj_list= [] |
| 331 |
|
for r in reportList: |
| 332 |
|
if r.getAttribute('id') in [ id, 'all']: |
| 333 |
|
rForJ = r |
| 334 |
|
break |
| 335 |
+ |
## Check the submission number and create new running jobs on the client side |
| 336 |
+ |
if int(job.runningJob['submission']) < int(rForJ.getAttribute('resubmit')) + 1: |
| 337 |
+ |
nj_list.append(id) |
| 338 |
+ |
self.newRunJobs(nj_list) |
| 339 |
|
|
| 340 |
+ |
task_new = self.getTask() |
| 341 |
+ |
|
| 342 |
+ |
for job in task_new.jobs: |
| 343 |
+ |
id = str(job.runningJob['jobId']) |
| 344 |
+ |
# TODO linear search, probably it can be optized with binary search |
| 345 |
+ |
rForJ = None |
| 346 |
+ |
for r in reportList: |
| 347 |
+ |
if r.getAttribute('id') in [ id, 'all']: |
| 348 |
+ |
rForJ = r |
| 349 |
+ |
break |
| 350 |
|
# Data alignment |
| 351 |
|
jobStatus = str(job.runningJob['statusScheduler']) |
| 352 |
< |
if rForJ.getAttribute('status') not in ['Created', 'Submitting', 'Unknown'] and \ |
| 352 |
> |
if rForJ.getAttribute('statusScheduler') not in ['Created', 'Submitting', 'Unknown'] and \ |
| 353 |
|
job.runningJob['statusScheduler'] != 'Cleared': |
| 354 |
|
job.runningJob['statusScheduler'] = str( rForJ.getAttribute('status') ) |
| 355 |
|
jobStatus = str(job.runningJob['statusScheduler']) |
| 370 |
|
|
| 371 |
|
# TODO cleared='0' field, how should it be handled/mapped in BL? #Fabio |
| 372 |
|
|
| 373 |
< |
common.bossSession.updateDB( task ) |
| 355 |
< |
|
| 373 |
> |
common.bossSession.updateDB( task_new ) |
| 374 |
|
return |
| 375 |
|
|
| 376 |
|
# FIXME temporary method to verify what kind of submission to perform towards the server |
| 377 |
|
def checkIfNeverSubmittedBefore(self): |
| 378 |
|
for j in self.getTask().jobs: |
| 379 |
< |
if j.runningJob['submission'] > 1 or j.runningJob['status'] != 'C': |
| 379 |
> |
if j.runningJob['submission'] > 1 or j.runningJob['status'] != 'C' or \ |
| 380 |
> |
j.runningJob['statusScheduler'] != 'Created': |
| 381 |
|
return False |
| 382 |
|
return True |
| 383 |
|
|
