ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/SchedulerRcondor.py
(Generate patch)

Comparing COMP/CRAB/python/SchedulerRcondor.py (file contents):
Revision 1.7 by belforte, Fri Aug 10 09:17:19 2012 UTC vs.
Revision 1.10 by belforte, Fri Aug 10 17:54:30 2012 UTC

# Line 7 | Line 7 | from crab_exceptions import CrabExceptio
7   from crab_util import runCommand
8   #from WMCore.SiteScreening.BlackWhiteListParser import CEBlackWhiteListParser
9   from WMCore.SiteScreening.BlackWhiteListParser import SEBlackWhiteListParser
10 + import Scram
11  
12  
13  
14   import common
15   import os
16   import socket
17 + import re
18  
19   # FUTURE: for python 2.4 & 2.6
20   try:
# Line 38 | Line 40 | class SchedulerRcondor(SchedulerGrid) :
40          self.OSBsize = 50*1000*1000 # 50 MB
41  
42          self.environment_unique_identifier = None
43 +
44          return
45  
46  
# Line 51 | Line 54 | class SchedulerRcondor(SchedulerGrid) :
54          self.proxyValid=0
55          self.dontCheckProxy=int(cfg_params.get("GRID.dont_check_proxy",0))
56          self.space_token = cfg_params.get("USER.space_token",None)
57 <        try:
55 <            self.proxyServer = Downloader("http://cmsdoc.cern.ch/cms/LCG/crab/config/").config("myproxy_server.conf")
56 <            self.proxyServer = self.proxyServer.strip()
57 <            if self.proxyServer is None:
58 <                raise CrabException("myproxy_server.conf retrieved but empty")
59 <        except Exception, e:
60 <            common.logger.info("Problem setting myproxy server endpoint: using myproxy.cern.ch")
61 <            common.logger.debug(e)
62 <            self.proxyServer= 'myproxy.cern.ch'
57 >        self.proxyServer= 'myproxy.cern.ch'
58          self.group = cfg_params.get("GRID.group", None)
59          self.role = cfg_params.get("GRID.role", None)
60          self.VO = cfg_params.get('GRID.virtual_organization','cms')
61 <
61 >        
62          try:
63              tmp =  cfg_params['CMSSW.datasetpath']
64              if tmp.lower() == 'none':
# Line 107 | Line 102 | class SchedulerRcondor(SchedulerGrid) :
102          seString=self.blackWhiteListParser.cleanForBlackWhiteList(seDest)
103  
104          jobParams += '+DESIRED_SEs = "'+seString+'"; '
105 +
106 +        scram = Scram.Scram(None)
107 +        cmsVersion = scram.getSWVersion()
108 +        scramArch  = scram.getArch()
109 +        
110 +        cmsver=re.split('_', cmsVersion)
111 +        numericCmsVersion = "%s%.2d%.2d" %(cmsver[1], int(cmsver[2]), int(cmsver[3]))
112 +
113 +        jobParams += '+DESIRED_CMSVersion ="' +cmsVersion+'";'
114 +        jobParams += '+DESIRED_CMSVersionNr ="' +numericCmsVersion+'";'
115 +        jobParams += '+DESIRED_CMSScramArch ="' +scramArch+'";'
116 +        
117          myschedName = self.rcondorHost
118          jobParams += '+Glidein_MonitorID = "https://'+ myschedName + '//$(Cluster).$(Process)"; '
119  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines