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.8 by belforte, Fri Aug 10 14:57:24 2012 UTC vs.
Revision 1.9 by belforte, Fri Aug 10 17:04:28 2012 UTC

#	Line 13 | Line 13 | from WMCore.SiteScreening.BlackWhiteList
13		import common
14		import os
15		import socket
16	+	import re
17
18		# FUTURE: for python 2.4 & 2.6
19		try:
#	Line 38 | Line 39 | class SchedulerRcondor(SchedulerGrid) :
39		self.OSBsize = 50*1000*1000 # 50 MB
40
41		self.environment_unique_identifier = None
42	+
43		return
44
45
#	Line 55 | Line 57 | class SchedulerRcondor(SchedulerGrid) :
57		self.group = cfg_params.get("GRID.group", None)
58		self.role = cfg_params.get("GRID.role", None)
59		self.VO = cfg_params.get('GRID.virtual_organization','cms')
60	+
61	+	self.cmsswVer  = os.environ["CMSSW_VERSION"]
62	+	self.scramArch = os.environ["SCRAM_ARCH"]
63
64		try:
65		tmp =  cfg_params['CMSSW.datasetpath']
#	Line 99 | Line 104 | class SchedulerRcondor(SchedulerGrid) :
104		seString=self.blackWhiteListParser.cleanForBlackWhiteList(seDest)
105
106		jobParams += '+DESIRED_SEs = "'+seString+'"; '
107	+
108	+	cmsVersion=self.cmsswVer
109	+	cmsver=re.split('_', cmsVersion)
110	+	numericCmsVersion = "%s%.2d%.2d" %(cmsver[1], int(cmsver[2]), int(cmsver[3]))
111	+
112	+	jobParams += '+DESIRED_CMSVersion ="' +cmsVersion+'";'
113	+	jobParams += '+DESIRED_CMSVersionNr ="' +numericCmsVersion+'";'
114	+
115		myschedName = self.rcondorHost
116		jobParams += '+Glidein_MonitorID = "https://'+ myschedName + '//$(Cluster).$(Process)"; '
117

Diff Legend

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