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.24 by spiga, Sat May 10 13:41:40 2008 UTC vs.
Revision 1.35.4.2 by spiga, Mon Jul 7 13:24:31 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['id']) )
326 >                raise CrabException( "Missing running object for job %s"%str(job['jobId']) )
327  
328 <            id = str(job.runningJob['id'])
324 <            # TODO linear search, probably it can be optized with binary search
328 >            id = str(job.runningJob['jobId'])
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 +
351              # Data alignment
352 <            jobStatus = str(job.runningJob['statusScheduler'])
353 <            if rForJ.getAttribute('status') not in ['Created', 'Submitting', 'Unknown'] and \
354 <                     job.runningJob['statusScheduler'] != 'Cleared':
352 >            if rForJ.getAttribute('status') not in ['Created', 'Unknown'] and not\
353 >                (job.runningJob['statusScheduler'] == 'Killing' and rForJ.getAttribute('status')!='Killed') \
354 >                and not  (job.runningJob['statusScheduler'] in 'Submitting'  and rForJ.getAttribute('status') in ['Killed','Aborted','Cleared'])  :
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') )
336                jobStatus = str(job.runningJob['statusScheduler'])
359                  job.runningJob['status'] = str( rForJ.getAttribute('sched_status') )
360 <
361 <            job.runningJob['destination'] = str( rForJ.getAttribute('site') )
362 <            dest = str(job.runningJob['destination']).split(':')[0]
363 <
364 <            job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') )
365 <            exe_exit_code = str(job.runningJob['applicationReturnCode'])
366 <
367 <            job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
368 <            job_exit_code = str(job.runningJob['wrapperReturnCode'])
369 <
360 >          
361 >                job.runningJob['destination'] = str( rForJ.getAttribute('site') )
362 >                dest = str(job.runningJob['destination']).split(':')[0]
363 >              
364 >                job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') )
365 >                exe_exit_code = str(job.runningJob['applicationReturnCode'])
366 >              
367 >                job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
368 >                job_exit_code = str(job.runningJob['wrapperReturnCode'])
369 >          
370              #if str( rForJ.getAttribute('resubmit') ).isdigit():
371              #    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))
372              #    job.runningJob['submission'] =  int(rForJ.getAttribute('resubmit'))
373 <
373 >          
374              # TODO cleared='0' field, how should it be handled/mapped in BL? #Fabio
375  
376 <        common.bossSession.updateDB( task )
355 <
376 >        common.bossSession.updateDB( task_new )
377          return
378 +
379 +    # FIXME temporary method to verify what kind of submission to perform towards the server
380 +    def checkIfNeverSubmittedBefore(self):
381 +        for j in self.getTask().jobs:
382 +            if j.runningJob['submission'] > 1 or j.runningJob['status'] != 'C' or \
383 +                    j.runningJob['statusScheduler'] != 'Created':
384 +                return False
385 +        return True
386 +
387 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines