ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CRAB/python/DBinterface.py

Comparing COMP/CRAB/python/DBinterface.py (file contents):
Revision 1.33 by spiga, Mon Jun 2 08:47:23 2008 UTC vs.
Revision 1.35.2.1 by fanzago, Tue Jun 24 15:20:56 2008 UTC

#	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 340 | Line 346 | class DBinterface:
346		for r in reportList:
347		if r.getAttribute('id') in [ id, 'all']:
348		rForJ = r
349	<	break
349	>	break
350	>
351		# Data alignment
352	<	jobStatus = str(job.runningJob['statusScheduler'])
353	<	if rForJ.getAttribute('statusScheduler') not in ['Created', 'Submitting', 'Unknown'] and \
354	<	job.runningJob['statusScheduler'] != 'Cleared':
355	<	job.runningJob['statusScheduler'] = str( rForJ.getAttribute('status') )
356	<	jobStatus = str(job.runningJob['statusScheduler'])
357	<	job.runningJob['status'] = str( rForJ.getAttribute('sched_status') )
358	<
359	<	job.runningJob['destination'] = str( rForJ.getAttribute('site') )
360	<	dest = str(job.runningJob['destination']).split(':')[0]
361	<
362	<	job.runningJob['applicationReturnCode'] = str( rForJ.getAttribute('exe_exit') )
363	<	exe_exit_code = str(job.runningJob['applicationReturnCode'])
364	<
365	<	job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
366	<	job_exit_code = str(job.runningJob['wrapperReturnCode'])
367	<
368	<	#if str( rForJ.getAttribute('resubmit') ).isdigit():
369	<	#    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))
370	<	#    job.runningJob['submission'] =  int(rForJ.getAttribute('resubmit'))
371	<
372	<	# TODO cleared='0' field, how should it be handled/mapped in BL? #Fabio
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

Diff Legend

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