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.3 by slacapra, Mon Oct 9 15:30:41 2006 UTC vs.
Revision 1.18 by mcinquil, Wed Oct 3 16:31:25 2007 UTC

# Line 1 | Line 1
1 #from Scheduler import Scheduler
1   from SchedulerEdg import SchedulerEdg
2   from crab_logger import Logger
3   from crab_exceptions import *
4   from crab_util import *
5 < from EdgConfig import *
5 > from GliteConfig import *
6   import common
7  
8   import os, sys, time
# Line 12 | Line 11 | class SchedulerGlite(SchedulerEdg):
11      def __init__(self):
12          SchedulerEdg.__init__(self)
13  
14 +    def rb_configure(self, RB):
15 +        self.glite_config = ''
16 +        self.rb_param_file = ''
17 +
18 +        gliteConfig = GliteConfig(RB)
19 +        self.glite_config = gliteConfig.config()
20 +
21 +        if (self.glite_config != ''):
22 +            self.rb_param_file = 'WMSconfig = '+self.glite_config+';\n'
23 +            #print "rb_param_file = ", self.rb_param_file
24 +        return self.rb_param_file
25 +
26      def sched_parameter(self):
27          """
28          Returns file with requirements and scheduler-specific parameters
# Line 33 | Line 44 | class SchedulerGlite(SchedulerEdg):
44    
45          req = ''
46          req = req + jbt.getRequirements()
47 <    
47 >  
48 >  
49          if self.EDG_requirements:
50 <            if (req == ' '):
51 <                req = req + self.EDG_requirements
52 <            else:
41 <                req = req +  ' && ' + self.EDG_requirements
50 >            if (not req == ' '): req = req +  ' && '
51 >            req = req + self.EDG_requirements
52 >
53          if self.EDG_ce_white_list:
54              ce_white_list = string.split(self.EDG_ce_white_list,',')
55 <            for i in range(len(ce_white_list)):
56 <                if i == 0:
57 <                    if (req == ' '):
58 <                        req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
59 <                    else:
49 <                        req = req +  ' && ((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
50 <                    pass
51 <                else:
52 <                    req = req +  ' || (RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
53 <            req = req + ')'
55 >            tmpCe=[]
56 >            concString = '&&'
57 >            for ce in ce_white_list:
58 >                tmpCe.append('RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId)')
59 >            if len(tmpCe): req = req + " && (" + concString.join(tmpCe) + ") "
60          
61          if self.EDG_ce_black_list:
62              ce_black_list = string.split(self.EDG_ce_black_list,',')
63 +            tmpCe=[]
64 +            concString = '&&'
65              for ce in ce_black_list:
66 <                if (req == ' '):
67 <                    req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
68 <                else:
61 <                    req = req +  ' && (!RegExp("' + ce + '", other.GlueCEUniqueId))'
62 <                pass
66 >                tmpCe.append('(!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))')
67 >            if len(tmpCe): req = req + " && (" + concString.join(tmpCe) + ") "
68 >
69          if self.EDG_clock_time:
70 <            if (req == ' '):
71 <                req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
66 <            else:
67 <                req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
70 >            if (not req == ' '): req = req + ' && '
71 >            req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
72  
73          if self.EDG_cpu_time:
74 <            if (req == ' '):
75 <                req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
72 <            else:
73 <                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
74 >            if (not req == ' '): req = req + ' && '
75 >            req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
76                  
77          for i in range(len(first)): # Add loop DS
78              self.param='sched_param_'+str(i)+'.clad'
79              param_file = open(common.work_space.shareDir()+'/'+self.param, 'w')
80  
81              itr4=self.findSites_(first[i])
82 <            req1=[]  
83 <            j = 0
82 >            reqSites=''
83 >            reqtmp=[]  
84              concString = '||'
85 +
86 +            #############
87 +            # MC Changed matching syntax to avoid gang matching
88 +            #############
89              for arg in itr4:
90 <                #############
91 <                # MC Changed matching syntax to avoid gang matching
92 <                #############
93 <                req1.append(' Member("'+arg+'" , other.GlueCESEBindGroupSEUniqueID) ')
94 <            if len(req1): req = req + " && (" + concString.join(req1) + ')'
95 <            req = req + ';\n'
96 <            param_file.write('Requirements = ' + req )
90 >                reqtmp.append(' Member("'+arg+'" , other.GlueCESEBindGroupSEUniqueID) ')
91 >
92 >            if len(reqtmp): reqSites = reqSites + " && (" + concString.join(reqtmp) + ") "
93 >
94 >            # requirement added to skip gliteCE
95 >            reqSites = reqSites + '&& (!RegExp("blah", other.GlueCEUniqueId));\n'
96 >
97 >            param_file.write('Requirements = ' + req + reqSites )
98    
99 <            if (self.edg_config and self.edg_config_vo != ''):
100 <                param_file.write('RBconfig = "'+self.edg_config+'";\n')  
101 <                param_file.write('RBconfigVO = "'+self.edg_config_vo+'";')
99 >            if (self.rb_param_file != ''):
100 >                param_file.write(self.rb_param_file)  
101 >
102 >            if len(self.EDG_addJdlParam):
103 >                for p in self.EDG_addJdlParam:
104 >                    param_file.write(p)
105  
106              param_file.close()  
107  
# Line 151 | Line 161 | class SchedulerGlite(SchedulerEdg):
161          
162          txt += '\n\n'
163  
164 <        if int(self.copy_data) == 1:
165 <           if self.SE:
166 <              txt += 'export SE='+self.SE+'\n'
167 <              txt += 'echo "SE = $SE"\n'
168 <           if self.SE_PATH:
169 <              if ( self.SE_PATH[-1] != '/' ) : self.SE_PATH = self.SE_PATH + '/'
170 <              txt += 'export SE_PATH='+self.SE_PATH+'\n'
171 <              txt += 'echo "SE_PATH = $SE_PATH"\n'
164 >        #if int(self.copy_data) == 1:
165 >        #   if self.SE:
166 >        #      txt += 'export SE='+self.SE+'\n'
167 >        #      txt += 'echo "SE = $SE"\n'
168 >        #   if self.SE_PATH:
169 >        #      if ( self.SE_PATH[-1] != '/' ) : self.SE_PATH = self.SE_PATH + '/'
170 >        #      txt += 'export SE_PATH='+self.SE_PATH+'\n'
171 >        #      txt += 'echo "SE_PATH = $SE_PATH"\n'
172  
173          txt += 'export VO='+self.VO+'\n'
174          ### some line for LFC catalog setting
# Line 228 | Line 238 | class SchedulerGlite(SchedulerEdg):
238          retrieve the logging info from logging and bookkeeping and return it
239          """
240          self.checkProxy()
241 <        cmd = 'glite-job-logging-info -v 2 ' + id
241 >        cmd = 'glite-job-logging-info -v 3 ' + id
242          cmd_out = runCommand(cmd)
243          return cmd_out
244  
# Line 239 | Line 249 | class SchedulerGlite(SchedulerEdg):
249          return cmd_out
250  
251      def findSites_(self, n):
252 +        itr4 = []
253          sites = common.jobDB.destination(n)
254          if len(sites)>0 and sites[0]=="":
255 <            return []
256 <        return sites
255 >            return itr4
256 >        if sites != [""]:
257 >            ##Addedd Daniele
258 >            replicas = self.blackWhiteListParser.checkBlackList(sites,n)
259 >            if len(replicas)!=0:
260 >                replicas = self.blackWhiteListParser.checkWhiteList(replicas,n)
261 >              
262 >            if len(replicas)==0:
263 >                msg = 'No sites remaining that host any part of the requested data! Exiting... '
264 >                raise CrabException(msg)
265 >            itr4 = replicas
266 >            #####        
267 >        return itr4
268 >
269 >    def submitTout(self, list):
270 >        return 180
271 >

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines