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.30 by spiga, Tue May 20 20:49:11 2008 UTC vs.
Revision 1.33 by spiga, Mon Jun 2 08:47:23 2008 UTC

# Line 177 | Line 177 | class DBinterface:
177          """
178          task = self.getTask(jobs)
179  
180        Jobs = task.getJobs()
180          print "--------------------------"
181 <        for Job in Jobs:
181 >        for Job in task.jobs:
182              print "Id: ",Job['jobId']
183              print "Dest: ", Job['dlsDestination']
184              print "Output: ", Job['outputFiles']
185              print "Args: ",Job['arguments']
186 +            print "Service: ",Job.runningJob['service']
187              print "--------------------------"
188          return      
189  
# Line 315 | Line 315 | class DBinterface:
315      def deserXmlStatus(self, reportList):
316  
317          task = self.getTask()
318
318          for job in task.jobs:
319              if not job.runningJob:
320                  raise CrabException( "Missing running object for job %s"%str(job['jobId']) )
321  
322              id = str(job.runningJob['jobId'])
324            # TODO linear search, probably it can be optized with binary search
323              rForJ = None
324 +            nj_list= []
325              for r in reportList:
326                  if r.getAttribute('id') in [ id, 'all']:
327                      rForJ = r
328                      break
329 +            ## Check the submission number and create new running jobs on the client side          
330 +            if int(job.runningJob['submission']) < int(rForJ.getAttribute('resubmit')) + 1:
331 +                nj_list.append(id)
332 +                self.newRunJobs(nj_list)
333 +
334 +        task_new = self.getTask()
335  
336 +        for job in task_new.jobs:
337 +            id = str(job.runningJob['jobId'])
338 +            # TODO linear search, probably it can be optized with binary search
339 +            rForJ = None
340 +            for r in reportList:
341 +                if r.getAttribute('id') in [ id, 'all']:
342 +                    rForJ = r
343 +                    break  
344              # Data alignment
345              jobStatus = str(job.runningJob['statusScheduler'])
346 <            if rForJ.getAttribute('status') not in ['Created', 'Submitting', 'Unknown'] and \
346 >            if rForJ.getAttribute('statusScheduler') not in ['Created', 'Submitting', 'Unknown'] and \
347                       job.runningJob['statusScheduler'] != 'Cleared':
348                  job.runningJob['statusScheduler'] = str( rForJ.getAttribute('status') )
349                  jobStatus = str(job.runningJob['statusScheduler'])
# Line 351 | Line 364 | class DBinterface:
364  
365              # TODO cleared='0' field, how should it be handled/mapped in BL? #Fabio
366  
367 <        common.bossSession.updateDB( task )
355 <
367 >        common.bossSession.updateDB( task_new )
368          return
369  
370      # FIXME temporary method to verify what kind of submission to perform towards the server
371      def checkIfNeverSubmittedBefore(self):
372          for j in self.getTask().jobs:
373 <            if j.runningJob['submission'] > 1 or j.runningJob['status'] != 'C':
373 >            if j.runningJob['submission'] > 1 or j.runningJob['status'] != 'C' or \
374 >                    j.runningJob['statusScheduler'] != 'Created':
375                  return False
376          return True
377  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines