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.42 by mcinquil, Wed Aug 20 16:40:10 2008 UTC vs.
Revision 1.60 by spiga, Fri May 29 17:11:39 2009 UTC

# Line 1 | Line 1
1 from crab_logger import Logger
1   from crab_exceptions import *
2   from crab_util import *
3   import common
# Line 56 | Line 55 | class DBinterface:
55          Return task with all/list of jobs
56          """
57          try:
58 <            task = common.bossSession.load(1,jobsList)[0]
58 >            task = common.bossSession.load(1,jobsList)
59          except Exception, e :
60 <            common.logger.debug(3, "Error while getting task : " +str(traceback.format_exc()))
60 >            common.logger.debug( "Error while getting task : " +str(traceback.format_exc()))
61              raise CrabException('Error while getting task '+str(e))
62          return task
63  
# Line 67 | Line 66 | class DBinterface:
66          Return a task with a single job
67          """
68          try:
69 <            task = common.bossSession.load(1,str(n))[0]
69 >            task = common.bossSession.load(1,str(n))
70          except Exception, e :
71 <            common.logger.debug(3, "Error while getting job : " +str(traceback.format_exc()))
71 >            common.logger.debug( "Error while getting job : " +str(traceback.format_exc()))
72              raise CrabException('Error while getting job '+str(e))
73          return task
74  
# Line 81 | Line 80 | class DBinterface:
80          """
81          opt={}
82          if optsToSave.get('server_mode',0) == 1: opt['serverName']=optsToSave['server_name']
83 <        opt['name']=common.work_space.taskName()  
83 >        opt['name']= getUserName()+ '_' + string.split(common.work_space.topDir(),'/')[-2]+'_'+common.work_space.task_uuid()
84          task = Task( opt )
85          try:
86              common.bossSession.saveTask( task )
87          except Exception, e :
89           # common.logger.debug(3, "Error creating task : " +str(traceback.format_exc()))
90           # raise CrabException('Error creating task '+str(e))
88              raise CrabException('Error creating task '+str(traceback.format_exc()))
89              
90          return
# Line 198 | Line 195 | class DBinterface:
195              tmp_task = self.getTask()
196          return common.bossSession.serialize(tmp_task)  
197  
198 <    def queryID(self,server_mode=0):
198 >    def queryID(self,server_mode=0, jid=False):
199          '''
200          Return the taskId if serevr_mode =1
201          Return the joblistId if serevr_mode =0
# Line 207 | Line 204 | class DBinterface:
204          lines=[]
205          task = self.getTask()
206          if server_mode == 1:
207 <            header= "Task Id = %-40s " %(task['name'])
208 <        else:
207 >            # init client server params...
208 >            CliServerParams(self)      
209 >            headerTask= "Task Id = %-40s " %(task['name'])
210 >            displayReport(self,headerTask,lines)
211 >            common.logger.info(showWebMon(self.server_name))
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 256 | Line 257 | class DBinterface:
257          try:
258              task = common.bossSession.loadJobDist( 1, attr )
259          except Exception, e :
260 <            common.logger.debug(3, "Error loading Jobs By distinct Attr : " +str(traceback.format_exc()))
260 >            common.logger.debug( "Error loading Jobs By distinct Attr : " +str(traceback.format_exc()))
261              raise CrabException('Error loading Jobs By distinct Attr '+str(e))
262  
263          for i in task: distAttr.append(i[attr])  
# Line 270 | Line 271 | class DBinterface:
271          try:
272              task = common.bossSession.loadJobDistAttr( 1, attr_1, attr_2, list )
273          except Exception, e :
274 <            common.logger.debug(3, "Error loading Jobs By distinct Attr : " +str(traceback.format_exc()))
274 >            common.logger.debug( "Error loading Jobs By distinct Attr : " +str(traceback.format_exc()))
275              raise CrabException('Error loading Jobs By distinct Attr '+str(e))
276  
277          for i in task: distAttr.append(i[attr_1])  
# Line 284 | Line 285 | class DBinterface:
285          try:
286              task = common.bossSession.loadJobsByAttr(attr )
287          except Exception, e :
288 <            common.logger.debug(3, "Error loading Jobs By Attr : " +str(traceback.format_exc()))
288 >            common.logger.debug( "Error loading Jobs By Attr : " +str(traceback.format_exc()))
289              raise CrabException('Error loading Jobs By Attr '+str(e))
290          for i in task:
291              matched.append(i[field])
# Line 299 | Line 300 | class DBinterface:
300          try:
301              task = common.bossSession.loadJobsByRunningAttr(attr)
302          except Exception, e :
303 <            common.logger.debug(3, "Error loading Jobs By Running Attr : " +str(traceback.format_exc()))
303 >            common.logger.debug( "Error loading Jobs By Running Attr : " +str(traceback.format_exc()))
304              raise CrabException('Error loading Jobs By Running Attr '+str(e))
305          for i in task:
306              matched.append(i.runningJob[field])
# Line 315 | Line 316 | class DBinterface:
316              common.bossSession.getNewRunningInstance(job)
317              job.runningJob['status'] = 'C'
318              job.runningJob['statusScheduler'] = 'Created'
319 +            job.runningJob['state'] = 'Created'
320          common.bossSession.updateDB(task)    
321          return        
322  
# Line 332 | Line 334 | class DBinterface:
334                  if r.getAttribute('id') in [ id, 'all']:
335                      rForJ = r
336                      break
337 <            ## Check the submission number and create new running jobs on the client side          
338 <            if int(job.runningJob['submission']) < int(rForJ.getAttribute('resubmit')) + 1:
339 <                nj_list.append(id)
340 <                self.newRunJobs(nj_list)
337 >            ## Check the submission number and create new running jobs on the client side
338 >            if rForJ.getAttribute('resubmit') != 'None' and (rForJ.getAttribute('status') not in ['Cleared','Killed','Done','Done (Failed)','Not Submitted', 'Cancelled by user']) :
339 >                if int(job.runningJob['submission']) < int(rForJ.getAttribute('resubmit')) + 1:
340 >                    nj_list.append(id)
341 >            if len(nj_list) > 0: self.newRunJobs(nj_list)
342  
343          task_new = self.getTask()
344  
# Line 346 | Line 349 | class DBinterface:
349              for r in reportList:
350                  if r.getAttribute('id') in [ id, 'all']:
351                      rForJ = r
352 <                    break
353 <
352 >                    break
353 >                  
354              # Data alignment
355 <            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','Cleared'])  :
355 >            if rForJ.getAttribute('status') not in ['Created', 'Unknown']:
356                     # update the status  
357 <                common.logger.debug(3,"Updating DB status for job: " + str(id) + " @: " \
357 >                common.logger.debug("Updating DB status for job: " + str(id) + " @: " \
358                                        + str(rForJ.getAttribute('status')) )
359                  job.runningJob['statusScheduler'] = str( rForJ.getAttribute('status') )
360                  if (rForJ.getAttribute('status') == 'Done' or rForJ.getAttribute('status') == 'Done (Failed)')\
# Line 362 | Line 363 | class DBinterface:
363                  else:
364                      job.runningJob['status'] = str( rForJ.getAttribute('sched_status') )
365            
366 +                job.runningJob['schedulerId'] = str( rForJ.getAttribute('sched_id') )
367 +
368                  job.runningJob['destination'] = str( rForJ.getAttribute('site') )
369                  dest = str(job.runningJob['destination']).split(':')[0]
370                
# Line 370 | Line 373 | class DBinterface:
373                
374                  job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
375                  job_exit_code = str(job.runningJob['wrapperReturnCode'])
376 +
377 +                ## unsing 'standardInput' field for 'ended' tag ['Y','N']
378 +                job['standardInput'] = str( rForJ.getAttribute('ended') )
379 +
380 +                job.runningJob['state'] = str( rForJ.getAttribute('action') )
381            
382              #if str( rForJ.getAttribute('resubmit') ).isdigit():
383              #    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines