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.62 by ewv, Wed Sep 10 14:41:00 2008 UTC vs.
Revision 1.75 by spiga, Sun Jan 17 19:01:08 2010 UTC

# Line 6 | Line 6 | __revision__ = "$Id$"
6   __version__ = "$Revision$"
7  
8   from SchedulerGrid import SchedulerGrid
9 from crab_logger import Logger
9   from crab_exceptions import *
10   from crab_util import *
12 from GliteConfig import *
11   import EdgLoggingInfo
12   import common
13 + from WMCore.SiteScreening.BlackWhiteListParser import CEBlackWhiteListParser
14  
15   import os, sys, time
16  
# Line 31 | Line 30 | class SchedulerGlite(SchedulerGrid):
30          with real scheduler
31          """
32          self.rb_param_file=''
33 <        if (cfg_params.has_key('EDG.rb')):
34 <            cfg_params['EDG.rb']='CERN'
35 <        self.rb_param_file=common.scheduler.rb_configure(cfg_params.get("EDG.rb"))
36 <        self.wms_service=cfg_params.get("EDG.wms_service",'')
37 <        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
# 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
53          glite_config = None
54          rb_param_file = None
55 +        configFileName = 'glite_wms_'+str(RB)+'.conf'
56  
57 <        gliteConfig = GliteConfig(RB)
58 <        glite_config = gliteConfig.config()
57 >        results = Downloader(url, os.getcwd())
58 >        gliteConfig  = results.filePath(configFileName)
59  
60          if (glite_config ):
61              rb_param_file = glite_config
# Line 59 | Line 65 | class SchedulerGlite(SchedulerGrid):
65          """
66          Returns string with requirement CE related
67          """
68 +        ceParser = CEBlackWhiteListParser(self.EDG_ce_white_list,
69 +                                          self.EDG_ce_black_list, common.logger())
70          req = ''
71 +        ce_white_list = []
72 +        ce_black_list = []
73          if self.EDG_ce_white_list:
74 <            ce_white_list = self.EDG_ce_white_list
74 >            ce_white_list = ceParser.whiteList()
75              tmpCe=[]
76              concString = '&&'
77              for ce in ce_white_list:
# Line 80 | Line 90 | class SchedulerGlite(SchedulerGrid):
90                      req += ") "
91  
92          if self.EDG_ce_black_list:
93 <            ce_black_list = self.EDG_ce_black_list
93 >            ce_black_list = ceParser.blackList()
94              tmpCe=[]
95              concString = '&&'
96              for ce in ce_black_list:
# Line 88 | Line 98 | class SchedulerGlite(SchedulerGrid):
98              if len(tmpCe): req += " && (" + concString.join(tmpCe) + ") "
99  
100          # requirement added to skip gliteCE
101 <        req += '&& (!RegExp("blah", other.GlueCEUniqueId))'
101 >        # not more needed
102 > #       req += '&& (!RegExp("blah", other.GlueCEUniqueId))'
103 >        retWL = ','.join(ce_white_list)
104 >        retBL = ','.join(ce_black_list)
105 >        if not retWL:
106 >            retWL = None
107 >        if not retBL:
108 >            retBL = None
109  
110 <        return req,self.EDG_ce_white_list,self.EDG_ce_black_list
110 >        return req, retWL, retBL
111  
112      def se_list(self, dest):
113          """
# Line 174 | Line 191 | class SchedulerGlite(SchedulerGrid):
191              itr4 = replicas
192          return itr4
193  
194 +    def delegateProxy(self):
195 +        self.boss().delegateProxy()  
196 +        return
197  
198      def wsExitFunc(self):
199          """
# Line 211 | Line 231 | class SchedulerGlite(SchedulerGrid):
231          txt += '    else\n'
232          txt += '        tar zcvf ${out_files}.tgz CMSSW_${NJob}.stdout CMSSW_${NJob}.stderr\n'
233          txt += '    fi\n'
234 +        txt += '    python $RUNTIME_AREA/fillCrabFjr.py $RUNTIME_AREA/crab_fjr_$NJob.xml --errorcode $job_exit_code \n'
235          txt += '    exit $job_exit_code\n'
236  
237          txt += '}\n'

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines