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.20 by spiga, Tue Apr 22 10:37:00 2008 UTC vs.
Revision 1.35.2.1 by fanzago, Tue Jun 24 15:20:56 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:
188 <            print "Id: ",Job['id']
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 206 | Line 212 | class DBinterface:
212              for job in task.jobs:
213                  toPrint=''
214                  common.bossSession.getRunningInstance(job)
215 <                toPrint = "%-5s %-50s " % (job['id'],job.runningJob['schedulerId'])
215 >                toPrint = "%-5s %-50s " % (job['jobId'],job.runningJob['schedulerId'])
216                  lines.append(toPrint)
217              header+= "%-5s %-50s " % ('Job:','ID' )
218          displayReport(self,header,lines)
# Line 299 | Line 305 | class DBinterface:
305              matched.append(i.runningJob[field])
306          return matched
307  
308 +    def newRunJobs(self,nj='all'):
309 +        """
310 +        Get new running instances
311 +        """  
312 +        task = self.getTask(nj)
313 +
314 +        for job in task.jobs:
315 +            common.bossSession.getNewRunningInstance(job)
316 +            job.runningJob['status'] = 'C'
317 +            job.runningJob['statusScheduler'] = 'Created'
318 +        common.bossSession.updateDB(task)    
319 +        return        
320 +
321      def deserXmlStatus(self, reportList):
322  
323          task = self.getTask()
305
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'])
311 <            # 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 <            # Data alignment
319 <            jobStatus = str(job.runningJob['statusScheduler'])
320 <            if rForJ.getAttribute('status') not in ['Created', 'Submitting']:
321 <                job.runningJob['statusScheduler'] = str( rForJ.getAttribute('status') )
322 <                jobStatus = str(job.runningJob['statusScheduler'])
323 <                job.runningJob['status'] = str( rForJ.getAttribute('sched_status') )
324 <
325 <            job.runningJob['destination'] = str( rForJ.getAttribute('site') )
326 <            dest = str(job.runningJob['destination']).split(':')[0]
327 <
328 <            job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') )
329 <            exe_exit_code = str(job.runningJob['applicationReturnCode'])
330 <
331 <            job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
332 <            job_exit_code = str(job.runningJob['wrapperReturnCode'])
333 <
334 <            if str( rForJ.getAttribute('resubmit') ).isdigit():
335 <                job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))
336 <            # TODO cleared='0' field, how should it be handled/mapped in BL? #Fabio
340 >        task_new = self.getTask()
341  
342 <        common.bossSession.updateDB( task )
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 >            if str(job.runningJob['status']) != 'EE':
353 >                if rForJ.getAttribute('status') not in ['Created', 'Submitting', 'Unknown'] and \
354 >                   job.runningJob['statusScheduler'] != 'Cleared' and \
355 >                   not (job.runningJob['statusScheduler'] == 'Killing' and rForJ.getAttribute('statusScheduler')!='Killed'):
356 >                       # update the status  
357 >                    common.logger.debug(3,"Updating DB status for job: " + str(id) + " @: " \
358 >                                          + str(rForJ.getAttribute('status')) )
359 >                    job.runningJob['statusScheduler'] = str( rForJ.getAttribute('status') )
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 >          
371 >                #if str( rForJ.getAttribute('resubmit') ).isdigit():
372 >                #    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))
373 >                #    job.runningJob['submission'] =  int(rForJ.getAttribute('resubmit'))
374 >          
375 >                # TODO cleared='0' field, how should it be handled/mapped in BL? #Fabio
376  
377 +        common.bossSession.updateDB( task_new )
378          return
379 +
380 +    # FIXME temporary method to verify what kind of submission to perform towards the server
381 +    def checkIfNeverSubmittedBefore(self):
382 +        for j in self.getTask().jobs:
383 +            if j.runningJob['submission'] > 1 or j.runningJob['status'] != 'C' or \
384 +                    j.runningJob['statusScheduler'] != 'Created':
385 +                return False
386 +        return True
387 +
388 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines