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.33 by spiga, Mon Jun 2 08:47:23 2008 UTC vs.
Revision 1.47 by mcinquil, Tue Sep 30 22:16:46 2008 UTC

# Line 56 | Line 56 | class DBinterface:
56          Return task with all/list of jobs
57          """
58          try:
59 <            task = common.bossSession.load(1,jobsList)[0]
59 >            task = common.bossSession.load(1,jobsList)
60          except Exception, e :
61              common.logger.debug(3, "Error while getting task : " +str(traceback.format_exc()))
62              raise CrabException('Error while getting task '+str(e))
# Line 67 | Line 67 | class DBinterface:
67          Return a task with a single job
68          """
69          try:
70 <            task = common.bossSession.load(1,str(n))[0]
70 >            task = common.bossSession.load(1,str(n))
71          except Exception, e :
72              common.logger.debug(3, "Error while getting job : " +str(traceback.format_exc()))
73              raise CrabException('Error while getting job '+str(e))
# Line 107 | Line 107 | class DBinterface:
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          """
# Line 116 | Line 116 | class DBinterface:
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 :
# Line 192 | Line 198 | class DBinterface:
198              tmp_task = self.getTask()
199          return common.bossSession.serialize(tmp_task)  
200  
201 <    def queryID(self,server_mode=0):
201 >    def queryID(self,server_mode=0, jid=False):
202          '''
203          Return the taskId if serevr_mode =1
204          Return the joblistId if serevr_mode =0
# Line 201 | Line 207 | class DBinterface:
207          lines=[]
208          task = self.getTask()
209          if server_mode == 1:
210 <            header= "Task Id = %-40s " %(task['name'])
211 <        else:
210 >            headerTask= "Task Id = %-40s " %(task['name'])
211 >            displayReport(self,headerTask,lines)
212 >        if (jid ) or (server_mode == 0):
213              for job in task.jobs:
214                  toPrint=''
215                  common.bossSession.getRunningInstance(job)
216                  toPrint = "%-5s %-50s " % (job['jobId'],job.runningJob['schedulerId'])
217                  lines.append(toPrint)
218              header+= "%-5s %-50s " % ('Job:','ID' )
219 <        displayReport(self,header,lines)
219 >            displayReport(self,header,lines)
220          return  
221  
222      def queryTask(self,attr):
# Line 327 | 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 int(job.runningJob['submission']) < int(rForJ.getAttribute('resubmit')) + 1:
338 <                nj_list.append(id)
339 <                self.newRunJobs(nj_list)
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)
341  
342          task_new = self.getTask()
343  
# Line 340 | Line 348 | class DBinterface:
348              for r in reportList:
349                  if r.getAttribute('id') in [ id, 'all']:
350                      rForJ = r
351 <                    break  
351 >                    break
352 >                  
353              # Data alignment
354 <            jobStatus = str(job.runningJob['statusScheduler'])
355 <            if rForJ.getAttribute('statusScheduler') not in ['Created', 'Submitting', 'Unknown'] and \
356 <                     job.runningJob['statusScheduler'] != 'Cleared':
354 >            if rForJ.getAttribute('status') not in ['Created', 'Unknown']:
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 <                jobStatus = str(job.runningJob['statusScheduler'])
360 <                job.runningJob['status'] = str( rForJ.getAttribute('sched_status') )
361 <
362 <            job.runningJob['destination'] = str( rForJ.getAttribute('site') )
363 <            dest = str(job.runningJob['destination']).split(':')[0]
364 <
365 <            job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') )
366 <            exe_exit_code = str(job.runningJob['applicationReturnCode'])
367 <
368 <            job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
369 <            job_exit_code = str(job.runningJob['wrapperReturnCode'])
370 <
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['schedulerId'] = str( rForJ.getAttribute('sched_id') )
366 >
367 >                job.runningJob['destination'] = str( rForJ.getAttribute('site') )
368 >                dest = str(job.runningJob['destination']).split(':')[0]
369 >              
370 >                job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') )
371 >                exe_exit_code = str(job.runningJob['applicationReturnCode'])
372 >              
373 >                job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
374 >                job_exit_code = str(job.runningJob['wrapperReturnCode'])
375 >          
376              #if str( rForJ.getAttribute('resubmit') ).isdigit():
377              #    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))
378              #    job.runningJob['submission'] =  int(rForJ.getAttribute('resubmit'))
379 <
379 >          
380              # TODO cleared='0' field, how should it be handled/mapped in BL? #Fabio
381  
382          common.bossSession.updateDB( task_new )

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines