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.75 by spiga, Sun Jan 17 19:01:08 2010 UTC vs.
Revision 1.80 by farinafa, Thu Apr 29 10:23:06 2010 UTC

# Line 45 | Line 45 | class SchedulerGlite(SchedulerGrid):
45      def rb_configure(self, RB):
46          url ='http://cmsdoc.cern.ch/cms/LCG/crab/config/'
47          from Downloader import Downloader
48 +        import httplib
49          common.logger.debug('Downloading config files for WMS: '+url)
50          ## 25-Jun-2009 SL: patch to use Cream enabled WMS
51          if ( self.cfg_params.get('GRID.use_cream',None) ):
52              RB='CREAM'
53          if not RB: return None
53        glite_config = None
54          rb_param_file = None
55          configFileName = 'glite_wms_'+str(RB)+'.conf'
56  
57 <        results = Downloader(url, os.getcwd())
58 <        gliteConfig  = results.filePath(configFileName)
57 >        results = Downloader(url)
58 >        try:
59 >            gliteConfig  = results.filePath(configFileName)
60 >        except httplib.HTTPException, ex:
61 >            raise CrabException( "Problem getting RB config file: %s, reason:"%(configFileName, ex) )
62  
63 <        if (glite_config ):
64 <            rb_param_file = glite_config
63 >        if (gliteConfig ):
64 >            rb_param_file = gliteConfig
65          return rb_param_file
66  
67      def ce_list(self):
# Line 167 | Line 170 | class SchedulerGlite(SchedulerGrid):
170          sched_param+='MyProxyServer = "' + self.proxyServer + '";\n'
171          sched_param+='VirtualOrganisation = "' + self.VO + '";\n'
172          sched_param+='RetryCount = '+str(self.EDG_retry_count)+';\n'
173 +        sched_param+='DefaultNodeRetryCount = '+str(self.EDG_retry_count)+';\n'
174          sched_param+='ShallowRetryCount = '+str(self.EDG_shallow_retry_count)+';\n'
175 +        sched_param+='DefaultNodeShallowRetryCount = '+str(self.EDG_shallow_retry_count)+';\n'
176  
177          return sched_param
178  
# Line 236 | Line 241 | class SchedulerGlite(SchedulerGrid):
241  
242          txt += '}\n'
243          return txt
244 +
245 +    def listMatch(self, dest, full):
246 +        matching='fast'
247 +        
248 +        if self.boss().schedulerConfig['name'] == 'SchedulerGLite' :
249 +            taskId=common._db.getTask()
250 +            req=str(self.sched_parameter(1,taskId))
251 +            sites = self.boss().schedSession().matchResources(taskId, requirements=req)
252 +        else :
253 +            sites = SchedulerGrid.listMatch(self, dest, full)
254 +            
255 +        if full == True: matching='full'
256 +        common.logger.debug("list of available site ( "+str(matching) +" matching ) : "+str(sites))
257 +        
258 +        return sites

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines