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.13 by slacapra, Wed Feb 28 14:10:33 2007 UTC vs.
Revision 1.19 by gutsche, Wed Oct 3 23:56:29 2007 UTC

# Line 134 | Line 134 | class SchedulerGlite(SchedulerEdg):
134          txt += '    echo "middleware =$middleware" \n'
135          txt += 'elif [ $GRID3_APP_DIR ]; then\n'
136          txt += '    middleware=OSG \n'
137 <        txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
137 >        txt += '    echo "SyncCE=`echo $GLITE_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
138          txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
139          txt += '    echo "middleware =$middleware" \n'
140          txt += 'elif [ $OSG_APP ]; then \n'
141          txt += '    middleware=OSG \n'
142 <        txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
142 >        txt += '    echo "SyncCE=`echo $GLITE_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
143          txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
144          txt += '    echo "middleware =$middleware" \n'
145          txt += 'else \n'
# Line 161 | 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 249 | 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