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.70 by spiga, Wed Jun 24 21:13:45 2009 UTC vs.
Revision 1.78 by spigafi, Wed Feb 3 14:59:30 2010 UTC

# Line 8 | Line 8 | __version__ = "$Revision$"
8   from SchedulerGrid import SchedulerGrid
9   from crab_exceptions import *
10   from crab_util import *
11 from GliteConfig import *
11   import EdgLoggingInfo
12   import common
13   from WMCore.SiteScreening.BlackWhiteListParser import CEBlackWhiteListParser
# Line 44 | Line 43 | class SchedulerGlite(SchedulerGrid):
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
48        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):
# Line 92 | 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:
# Line 224 | 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 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