ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

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

Comparing COMP/CRAB/python/SchedulerRcondor.py (file contents):
Revision 1.5 by belforte, Thu Jul 26 23:04:13 2012 UTC vs.
Revision 1.6 by belforte, Tue Aug 7 23:05:18 2012 UTC

#	Line 30 | Line 30 | class SchedulerRcondor(SchedulerGrid) :
30
31		def __init__(self):
32		SchedulerGrid.__init__(self,"RCONDOR")
33	+	self.rcondorHost   = os.getenv('RCONDOR_HOST')
34		self.datasetPath   = None
35		self.selectNoInput = None
36		self.OSBsize = 50*1000*1000 # 50 MB
#	Line 104 | Line 105 | class SchedulerRcondor(SchedulerGrid) :
105		seString=self.blackWhiteListParser.cleanForBlackWhiteList(seDest)
106
107		jobParams += '+DESIRED_SEs = "'+seString+'"; '
108	+	myschedName = self.rcondorHost
109	+	jobParams += '+Glidein_MonitorID = "https://'+ myschedName + '//$(Cluster).$(Process)"; '
110
111		if (self.EDG_clock_time):
112		jobParams += '+MaxWallTimeMins = '+self.EDG_clock_time+'; '
#	Line 127 | Line 130 | class SchedulerRcondor(SchedulerGrid) :
130		jobDir = common.work_space.jobDir()
131
132		taskDir=common.work_space.topDir().split('/')[-2]
133	<	rcondorDir ='%s/.rcondor/%s/mount/' % (os.getenv('HOME'),os.getenv('RCONDOR_HOST'))
133	>	rcondorDir ='%s/.rcondor/%s/mount/' % (os.getenv('HOME'),self.rcondorHost)
134	>
135	>	if (self.EDG_clock_time):
136	>	jobParams += '+MaxWallTimeMins = '+self.EDG_clock_time+'; '
137	>	else:
138	>	jobParams += '+MaxWallTimeMins = %d; ' % (60*24)
139	>
140	>	common._db.updateTask_({'jobType':jobParams})
141	>
142	>
143	>	return jobParams
144	>
145	>
146	>	def realSchedParams(self, cfg_params):
147	>	"""
148	>	Return dictionary with specific parameters, to use with real scheduler
149	>	is called when scheduler is initialized in Boss, i.e. at each crab command
150	>	"""
151	>
152	>	tmpDir = os.path.join(common.work_space.shareDir(),'.condor_temp')
153	>	tmpDir = os.path.join(common.work_space.shareDir(),'.condor_temp')
154	>	jobDir = common.work_space.jobDir()
155	>
156	>	taskDir=common.work_space.topDir().split('/')[-2]
157	>	rcondorDir ='%s/.rcondor/%s/mount/' % (os.getenv('HOME'),self.rcondorHost)
158		tmpDir = os.path.join(rcondorDir,taskDir)
159		tmpDir = os.path.join(tmpDir,'condor_temp')
160

Diff Legend

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