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.77 by spiga, Mon Jan 18 10:06:17 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
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):
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 80 | 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 88 | 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, dest):
112          """
# Line 174 | Line 190 | class SchedulerGlite(SchedulerGrid):
190              itr4 = replicas
191          return itr4
192  
193 +    def delegateProxy(self):
194 +        self.boss().delegateProxy()  
195 +        return
196  
197      def wsExitFunc(self):
198          """
# Line 211 | 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'

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines