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.45 by spiga, Thu Sep 25 11:47:53 2008 UTC vs.
Revision 1.46 by mcinquil, Tue Sep 30 15:11:44 2008 UTC

# Line 334 | Line 334 | class DBinterface:
334                      rForJ = r
335                      break
336              ## Check the submission number and create new running jobs on the client side          
337 <            if rForJ.getAttribute('resubmit') != 'None' and (rForJ.getAttribute('status') not in ['Killed','Killing','Done']) :
337 >            if rForJ.getAttribute('resubmit') != 'None' and (rForJ.getAttribute('status') not in ['Killed','Done']) :
338                  if int(job.runningJob['submission']) < int(rForJ.getAttribute('resubmit')) + 1:
339                      nj_list.append(id)
340                      self.newRunJobs(nj_list)
# Line 352 | Line 352 | class DBinterface:
352                    
353              # Data alignment
354              if rForJ.getAttribute('status') not in ['Created', 'Unknown'] and not\
355 <                (job.runningJob['statusScheduler'] == 'Killing' and rForJ.getAttribute('status')!='Killed') \
356 <                and not  (job.runningJob['statusScheduler'] in 'Submitting'  and rForJ.getAttribute('status') in ['Killed','Cleared'])  :
355 >               (job.runningJob['statusScheduler'] in 'Submitting'  and rForJ.getAttribute('status') in ['Killed','Cleared'])  :
356                     # update the status  
357                  common.logger.debug(3,"Updating DB status for job: " + str(id) + " @: " \
358                                        + str(rForJ.getAttribute('status')) )

Diff Legend

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