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.27 by farinafa, Tue May 20 16:50:18 2008 UTC vs.
Revision 1.36 by mcinquil, Thu Jun 19 11:12:00 2008 UTC

# Line 34 | Line 34 | class DBinterface:
34              raise CrabException('Istantiate DB Session : '+str(e))
35  
36          try:
37 <            common.bossSession.installDB('$CRABPRODCOMMONPYTHON/ProdCommon/BossLite/DbObjects/setupDatabase-sqlite.sql')    
37 >            common.bossSession.bossLiteDB.installDB('$CRABPRODCOMMONPYTHON/ProdCommon/BossLite/DbObjects/setupDatabase-sqlite.sql')
38          except Exception, e :
39              raise CrabException('DB Installation error : '+str(e))
40          return
# 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 177 | Line 183 | class DBinterface:
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  
# Line 315 | Line 321 | class DBinterface:
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']) )
322 –
327              id = str(job.runningJob['jobId'])
324 –            # TODO linear search, probably it can be optized with binary search
328              rForJ = None
329 +            nj_list= []
330              for r in reportList:
331                  if r.getAttribute('id') in [ id, 'all']:
332                      rForJ = r
333                      break
334 +            ## Check the submission number and create new running jobs on the client side          
335 +            if int(job.runningJob['submission']) < int(rForJ.getAttribute('resubmit')) + 1:
336 +                nj_list.append(id)
337 +                self.newRunJobs(nj_list)
338  
339 +        task_new = self.getTask()
340 +
341 +        for job in task_new.jobs:
342 +            id = str(job.runningJob['jobId'])
343 +            # TODO linear search, probably it can be optized with binary search
344 +            rForJ = None
345 +            for r in reportList:
346 +                if r.getAttribute('id') in [ id, 'all']:
347 +                    rForJ = r
348 +                    break  
349              # Data alignment
350              jobStatus = str(job.runningJob['statusScheduler'])
351 <            if rForJ.getAttribute('status') not in ['Created', 'Submitting', 'Unknown'] and \
352 <                     job.runningJob['statusScheduler'] != 'Cleared':
353 <                job.runningJob['statusScheduler'] = str( rForJ.getAttribute('status') )
354 <                jobStatus = str(job.runningJob['statusScheduler'])
355 <                job.runningJob['status'] = str( rForJ.getAttribute('sched_status') )
356 <
357 <            job.runningJob['destination'] = str( rForJ.getAttribute('site') )
358 <            dest = str(job.runningJob['destination']).split(':')[0]
359 <
360 <            job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') )
361 <            exe_exit_code = str(job.runningJob['applicationReturnCode'])
362 <
363 <            job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
364 <            job_exit_code = str(job.runningJob['wrapperReturnCode'])
365 <
366 <            #if str( rForJ.getAttribute('resubmit') ).isdigit():
367 <            #    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))
368 <            #    job.runningJob['submission'] =  int(rForJ.getAttribute('resubmit'))
369 <
370 <            # TODO cleared='0' field, how should it be handled/mapped in BL? #Fabio
351 >            if str(job.runningJob['status']) != 'EE':
352 >                if rForJ.getAttribute('status') not in ['Created', 'Submitting', 'Unknown'] and \
353 >                         job.runningJob['statusScheduler'] != 'Cleared':
354 >                    common.logger.debug(3,"Updating DB status for job: " + str(id) + " @: " \
355 >                                          + str(rForJ.getAttribute('status')) )
356 >                    job.runningJob['statusScheduler'] = str( rForJ.getAttribute('status') )
357 >                    jobStatus = str(job.runningJob['statusScheduler'])
358 >                    job.runningJob['status'] = str( rForJ.getAttribute('sched_status') )
359 >          
360 >                job.runningJob['destination'] = str( rForJ.getAttribute('site') )
361 >                dest = str(job.runningJob['destination']).split(':')[0]
362 >          
363 >                job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') )
364 >                exe_exit_code = str(job.runningJob['applicationReturnCode'])
365 >          
366 >                job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
367 >                job_exit_code = str(job.runningJob['wrapperReturnCode'])
368 >          
369 >                #if str( rForJ.getAttribute('resubmit') ).isdigit():
370 >                #    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))
371 >                #    job.runningJob['submission'] =  int(rForJ.getAttribute('resubmit'))
372 >          
373 >                # TODO cleared='0' field, how should it be handled/mapped in BL? #Fabio
374  
375 <        common.bossSession.updateDB( task )
375 >        common.bossSession.updateDB( task_new )
376          return
377  
378      # FIXME temporary method to verify what kind of submission to perform towards the server
379      def checkIfNeverSubmittedBefore(self):
380          for j in self.getTask().jobs:
381 <            if j.runningJob['submission'] > 1 or j.runningJob['status'] != 'C':
381 >            if j.runningJob['submission'] > 1 or j.runningJob['status'] != 'C' or \
382 >                    j.runningJob['statusScheduler'] != 'Created':
383                  return False
384          return True
385  

Diff Legend

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