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.55 by afanfani, Tue May 20 11:28:49 2008 UTC vs.
Revision 1.56 by spiga, Mon May 26 16:57:35 2008 UTC

# Line 109 | Line 109 | class SchedulerGlite(SchedulerGrid):
109          if self.EDG_addJdlParam:
110              if self.EDG_addJdlParam[-1] == '': self.EDG_addJdlParam= self.EDG_addJdlParam[:-1]
111              for p in self.EDG_addJdlParam:
112 <             #   param_file.write(string.strip(p)+';\n')
113 <                req+=string.strip(p)+';\n' ## BL--DS
112 >                req+=string.strip(p)+';\n'
113          return req
114  
115      def specific_req(self):
# Line 142 | Line 141 | class SchedulerGlite(SchedulerGrid):
141              if (not req == ' '): req = req +  ' && '
142              req = req + self.EDG_requirements
143  
144 <        Task_Req={'jobType':req}## DS--BL
144 >        Task_Req={'jobType':req}
145          common._db.updateTask_(Task_Req)
146  
147      def sched_parameter(self,i,task):
148          """
149          Returns string with requirements and scheduler-specific parameters
150          """
151 <        dest=  task.jobs[i-1]['dlsDestination'] ## DS--BL
151 >        dest=  task.jobs[i-1]['dlsDestination']
152  
153          req=''
154          req +=task['jobType']
155  
156          sched_param=''
157          sched_param+='Requirements = ' + req +self.specific_req() + self.se_list(i,dest) +\
158 <                                        self.ce_list()[0] +';\n' ## BL--DS
159 <        if self.EDG_addJdlParam: sched_param+=self.jdlParam() ## BL--DS
158 >                                        self.ce_list()[0] +';\n'
159 >        if self.EDG_addJdlParam: sched_param+=self.jdlParam()
160          sched_param+='MyProxyServer = "' + self.proxyServer + '";\n'
161          sched_param+='VirtualOrganisation = "' + self.VO + '";\n'
162          sched_param+='RetryCount = '+str(self.EDG_retry_count)+';\n'
# Line 178 | Line 177 | class SchedulerGlite(SchedulerGrid):
177          if len(sites)>0 and sites[0]=="":
178              return itr4
179          if sites != [""]:
181 –            ##Addedd Daniele
180              replicas = self.blackWhiteListParser.checkBlackList(sites,n)
181              if len(replicas)!=0:
182                  replicas = self.blackWhiteListParser.checkWhiteList(replicas,n)
183  
184              itr4 = replicas
187 –            #####
185          return itr4
186  
187      

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines