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

Comparing COMP/CRAB/python/SchedulerGlite.py (file contents):
Revision 1.56 by spiga, Mon May 26 16:57:35 2008 UTC vs.
Revision 1.78 by spigafi, Wed Feb 3 14:59:30 2010 UTC

# Line 1 | Line 1
1 + """
2 + CRAB interface to BossLite gLite Scheduler
3 + """
4 +
5 + __revision__ = "$Id$"
6 + __version__ = "$Revision$"
7 +
8   from SchedulerGrid import SchedulerGrid
2 from crab_logger import Logger
9   from crab_exceptions import *
10   from crab_util import *
5 from GliteConfig import *
11   import EdgLoggingInfo
12   import common
13 + from WMCore.SiteScreening.BlackWhiteListParser import CEBlackWhiteListParser
14  
15   import os, sys, time
16  
# Line 16 | Line 22 | class SchedulerGlite(SchedulerGrid):
22  
23      def configure(self,cfg_params):
24          SchedulerGrid.configure(self, cfg_params)
25 <        self.checkProxy()
20 <        self.environment_unique_identifier = 'GLITE_WMS_JOBID'
25 >        self.environment_unique_identifier = '$GLITE_WMS_JOBID'
26  
27      def realSchedParams(self,cfg_params):
28          """
29 <        Return dictionary with specific parameters, to use
30 <        with real scheduler  
29 >        Return dictionary with specific parameters, to use
30 >        with real scheduler
31          """
32          self.rb_param_file=''
33 <        if (cfg_params.has_key('EDG.rb')):
34 <            self.rb_param_file=common.scheduler.rb_configure(cfg_params.get("EDG.rb"))
35 <        self.wms_service=cfg_params.get("EDG.wms_service",'')
36 <        self.skipWMSAuth=cfg_params.get("EDG.skipwmsauth",0)
33 >        if (not cfg_params.has_key('GRID.rb')):
34 >            cfg_params['GRID.rb']='CERN'
35 >        self.rb_param_file=common.scheduler.rb_configure(cfg_params.get("GRID.rb"))
36 >        self.wms_service=cfg_params.get("GRID.wms_service",'')
37 >        self.skipWMSAuth=cfg_params.get("GRID.skipwmsauth",1)
38          params = { 'service' : self.wms_service, \
39                     'config' : self.rb_param_file, \
40 <                   'skipWMSAuth' : self.skipWMSAuth
40 >                   'skipWMSAuth' : self.skipWMSAuth
41                   }
42          return  params
43 <      
43 >
44  
45      def rb_configure(self, RB):
46 +        url ='http://cmsdoc.cern.ch/cms/LCG/crab/config/'
47 +        from Downloader import Downloader
48 +        common.logger.debug('Downloading config files for WMS: '+url)
49 +        ## 25-Jun-2009 SL: patch to use Cream enabled WMS
50 +        if ( self.cfg_params.get('GRID.use_cream',None) ):
51 +            RB='CREAM'
52          if not RB: return None
41        glite_config = None
53          rb_param_file = None
54 +        configFileName = 'glite_wms_'+str(RB)+'.conf'
55  
56 <        gliteConfig = GliteConfig(RB)
57 <        glite_config = gliteConfig.config()
56 >        results = Downloader(url)
57 >        gliteConfig  = results.filePath(configFileName)
58  
59 <        if (glite_config ):
60 <            rb_param_file = glite_config
59 >        if (gliteConfig ):
60 >            rb_param_file = gliteConfig
61          return rb_param_file
62  
63      def ce_list(self):
64          """
65          Returns string with requirement CE related
66          """
67 +        ceParser = CEBlackWhiteListParser(self.EDG_ce_white_list,
68 +                                          self.EDG_ce_black_list, common.logger())
69          req = ''
70 +        ce_white_list = []
71 +        ce_black_list = []
72          if self.EDG_ce_white_list:
73 <            ce_white_list = self.EDG_ce_white_list
73 >            ce_white_list = ceParser.whiteList()
74              tmpCe=[]
75              concString = '&&'
76              for ce in ce_white_list:
# Line 73 | Line 89 | class SchedulerGlite(SchedulerGrid):
89                      req += ") "
90  
91          if self.EDG_ce_black_list:
92 <            ce_black_list = self.EDG_ce_black_list
92 >            ce_black_list = ceParser.blackList()
93              tmpCe=[]
94              concString = '&&'
95              for ce in ce_black_list:
# Line 81 | Line 97 | class SchedulerGlite(SchedulerGrid):
97              if len(tmpCe): req += " && (" + concString.join(tmpCe) + ") "
98  
99          # requirement added to skip gliteCE
100 <        req += '&& (!RegExp("blah", other.GlueCEUniqueId))'
100 >        # not more needed
101 > #       req += '&& (!RegExp("blah", other.GlueCEUniqueId))'
102 >        retWL = ','.join(ce_white_list)
103 >        retBL = ','.join(ce_black_list)
104 >        if not retWL:
105 >            retWL = None
106 >        if not retBL:
107 >            retBL = None
108  
109 <        return req,self.EDG_ce_white_list,self.EDG_ce_black_list
109 >        return req, retWL, retBL
110  
111 <    def se_list(self, id, dest):
111 >    def se_list(self, dest):
112          """
113          Returns string with requirement SE related
114          """
115 <        hostList=self.findSites_(id,dest)
115 >        hostList=self.findSites_(dest)
116          req=''
117          reqtmp=[]
118          concString = '||'
# Line 109 | Line 132 | class SchedulerGlite(SchedulerGrid):
132          if self.EDG_addJdlParam:
133              if self.EDG_addJdlParam[-1] == '': self.EDG_addJdlParam= self.EDG_addJdlParam[:-1]
134              for p in self.EDG_addJdlParam:
135 <                req+=string.strip(p)+';\n'
135 >                req+=string.strip(p)+';\n'
136          return req
137  
138      def specific_req(self):
# Line 127 | Line 150 | class SchedulerGlite(SchedulerGrid):
150  
151          return req
152  
130    def sched_fix_parameter(self):
131        """
132        Returns string with requirements and scheduler-specific parameters
133        """
134        index = int(common._db.nJobs())
135        job = common.job_list[index-1]
136        jbt = job.type()
137        req = ''
138        req = req + jbt.getRequirements()
139
140        if self.EDG_requirements:
141            if (not req == ' '): req = req +  ' && '
142            req = req + self.EDG_requirements
143
144        Task_Req={'jobType':req}
145        common._db.updateTask_(Task_Req)
146
153      def sched_parameter(self,i,task):
154          """
155          Returns string with requirements and scheduler-specific parameters
156          """
157 <        dest=  task.jobs[i-1]['dlsDestination']
157 >        dest=  task.jobs[i-1]['dlsDestination']
158  
159          req=''
160          req +=task['jobType']
161  
162          sched_param=''
163 <        sched_param+='Requirements = ' + req +self.specific_req() + self.se_list(i,dest) +\
164 <                                        self.ce_list()[0] +';\n'
165 <        if self.EDG_addJdlParam: sched_param+=self.jdlParam()
163 >        sched_param+='Requirements = ' + req +self.specific_req() + self.se_list(dest) +\
164 >                                        self.ce_list()[0] +';\n'
165 >        if self.EDG_addJdlParam: sched_param+=self.jdlParam()
166          sched_param+='MyProxyServer = "' + self.proxyServer + '";\n'
167          sched_param+='VirtualOrganisation = "' + self.VO + '";\n'
168          sched_param+='RetryCount = '+str(self.EDG_retry_count)+';\n'
# Line 172 | Line 178 | class SchedulerGlite(SchedulerGrid):
178          reason = loggingInfo.decodeReason(file)
179          return reason
180  
181 <    def findSites_(self, n, sites):
181 >    def findSites_(self, sites):
182          itr4 =[]
183          if len(sites)>0 and sites[0]=="":
184              return itr4
185          if sites != [""]:
186 <            replicas = self.blackWhiteListParser.checkBlackList(sites,n)
186 >            replicas = self.blackWhiteListParser.checkBlackList(sites)
187              if len(replicas)!=0:
188 <                replicas = self.blackWhiteListParser.checkWhiteList(replicas,n)
188 >                replicas = self.blackWhiteListParser.checkWhiteList(replicas)
189  
190              itr4 = replicas
191          return itr4
192  
193 <    
193 >    def delegateProxy(self):
194 >        self.boss().delegateProxy()  
195 >        return
196 >
197      def wsExitFunc(self):
198          """
199          """
# Line 199 | Line 208 | class SchedulerGlite(SchedulerGrid):
208          ### specific Glite check for OSB
209          txt += '    tar zcvf ${out_files}.tgz  ${final_list}\n'
210          txt += '    tmp_size=`ls -gGrta ${out_files}.tgz | awk \'{ print $3 }\'`\n'
211 <        txt += '    rm ${out_files}.tgz\n'  
211 >        txt += '    rm ${out_files}.tgz\n'
212          txt += '    size=`expr $tmp_size`\n'
213          txt += '    echo "Total Output dimension: $size"\n'
214 <        txt += '    limit='+str(self.OSBsize) +' \n'  
214 >        txt += '    limit='+str(self.OSBsize) +' \n'
215          txt += '    echo "WARNING: output files size limit is set to: $limit"\n'
216          txt += '    if [ "$limit" -lt "$size" ]; then\n'
217          txt += '        exceed=1\n'
# Line 221 | Line 230 | class SchedulerGlite(SchedulerGrid):
230          txt += '    else\n'
231          txt += '        tar zcvf ${out_files}.tgz CMSSW_${NJob}.stdout CMSSW_${NJob}.stderr\n'
232          txt += '    fi\n'
233 +        txt += '    python $RUNTIME_AREA/fillCrabFjr.py $RUNTIME_AREA/crab_fjr_$NJob.xml --errorcode $job_exit_code \n'
234          txt += '    exit $job_exit_code\n'
235  
236          txt += '}\n'
237          return txt
238  
239 <    def userName(self):
240 <        """ return the user name """
241 <        tmp=runCommand("voms-proxy-info -identity")
242 <        return tmp.strip()
239 >    def listMatch(self, dest, full):
240 >        matching='fast'
241 >        
242 >        if self.boss().schedulerConfig['name'] == 'SchedulerGLite' :
243 >            taskId=common._db.getTask()
244 >            req=str(self.sched_parameter(1,taskId))
245 >            sites = self.boss().schedSession().matchResources(taskId, requirements=req)
246 >        else :
247 >            sites = SchedulerGrid.listMatch(self, dest, full)
248 >            
249 >        if full == True: matching='full'
250 >        common.logger.debug("list of available site ( "+str(matching) +" matching ) : "+str(sites))
251 >        
252 >        return sites

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines