ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

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

Comparing COMP/CRAB/python/SchedulerCaf.py (file contents):
Revision 1.6.2.1 by fanzago, Tue Jul 1 14:15:39 2008 UTC vs.
Revision 1.12 by spiga, Tue May 26 10:23:01 2009 UTC

#	Line 1 | Line 1
1		from Scheduler import Scheduler
2		from SchedulerLsf import SchedulerLsf
3		from crab_exceptions import *
4	–	from crab_logger import Logger
4		import common
5
6		import os,string
#	Line 17 | Line 16 | class SchedulerCaf(SchedulerLsf) :
16		def __init__(self):
17		SchedulerLsf.__init__(self)
18		Scheduler.__init__(self,"CAF")
19	+
20		return
21
22		def configure(self, cfg_params):
#	Line 24 | Line 24 | class SchedulerCaf(SchedulerLsf) :
24		CAF is just a special queue and resources for LSF at CERN
25		"""
26		SchedulerLsf.configure(self, cfg_params)
27	<	self.queue = cfg_params.get(self.name().upper()+'.queue','cmscaf')
27	>	self.queue = cfg_params.get(self.name().upper()+'.queue','cmscaf1nw')
28		self.res = cfg_params.get(self.name().upper()+'.resource','cmscaf')
29	+	self.pool = cfg_params.get('USER.storage_pool','cmscafuser')
30
31		def wsSetupEnvironment(self):
32		"""
#	Line 33 | Line 34 | class SchedulerCaf(SchedulerLsf) :
34		"""
35		txt = SchedulerLsf.wsSetupEnvironment(self)
36		txt += '# CAF specific stuff\n'
37	<	txt += 'export STAGE_SVCCLASS=cmscaf\n'
37	>	#txt += 'export STAGE_SVCCLASS=cmscaf \n'
38		txt += '\n'
39		return txt
40
41		def wsCopyOutput(self):
42		### default is the name of the storage pool
43		### where users can copy job outputs
44	<	pool='default'
44	<	txt=self.wsCopyOutput_tmp(pool)
44	>	txt=self.wsCopyOutput_comm(self.pool)
45		return txt

Diff Legend

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