ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/SchedulerEdg.py
(Generate patch)

Comparing COMP/CRAB/python/SchedulerEdg.py (file contents):
Revision 1.93 by mkirn, Fri Oct 6 22:24:17 2006 UTC vs.
Revision 1.133.2.4 by fanzago, Fri Oct 12 12:56:30 2007 UTC

# Line 3 | Line 3 | from crab_logger import Logger
3   from crab_exceptions import *
4   from crab_util import *
5   from EdgConfig import *
6 + from BlackWhiteListParser import BlackWhiteListParser
7   import common
8  
9   import os, sys, time
# Line 22 | Line 23 | class SchedulerEdg(Scheduler):
23  
24      def configure(self, cfg_params):
25  
26 +        # init BlackWhiteListParser
27 +        self.blackWhiteListParser = BlackWhiteListParser(cfg_params)
28 +
29 +        self.proxyValid=0
30 +        try: self.dontCheckProxy=int(cfg_params["EDG.dont_check_proxy"])
31 +        except KeyError: self.dontCheckProxy = 0
32 +
33          try:
34 <            RB = cfg_params["EDG.rb"]
35 <            edgConfig = EdgConfig(RB)
28 <            self.edg_config = edgConfig.config()
29 <            self.edg_config_vo = edgConfig.configVO()
34 >            RB=cfg_params["EDG.rb"]
35 >            self.rb_param_file=self.rb_configure(RB)
36          except KeyError:
37 <            self.edg_config = ''
38 <            self.edg_config_vo = ''
33 <
37 >            self.rb_param_file=''
38 >            pass
39          try:
40              self.proxyServer = cfg_params["EDG.proxy_server"]
41          except KeyError:
# Line 47 | Line 52 | class SchedulerEdg(Scheduler):
52          except KeyError:
53              self.role = None
54              
55 <        try: self.LCG_version = cfg_params["EDG.lcg_version"]
56 <        except KeyError: self.LCG_version = '2'
52 <
53 <        try: self.EDG_requirements = cfg_params['EDG.requirements']
54 <        except KeyError: self.EDG_requirements = ''
55 <
56 <        try: self.EDG_retry_count = cfg_params['EDG.retry_count']
57 <        except KeyError: self.EDG_retry_count = ''
55 >        #try: self.LCG_version = cfg_params["EDG.lcg_version"]
56 >        #except KeyError: self.LCG_version = '2'
57  
58          try:
59              self.EDG_ce_black_list = cfg_params['EDG.ce_black_list']
61            #print "self.EDG_ce_black_list = ", self.EDG_ce_black_list
60          except KeyError:
61              self.EDG_ce_black_list  = ''
62  
63          try:
64              self.EDG_ce_white_list = cfg_params['EDG.ce_white_list']
67            #print "self.EDG_ce_white_list = ", self.EDG_ce_white_list
65          except KeyError: self.EDG_ce_white_list = ''
66  
67          try: self.VO = cfg_params['EDG.virtual_organization']
68          except KeyError: self.VO = 'cms'
69  
70 +        try: self.copy_input_data = cfg_params["USER.copy_input_data"]
71 +        except KeyError: self.copy_input_data = 0
72 +
73          try: self.return_data = cfg_params['USER.return_data']
74          except KeyError: self.return_data = 0
75  
# Line 87 | Line 87 | class SchedulerEdg(Scheduler):
87          except KeyError: self.copy_data = 0
88  
89          if ( int(self.return_data) == 0 and int(self.copy_data) == 0 ):
90 <           msg = 'Warning: return_data = 0 and copy_data = 0 ==> your exe output will be lost\n'
90 >           msg = 'Error: return_data = 0 and copy_data = 0 ==> your exe output will be lost\n'
91             msg = msg + 'Please modify return_data and copy_data value in your crab.cfg file\n'
92             raise CrabException(msg)
93  
94 <        try:
95 <            self.lfc_host = cfg_params['EDG.lfc_host']
96 <        except KeyError:
97 <            msg = "Error. The [EDG] section does not have 'lfc_host' value"
98 <            msg = msg + " it's necessary to know the LFC host name"
99 <            common.logger.message(msg)
100 <            raise CrabException(msg)
101 <        try:
102 <            self.lcg_catalog_type = cfg_params['EDG.lcg_catalog_type']
103 <        except KeyError:
104 <            msg = "Error. The [EDG] section does not have 'lcg_catalog_type' value"
105 <            msg = msg + " it's necessary to know the catalog type"
106 <            common.logger.message(msg)
107 <            raise CrabException(msg)
108 <        try:
109 <            self.lfc_home = cfg_params['EDG.lfc_home']
110 <        except KeyError:
111 <            msg = "Error. The [EDG] section does not have 'lfc_home' value"
112 <            msg = msg + " it's necessary to know the home catalog dir"
113 <            common.logger.message(msg)
114 <            raise CrabException(msg)
115 <      
94 >        if ( int(self.return_data) == 1 and int(self.copy_data) == 1 ):
95 >           msg = 'Error: return_data and copy_data cannot be set both to 1\n'
96 >           msg = msg + 'Please modify return_data or copy_data value in your crab.cfg file\n'
97 >           raise CrabException(msg)
98 >
99 >        ########### FEDE FOR DBS2 ##############################
100          try:
101 <            self.register_data = cfg_params["USER.register_data"]
102 <            if int(self.register_data) == 1:
101 >            self.publish_data = cfg_params["USER.publish_data"]
102 >            self.checkProxy()
103 >            if int(self.publish_data) == 1:
104                  try:
105 <                    self.LFN = cfg_params['USER.lfn_dir']
105 >                    self.publish_data_name = cfg_params['USER.publish_data_name']
106                  except KeyError:
107 <                    msg = "Error. The [USER] section does not have 'lfn_dir' value"
108 <                    msg = msg + " it's necessary for LCF registration"
109 <                    common.logger.message(msg)
107 >                    msg = "Error. The [USER] section does not have 'publish_data_name'"
108 >                    raise CrabException(msg)
109 >                try:
110 >                    tmp = runCommand("voms-proxy-info -identity")
111 >                    tmp = string.split(tmp,'/')
112 >                    reCN=re.compile(r'CN=')
113 >                    for t in tmp:
114 >                        if reCN.match(t):
115 >                            self.UserGridName=string.strip((t.replace('CN=','')).replace(' ',''))
116 >                        
117 >                    #self.UserGridName = string.strip(runCommand("voms-proxy-info -identity | awk -F\'CN\' \'{print $2$3$4}\' | tr -d \'=/ \'"))
118 >                except:
119 >                    msg = "Error. Problem with voms-proxy-info -identity command"
120                      raise CrabException(msg)
121 <        except KeyError: self.register_data = 0
121 >        except KeyError: self.publish_data = 0
122  
123 <        if ( int(self.copy_data) == 0 and int(self.register_data) == 1 ):
124 <           msg = 'Warning: register_data = 1 must be used with copy_data = 1\n'
123 >        if ( int(self.copy_data) == 0 and int(self.publish_data) == 1 ):
124 >           msg = 'Warning: publish_data = 1 must be used with copy_data = 1\n'
125             msg = msg + 'Please modify copy_data value in your crab.cfg file\n'
126             common.logger.message(msg)
127             raise CrabException(msg)
128 +        #################################################
129 +
130 +        #try:
131 +        #    self.lfc_host = cfg_params['EDG.lfc_host']
132 +        #except KeyError:
133 +        #    msg = "Error. The [EDG] section does not have 'lfc_host' value"
134 +        #    msg = msg + " it's necessary to know the LFC host name"
135 +        #    common.logger.message(msg)
136 +        #    raise CrabException(msg)
137 +        #try:
138 +        #    self.lcg_catalog_type = cfg_params['EDG.lcg_catalog_type']
139 +        #except KeyError:
140 +        #    msg = "Error. The [EDG] section does not have 'lcg_catalog_type' value"
141 +        #    msg = msg + " it's necessary to know the catalog type"
142 +        #    common.logger.message(msg)
143 +        #    raise CrabException(msg)
144 +        #try:
145 +        #    self.lfc_home = cfg_params['EDG.lfc_home']
146 +        #except KeyError:
147 +        #    msg = "Error. The [EDG] section does not have 'lfc_home' value"
148 +        #    msg = msg + " it's necessary to know the home catalog dir"
149 +        #    common.logger.message(msg)
150 +        #    raise CrabException(msg)
151 +      
152 +        #try:
153 +        #    self.register_data = cfg_params["USER.register_data"]
154 +        #    if int(self.register_data) == 1:
155 +        #        try:
156 +        #            self.LFN = cfg_params['USER.lfn_dir']
157 +        #        except KeyError:
158 +        #            msg = "Error. The [USER] section does not have 'lfn_dir' value"
159 +        #            msg = msg + " it's necessary for LCF registration"
160 +        #            common.logger.message(msg)
161 +        #            raise CrabException(msg)
162 +        #except KeyError: self.register_data = 0
163 +
164 +        #if ( int(self.copy_data) == 0 and int(self.register_data) == 1 ):
165 +        #   msg = 'Warning: register_data = 1 must be used with copy_data = 1\n'
166 +        #   msg = msg + 'Please modify copy_data value in your crab.cfg file\n'
167 +        #   common.logger.message(msg)
168 +        #   raise CrabException(msg)
169  
170          try: self.EDG_requirements = cfg_params['EDG.requirements']
171          except KeyError: self.EDG_requirements = ''
172 <                                                                                                                                                            
172 >
173 >        try: self.EDG_addJdlParam = string.split(cfg_params['EDG.additional_jdl_parameters'],',')
174 >        except KeyError: self.EDG_addJdlParam = []
175 >
176          try: self.EDG_retry_count = cfg_params['EDG.retry_count']
177          except KeyError: self.EDG_retry_count = ''
178 <                                                                                                                                                            
178 >
179 >        try: self.EDG_shallow_retry_count= cfg_params['EDG.shallow_retry_count']
180 >        except KeyError: self.EDG_shallow_retry_count = ''
181 >
182          try: self.EDG_clock_time = cfg_params['EDG.max_wall_clock_time']
183          except KeyError: self.EDG_clock_time= ''
184 <                                                                                                                                                            
184 >
185          try: self.EDG_cpu_time = cfg_params['EDG.max_cpu_time']
186          except KeyError: self.EDG_cpu_time = ''
187  
# Line 156 | Line 198 | class SchedulerEdg(Scheduler):
198          libPath=os.path.join(path, "lib", "python")
199          sys.path.append(libPath)
200  
159        self.proxyValid=0
160
201          try:
202              self._taskId = cfg_params['taskId']
203          except:
# Line 172 | Line 212 | class SchedulerEdg(Scheduler):
212          return
213      
214  
215 +    def rb_configure(self, RB):
216 +        self.edg_config = ''
217 +        self.edg_config_vo = ''
218 +        self.rb_param_file = ''
219 +
220 +        edgConfig = EdgConfig(RB)
221 +        self.edg_config = edgConfig.config()
222 +        self.edg_config_vo = edgConfig.configVO()
223 +
224 +        if (self.edg_config and self.edg_config_vo != ''):
225 +            self.rb_param_file = 'RBconfig = "'+self.edg_config+'";\nRBconfigVO = "'+self.edg_config_vo+'";\n'
226 +            #print "rb_param_file = ", self.rb_param_file
227 +        return self.rb_param_file
228 +      
229 +
230      def sched_parameter(self):
231          """
232          Returns file with requirements and scheduler-specific parameters
# Line 180 | Line 235 | class SchedulerEdg(Scheduler):
235          job = common.job_list[index]
236          jbt = job.type()
237          
238 <        lastDest=''
238 >        lastBlock=-1
239          first = []
185        last  = []
240          for n in range(common.jobDB.nJobs()):
241 <            currDest=common.jobDB.destination(n)
242 <            if (currDest!=lastDest):
243 <                lastDest = currDest
241 >            currBlock=common.jobDB.block(n)
242 >            if (currBlock!=lastBlock):
243 >                lastBlock = currBlock
244                  first.append(n)
191                if n != 0:last.append(n-1)
192        if len(first)>len(last) :last.append(common.jobDB.nJobs())
245    
246          req = ''
247          req = req + jbt.getRequirements()
# Line 199 | Line 251 | class SchedulerEdg(Scheduler):
251                  req = req + self.EDG_requirements
252              else:
253                  req = req +  ' && ' + self.EDG_requirements
254 +
255          if self.EDG_ce_white_list:
256              ce_white_list = string.split(self.EDG_ce_white_list,',')
257              for i in range(len(ce_white_list)):
258                  if i == 0:
259                      if (req == ' '):
260 <                        req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
260 >                        req = req + '((RegExp("' + string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
261                      else:
262 <                        req = req +  ' && ((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
262 >                        req = req +  ' && ((RegExp("' +  string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
263                      pass
264                  else:
265 <                    req = req +  ' || (RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
265 >                    req = req +  ' || (RegExp("' +  string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
266              req = req + ')'
267          
268          if self.EDG_ce_black_list:
269              ce_black_list = string.split(self.EDG_ce_black_list,',')
270              for ce in ce_black_list:
271                  if (req == ' '):
272 <                    req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
272 >                    req = req + '(!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))'
273                  else:
274 <                    req = req +  ' && (!RegExp("' + ce + '", other.GlueCEUniqueId))'
274 >                    req = req +  ' && (!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))'
275                  pass
276          if self.EDG_clock_time:
277              if (req == ' '):
# Line 233 | Line 286 | class SchedulerEdg(Scheduler):
286                  req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
287                  
288          for i in range(len(first)): # Add loop DS
289 +            groupReq = req
290              self.param='sched_param_'+str(i)+'.clad'
291              param_file = open(common.work_space.shareDir()+'/'+self.param, 'w')
292  
293              itr4=self.findSites_(first[i])
294 <            if (itr4 != []):
295 <                req1=''  
296 <                for arg in itr4:
243 <                    req1 = req + ' && anyMatch(other.storage.CloseSEs, ('+str(arg)+'))'
244 <            param_file.write('Requirements = '+req1 +';\n')  
294 >            for arg in itr4:
295 >                groupReq = groupReq + ' && anyMatch(other.storage.CloseSEs, ('+str(arg)+'))'
296 >            param_file.write('Requirements = '+groupReq +';\n')  
297    
298 <            if (self.edg_config and self.edg_config_vo != ''):
299 <                param_file.write('RBconfig = "'+self.edg_config+'";\n')  
300 <                param_file.write('RBconfigVO = "'+self.edg_config_vo+'";')
298 >            if (self.rb_param_file != ''):
299 >                param_file.write(self.rb_param_file)  
300 >
301 >            if len(self.EDG_addJdlParam):
302 >                for p in self.EDG_addJdlParam:
303 >                    param_file.write(p)
304  
305              param_file.close()  
306  
# Line 275 | Line 330 | class SchedulerEdg(Scheduler):
330          txt += 'echo "middleware discovery " \n'
331          txt += 'if [ $GRID3_APP_DIR ]; then\n'
332          txt += '    middleware=OSG \n'
333 <        txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
333 >        txt += '    if [ $GLOBUS_GRAM_JOB_CONTACT ]; then \n'
334 >        txt += '        SyncCE=`echo "echo $GLOBUS_GRAM_JOB_CONTACT" | cut -d: -f2 | sed \'s/\/\///\'`;\n'
335 >        txt += '        echo "SyncCE=$SyncCE"  | tee -a $RUNTIME_AREA/$repo ;\n'
336 >        txt += '    else\n'
337 >        txt += '        echo "not reporting SyncCE";\n'
338 >        txt += '    fi\n';
339          txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
340          txt += '    echo "middleware =$middleware" \n'
341          txt += 'elif [ $OSG_APP ]; then \n'
342          txt += '    middleware=OSG \n'
343 <        txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
343 >        txt += '    if [ $GLOBUS_GRAM_JOB_CONTACT ]; then \n'
344 >        txt += '        SyncCE=`echo "echo $GLOBUS_GRAM_JOB_CONTACT" | cut -d: -f2 | sed \'s/\/\///\'`;\n'
345 >        txt += '        echo "SyncCE=$SyncCE"  | tee -a $RUNTIME_AREA/$repo ;\n'
346 >        txt += '    else\n'
347 >        txt += '        echo "not reporting SyncCE";\n'
348 >        txt += '    fi\n';
349          txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
350          txt += '    echo "middleware =$middleware" \n'
351          txt += 'elif [ $VO_CMS_SW_DIR ]; then \n'
352          txt += '    middleware=LCG \n'
353 <        txt += '    echo "SyncCE=`edg-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
353 >   #     txt += '    echo "SyncCE=`edg-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
354 >        txt += '    echo "SyncCE=`glite-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
355          txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
356          txt += '    echo "middleware =$middleware" \n'
357          txt += 'else \n'
# Line 307 | Line 373 | class SchedulerEdg(Scheduler):
373          
374          txt += '\n\n'
375  
376 <        if int(self.copy_data) == 1:
377 <           if self.SE:
378 <              txt += 'export SE='+self.SE+'\n'
379 <              txt += 'echo "SE = $SE"\n'
380 <           if self.SE_PATH:
381 <              if ( self.SE_PATH[-1] != '/' ) : self.SE_PATH = self.SE_PATH + '/'
382 <              txt += 'export SE_PATH='+self.SE_PATH+'\n'
383 <              txt += 'echo "SE_PATH = $SE_PATH"\n'
376 > #        if int(self.copy_data) == 1:
377 > #           if self.SE:
378 > #              txt += 'export SE='+self.SE+'\n'
379 > #              txt += 'echo "SE = $SE"\n'
380 > #           if self.SE_PATH:
381 > #              if ( self.SE_PATH[-1] != '/' ) : self.SE_PATH = self.SE_PATH + '/'
382 > #              txt += 'export SE_PATH='+self.SE_PATH+'\n'
383 > #              txt += 'echo "SE_PATH = $SE_PATH"\n'
384  
385          txt += 'export VO='+self.VO+'\n'
386          ### add some line for LFC catalog setting
387 <        txt += 'if [ $middleware == LCG ]; then \n'
388 <        txt += '    if [[ $LCG_CATALOG_TYPE != \''+self.lcg_catalog_type+'\' ]]; then\n'
389 <        txt += '        export LCG_CATALOG_TYPE='+self.lcg_catalog_type+'\n'
390 <        txt += '    fi\n'
391 <        txt += '    if [[ $LFC_HOST != \''+self.lfc_host+'\' ]]; then\n'
392 <        txt += '        export LFC_HOST='+self.lfc_host+'\n'
393 <        txt += '    fi\n'
394 <        txt += '    if [[ $LFC_HOME != \''+self.lfc_home+'\' ]]; then\n'
395 <        txt += '        export LFC_HOME='+self.lfc_home+'\n'
396 <        txt += '    fi\n'
397 <        txt += 'elif [ $middleware == OSG ]; then\n'
398 <        txt += '    echo "LFC catalog setting to be implemented for OSG"\n'
399 <        txt += 'fi\n'
387 >        #txt += 'if [ $middleware == LCG ]; then \n'
388 >        #txt += '    if [[ $LCG_CATALOG_TYPE != \''+self.lcg_catalog_type+'\' ]]; then\n'
389 >        #txt += '        export LCG_CATALOG_TYPE='+self.lcg_catalog_type+'\n'
390 >        #txt += '    fi\n'
391 >        #txt += '    if [[ $LFC_HOST != \''+self.lfc_host+'\' ]]; then\n'
392 >        #txt += '        export LFC_HOST='+self.lfc_host+'\n'
393 >        #txt += '    fi\n'
394 >        #txt += '    if [[ $LFC_HOME != \''+self.lfc_home+'\' ]]; then\n'
395 >        #txt += '        export LFC_HOME='+self.lfc_home+'\n'
396 >        #txt += '    fi\n'
397 >        #txt += 'elif [ $middleware == OSG ]; then\n'
398 >        #txt += '    echo "LFC catalog setting to be implemented for OSG"\n'
399 >        #txt += 'fi\n'
400          #####
401 <        if int(self.register_data) == 1:
402 <           txt += 'if [ $middleware == LCG ]; then \n'
403 <           txt += '    export LFN='+self.LFN+'\n'
404 <           txt += '    lfc-ls $LFN\n'
405 <           txt += '    result=$?\n'
406 <           txt += '    echo $result\n'
407 <           ### creation of LFN dir in LFC catalog, under /grid/cms dir  
408 <           txt += '    if [ $result != 0 ]; then\n'
409 <           txt += '       lfc-mkdir $LFN\n'
410 <           txt += '       result=$?\n'
411 <           txt += '       echo $result\n'
412 <           txt += '    fi\n'
413 <           txt += 'elif [ $middleware == OSG ]; then\n'
414 <           txt += '    echo " Files registration to be implemented for OSG"\n'
415 <           txt += 'fi\n'
416 <           txt += '\n'
417 <
418 <           if self.VO:
419 <              txt += 'export VO='+self.VO+'\n'
420 <           if self.LFN:
421 <              txt += 'if [ $middleware == LCG ]; then \n'
422 <              txt += '    export LFN='+self.LFN+'\n'
423 <              txt += 'fi\n'
358 <              txt += '\n'
401 >        #if int(self.register_data) == 1:
402 >        #   txt += 'if [ $middleware == LCG ]; then \n'
403 >        #   txt += '    export LFN='+self.LFN+'\n'
404 >        #   txt += '    lfc-ls $LFN\n'
405 >        #   txt += '    result=$?\n'
406 >        #   txt += '    echo $result\n'
407 >        #   ### creation of LFN dir in LFC catalog, under /grid/cms dir  
408 >        #   txt += '    if [ $result != 0 ]; then\n'
409 >        #   txt += '       lfc-mkdir $LFN\n'
410 >        #   txt += '       result=$?\n'
411 >        #   txt += '       echo $result\n'
412 >        #   txt += '    fi\n'
413 >        #   txt += 'elif [ $middleware == OSG ]; then\n'
414 >        #   txt += '    echo " Files registration to be implemented for OSG"\n'
415 >        #   txt += 'fi\n'
416 >        #   txt += '\n'
417 >        #   if self.VO:
418 >        #      txt += 'export VO='+self.VO+'\n'
419 >        #   if self.LFN:
420 >        #      txt += 'if [ $middleware == LCG ]; then \n'
421 >        #      txt += '    export LFN='+self.LFN+'\n'
422 >        #      txt += 'fi\n'
423 >        #      txt += '\n'
424  
425          txt += 'if [ $middleware == LCG ]; then\n'
426 <        txt += '    CloseCEs=`edg-brokerinfo getCE`\n'
426 >    #    txt += '    CloseCEs=`edg-brokerinfo getCE`\n'
427 >        txt += '    CloseCEs=`glite-brokerinfo getCE`\n'
428          txt += '    echo "CloseCEs = $CloseCEs"\n'
429          txt += '    CE=`echo $CloseCEs | sed -e "s/:.*//"`\n'
430          txt += '    echo "CE = $CE"\n'
# Line 384 | Line 450 | class SchedulerEdg(Scheduler):
450          Copy input data from SE to WN    
451          """
452          txt = ''
453 +        if not self.copy_input_data: return txt
454  
455          ## OLI_Daniele deactivate for OSG (wait for LCG UI installed on OSG)
456          txt += 'if [ $middleware == OSG ]; then\n'
# Line 431 | Line 498 | class SchedulerEdg(Scheduler):
498          Write a CopyResults part of a job script, e.g.
499          to copy produced output into a storage element.
500          """
501 <        txt = ''
435 <        if int(self.copy_data) == 1:
436 <           txt += '#\n'
437 <           txt += '#   Copy output to SE = $SE\n'
438 <           txt += '#\n'
439 <           txt += '    if [ $middleware == OSG ]; then\n'
440 <           txt += '        echo "X509_USER_PROXY = $X509_USER_PROXY"\n'
441 <           txt += '        echo "source $OSG_APP/glite/setup_glite_ui.sh"\n'
442 <           txt += '        source $OSG_APP/glite/setup_glite_ui.sh\n'
443 <           txt += '        export X509_CERT_DIR=$OSG_APP/glite/etc/grid-security/certificates\n'
444 <           txt += '        echo "export X509_CERT_DIR=$X509_CERT_DIR"\n'
445 <           txt += '    fi \n'
446 <
447 <           txt += '    for out_file in $file_list ; do\n'
448 <           txt += '        echo "Trying to copy output file to $SE using srmcp"\n'
449 <           txt += '        echo "mkdir -p $HOME/.srmconfig"\n'
450 <           txt += '        mkdir -p $HOME/.srmconfig\n'
451 <           txt += '        if [ $middleware == LCG ]; then\n'
452 <           txt += '           echo "srmcp -retry_num 3 -retry_timeout 480000 file:////`pwd`/$out_file srm://${SE}:8443${SE_PATH}$out_file"\n'
453 <           txt += '           exitstring=`srmcp -retry_num 3 -retry_timeout 480000 file:////\`pwd\`/$out_file srm://${SE}:8443${SE_PATH}$out_file 2>&1`\n'
454 <           txt += '        elif [ $middleware == OSG ]; then\n'
455 <           txt += '           echo "srmcp -retry_num 3 -retry_timeout 240000 -x509_user_trusted_certificates $X509_CERT_DIR file:////`pwd`/$out_file srm://${SE}:8443${SE_PATH}$out_file"\n'
456 <           txt += '           exitstring=`srmcp -retry_num 3 -retry_timeout 240000 -x509_user_trusted_certificates $X509_CERT_DIR file:////\`pwd\`/$out_file srm://${SE}:8443${SE_PATH}$out_file 2>&1`\n'
457 <           txt += '        fi \n'
458 <           txt += '        copy_exit_status=$?\n'
459 <           txt += '        echo "COPY_EXIT_STATUS for srmcp = $copy_exit_status"\n'
460 <           txt += '        echo "STAGE_OUT = $copy_exit_status"\n'
461 <
462 <           txt += '        if [ $copy_exit_status -ne 0 ]; then\n'
463 <           txt += '            echo "Possible problem with SE = $SE"\n'
464 <           txt += '            echo "StageOutExitStatus = 198" | tee -a $RUNTIME_AREA/$repo\n'
465 <           txt += '            echo "StageOutExitStatusReason = $exitstring" | tee -a $RUNTIME_AREA/$repo\n'
466 <           txt += '            echo "srmcp failed, attempting lcg-cp."\n'
467 <           if common.logger.debugLevel() >= 5:
468 <               txt += '            echo "lcg-cp --vo $VO -t 2400 --verbose file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
469 <               txt += '            exitstring=`lcg-cp --vo $VO -t 2400 --verbose file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
470 <           else:              
471 <               txt += '            echo "lcg-cp --vo $VO -t 2400 file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
472 <               txt += '            exitstring=`lcg-cp --vo $VO -t 2400 file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
473 <           txt += '            copy_exit_status=$?\n'
474 <           txt += '            echo "COPY_EXIT_STATUS for lcg-cp = $copy_exit_status"\n'
475 <           txt += '            echo "STAGE_OUT = $copy_exit_status"\n'
476 <
477 <           txt += '            if [ $copy_exit_status -ne 0 ]; then\n'
478 <           txt += '               echo "Problems with SE = $SE"\n'
479 <           txt += '               echo "StageOutExitStatus = 198" | tee -a $RUNTIME_AREA/$repo\n'
480 <           txt += '               echo "StageOutExitStatusReason = $exitstring" | tee -a $RUNTIME_AREA/$repo\n'
481 <           txt += '               echo "srmcp and lcg-cp and failed!"\n'
482 <           txt += '            else\n'
483 <           txt += '               echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
484 <           txt += '               echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
485 <           txt += '               echo "output copied into $SE/$SE_PATH directory"\n'
486 <           txt += '               echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
487 <           txt += '               echo "lcg-cp succeeded"\n'
488 <           txt += '            fi\n'
489 <           txt += '        else\n'
490 <           txt += '            echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
491 <           txt += '            echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
492 <           txt += '            echo "output copied into $SE/$SE_PATH directory"\n'
493 <           txt += '            echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
494 <           txt += '            echo "srmcp succeeded"\n'
495 <           txt += '         fi\n'
496 <           txt += '     done\n'
497 <        return txt
501 >        txt = '\n'
502  
503 <    def wsRegisterOutput(self):
504 <        """
505 <        Returns part of a job script which does scheduler-specific work.
502 <        """
503 >        txt += '#\n'
504 >        txt += '# COPY OUTPUT FILE TO SE\n'
505 >        txt += '#\n\n'
506  
507 <        txt = ''
508 <        if int(self.register_data) == 1:
509 <        ## OLI_Daniele deactivate for OSG (wait for LCG UI installed on OSG)
510 <           txt += 'if [ $middleware == OSG ]; then\n'
511 <           txt += '   #\n'
512 <           txt += '   #   Register output to LFC deactivated in OSG mode\n'
513 <           txt += '   #\n'
514 <           txt += '   echo "Register output to LFC deactivated in OSG mode"\n'
515 <           txt += 'elif [ $middleware == LCG ]; then \n'
516 <           txt += '#\n'
517 <           txt += '#  Register output to LFC\n'
518 <           txt += '#\n'
519 <           txt += '   if [ $copy_exit_status -eq 0 ]; then\n'
520 <           txt += '      for out_file in $file_list ; do\n'
521 <           txt += '         echo "Trying to register the output file into LFC"\n'
522 <           txt += '         echo "lcg-rf -l $LFN/$out_file --vo $VO -t 1200 sfn://$SE$SE_PATH/$out_file 2>&1"\n'
523 <           txt += '         lcg-rf -l $LFN/$out_file --vo $VO -t 1200 sfn://$SE$SE_PATH/$out_file 2>&1 \n'
524 <           txt += '         register_exit_status=$?\n'
525 <           txt += '         echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
526 <           txt += '         echo "STAGE_OUT = $register_exit_status"\n'
527 <           txt += '         if [ $register_exit_status -ne 0 ]; then \n'
528 <           txt += '            echo "Problems with the registration to LFC" \n'
529 <           txt += '            echo "Try with srm protocol" \n'
530 <           txt += '            echo "lcg-rf -l $LFN/$out_file --vo $VO -t 1200 srm://$SE$SE_PATH/$out_file 2>&1"\n'
531 <           txt += '            lcg-rf -l $LFN/$out_file --vo $VO -t 1200 srm://$SE$SE_PATH/$out_file 2>&1 \n'
532 <           txt += '            register_exit_status=$?\n'
533 <           txt += '            echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
534 <           txt += '            echo "STAGE_OUT = $register_exit_status"\n'
535 <           txt += '            if [ $register_exit_status -ne 0 ]; then \n'
536 <           txt += '               echo "Problems with the registration into LFC" \n'
537 <           txt += '            fi \n'
538 <           txt += '         else \n'
539 <           txt += '            echo "output registered to LFC"\n'
540 <           txt += '         fi \n'
541 <           txt += '         echo "StageOutExitStatus = $register_exit_status" | tee -a $RUNTIME_AREA/$repo\n'
542 <           txt += '      done\n'
543 <           txt += '   else \n'
544 <           txt += '      echo "Trying to copy output file to CloseSE"\n'
545 <           txt += '      CLOSE_SE=`edg-brokerinfo getCloseSEs | head -1`\n'
546 <           txt += '      for out_file in $file_list ; do\n'
547 <           txt += '         echo "lcg-cr -v -l lfn:${LFN}/$out_file -d $CLOSE_SE -P $LFN/$out_file --vo $VO file://$RUNTIME_AREA/$out_file 2>&1" \n'
548 <           txt += '         lcg-cr -v -l lfn:${LFN}/$out_file -d $CLOSE_SE -P $LFN/$out_file --vo $VO file://$RUNTIME_AREA/$out_file 2>&1 \n'
549 <           txt += '         register_exit_status=$?\n'
550 <           txt += '         echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
551 <           txt += '         echo "STAGE_OUT = $register_exit_status"\n'
552 <           txt += '         if [ $register_exit_status -ne 0 ]; then \n'
553 <           txt += '            echo "Problems with CloseSE or Catalog" \n'
554 <           txt += '         else \n'
555 <           txt += '            echo "The program was successfully executed"\n'
556 <           txt += '            echo "SE = $CLOSE_SE"\n'
554 <           txt += '            echo "LFN for the file is LFN=${LFN}/$out_file"\n'
555 <           txt += '         fi \n'
556 <           txt += '         echo "StageOutExitStatus = $register_exit_status" | tee -a $RUNTIME_AREA/$repo\n'
557 <           txt += '      done\n'
558 <           txt += '   fi \n'
559 <           txt += '   exit_status=$register_exit_status\n'
560 <           txt += 'fi \n'
507 >        SE_PATH=''
508 >        if int(self.copy_data) == 1:
509 >            if self.SE:
510 >                txt += 'export SE='+self.SE+'\n'
511 >                txt += 'echo "SE = $SE"\n'
512 >            if self.SE_PATH:
513 >                if ( self.SE_PATH[-1] != '/' ) : self.SE_PATH = self.SE_PATH + '/'
514 >                SE_PATH=self.SE_PATH
515 >            if int(self.publish_data) == 1:
516 >                txt += '### publish_data = 1 so the SE path where to copy the output is: \n'
517 >                path_add = self.UserGridName + '/' + self.publish_data_name +'_${PSETHASH}/'
518 >                SE_PATH = SE_PATH + path_add
519 >            txt += 'export SE_PATH='+SE_PATH+'\n'
520 >            txt += 'echo "SE_PATH = $SE_PATH"\n'
521 >            
522 >            txt += 'echo "####################################################"\n'
523 >            txt += 'echo "# Copy output files from WN = `hostname` to SE = $SE"\n'
524 >            txt += 'echo "####################################################"\n'
525 >            
526 >            txt += 'if [ $output_exit_status -eq 60302 ]; then\n'
527 >            txt += '    echo "--> No output file to copy to $SE"\n'
528 >            txt += '    copy_exit_status=$output_exit_status\n'
529 >            txt += '    echo "COPY_EXIT_STATUS = $copy_exit_status"\n'
530 >            txt += 'else\n'
531 >            txt += '    for out_file in $file_list ; do\n'
532 >            txt += '        echo "Trying to copy output file to $SE"\n'
533 >            txt += '        cmscp $out_file ${SE} ${SE_PATH} $out_file $middleware\n'
534 >            txt += '        copy_exit_status=$?\n'
535 >            txt += '        echo "COPY_EXIT_STATUS = $copy_exit_status"\n'
536 >            txt += '        echo "STAGE_OUT = $copy_exit_status"\n'
537 >            txt += '        if [ $copy_exit_status -ne 0 ]; then\n'
538 >            txt += '            echo "Problem copying $out_file to $SE $SE_PATH"\n'
539 >            txt += '            echo "StageOutExitStatus = $copy_exit_status " | tee -a $RUNTIME_AREA/$repo\n'
540 >            txt += '            copy_exit_status=60307\n'
541 >            txt += '        else\n'
542 >            txt += '            echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
543 >            txt += '            echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
544 >            txt += '            echo "output copied into $SE/$SE_PATH directory"\n'
545 >            txt += '            echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
546 >            txt += '        fi\n'
547 >            txt += '    done\n'
548 >            txt += '    if [ $copy_exit_status -ne 0 ]; then\n'
549 >            txt += '        SE=""\n'
550 >            txt += '        echo "SE = $SE"\n'
551 >            txt += '        SE_PATH=""\n'
552 >            txt += '        echo "SE_PATH = $SE_PATH"\n'
553 >            txt += '    fi\n'
554 >            txt += 'fi\n'
555 >            txt += 'exit_status=$copy_exit_status\n'
556 >            pass
557          return txt
558  
559      def loggingInfo(self, id):
# Line 566 | Line 562 | class SchedulerEdg(Scheduler):
562          """
563          self.checkProxy()
564          cmd = 'edg-job-get-logging-info -v 2 ' + id
569        #cmd_out = os.popen(cmd)
565          cmd_out = runCommand(cmd)
566          return cmd_out
567  
573    def getExitStatus(self, id):
574        return self.getStatusAttribute_(id, 'exit_code')
575
576    def queryStatus(self, id):
577        return self.getStatusAttribute_(id, 'status')
578
579    def queryDest(self, id):  
580        return self.getStatusAttribute_(id, 'destination')
581
582
583    def getStatusAttribute_(self, id, attr):
584        """ Query a status of the job with id """
585
586        self.checkProxy()
587        hstates = {}
588        Status = importName('edg_wl_userinterface_common_LbWrapper', 'Status')
589        # Bypass edg-job-status interfacing directly to C++ API
590        # Job attribute vector to retrieve status without edg-job-status
591        level = 0
592        # Instance of the Status class provided by LB API
593        jobStat = Status()
594        st = 0
595        jobStat.getStatus(id, level)
596        err, apiMsg = jobStat.get_error()
597        if err:
598            common.logger.debug(5,'Error caught' + apiMsg)
599            return None
600        else:
601            for i in range(len(self.states)):
602                # Fill an hash table with all information retrieved from LB API
603                hstates[ self.states[i] ] = jobStat.loadStatus(st)[i]
604            result = jobStat.loadStatus(st)[self.states.index(attr)]
605            return result
606
568      def queryDetailedStatus(self, id):
569          """ Query a detailed status of the job with id """
570          cmd = 'edg-job-status '+id
571          cmd_out = runCommand(cmd)
572          return cmd_out
573  
613    ##### FEDE ######        
574      def findSites_(self, n):
575          itr4 =[]
576 +
577          sites = common.jobDB.destination(n)
578 <        if len(sites)>0 and sites[0]=="Any":
578 >
579 >        if len(sites)>0 and sites[0]=="":
580              return itr4
581 +
582          itr = ''
583          if sites != [""]:#CarlosDaniele
584 <            for site in sites:
584 >            ##Addedd Daniele
585 >            replicas = self.blackWhiteListParser.checkBlackList(sites,n)
586 >            if len(replicas)!=0:
587 >                replicas = self.blackWhiteListParser.checkWhiteList(replicas,n)
588 >              
589 >            if len(replicas)==0:
590 >                itr = itr + 'target.GlueSEUniqueID=="NONE" '
591 >                #msg = 'No sites remaining that host any part of the requested data! Exiting... '
592 >                #raise CrabException(msg)
593 >            #####        
594 >           # for site in sites:
595 >            for site in replicas:
596                  #itr = itr + 'target.GlueSEUniqueID==&quot;'+site+'&quot; || '
597                  itr = itr + 'target.GlueSEUniqueID=="'+site+'" || '
598              itr = itr[0:-4]
# Line 626 | Line 600 | class SchedulerEdg(Scheduler):
600          return itr4
601  
602      def createXMLSchScript(self, nj, argsList):
629   # def createXMLSchScript(self, nj):
603        
604          """
605          Create a XML-file for BOSS4.
# Line 642 | Line 615 | class SchedulerEdg(Scheduler):
615          jbt = job.type()
616          
617          inp_sandbox = jbt.inputSandbox(index)
618 <        out_sandbox = jbt.outputSandbox(index)
618 >        #out_sandbox = jbt.outputSandbox(index)
619          """
620          [end] FIX-ME
621          """
# Line 658 | Line 631 | class SchedulerEdg(Scheduler):
631          dir = string.split(common.work_space.topDir(), '/')
632          taskName = dir[len(dir)-2]
633    
661        to_writeReq = ''
634          to_write = ''
635  
636          req=' '
637          req = req + jbt.getRequirements()
638  
667
668        #sites = common.jobDB.destination(nj)
669        #if len(sites)>0 and sites[0]!="Any":
670        #    req = req + ' && anyMatch(other.storage.CloseSEs, (_ITR4_))'
671        #req = req    
672    
639          if self.EDG_requirements:
640              if (req == ' '):
641                  req = req + self.EDG_requirements
# Line 712 | Line 678 | class SchedulerEdg(Scheduler):
678              to_write = to_write + 'RetryCount = "'+self.EDG_retry_count+'"\n'
679              pass
680  
681 +        if ( self.EDG_shallow_retry_count ):              
682 +            to_write = to_write + 'ShallowRetryCount = "'+self.EDG_shallow_retry_count+'"\n'
683 +            pass
684 +
685          to_write = to_write + 'MyProxyServer = "&quot;' + self.proxyServer + '&quot;"\n'
686          to_write = to_write + 'VirtualOrganisation = "&quot;' + self.VO + '&quot;"\n'
687  
688 <                #TaskName  
688 >        #TaskName  
689          dir = string.split(common.work_space.topDir(), '/')
690          taskName = dir[len(dir)-2]
691  
692          xml.write(str(title))
693 <        xml.write('<task name="' +str(taskName)+'">\n')
693 >        #xml.write('<task name="' +str(taskName)+'" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache">\n')
694 >
695 >        #xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + '" task_info="' + os.path.expandvars('X509_USER_PROXY') + '">\n')
696 >        x509_cmd = 'ls /tmp/x509up_u`id -u`'
697 >        x509=runCommand(x509_cmd).strip()
698 >        xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + ' task_info="' + str(x509) + '">\n')
699          xml.write(jt_string)
700          
701          if (to_write != ''):
# Line 747 | Line 722 | class SchedulerEdg(Scheduler):
722          indy: here itr4
723          '''
724          
725 <
726 <        xml.write('<chain scheduler="'+str(self.schedulerName)+'">\n')
725 >        xml.write('<chain name="' +str(taskName)+'__ITR1_" scheduler="'+str(self.schedulerName)+'">\n')
726 >       # xml.write('<chain scheduler="'+str(self.schedulerName)+'">\n')
727          xml.write(jt_string)
728  
729          #executable
# Line 761 | Line 736 | class SchedulerEdg(Scheduler):
736          xml.write('<program>\n')
737          xml.write('<exec> ' + os.path.basename(script) +' </exec>\n')
738          xml.write(jt_string)
739 <    
765 <          
766 <        ### only one .sh  JDL has arguments:
767 <        ### Fabio
768 < #        xml.write('args = "' + str(nj+1)+' '+ jbt.getJobTypeArguments(nj, "EDG") +'"\n')
739 >
740          xml.write('<args> <![CDATA[\n _ITR2_ \n]]> </args>\n')
741          xml.write('<program_types> crabjob </program_types>\n')
742 <        inp_box = script + ','
742 >        inp_box = common.work_space.pathForTgz() + 'job/' + jbt.scriptName + ','
743  
744          if inp_sandbox != None:
745              for fl in inp_sandbox:
# Line 776 | Line 747 | class SchedulerEdg(Scheduler):
747                  pass
748              pass
749  
750 <        inp_box = inp_box + os.path.abspath(os.environ['CRABDIR']+'/python/'+'report.py') + ',' +\
751 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'DashboardAPI.py') + ','+\
752 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'Logger.py') + ','+\
753 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'ProcInfo.py') + ','+\
754 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'apmon.py')
755 <
785 <        if (not jbt.additional_inbox_files == []):
786 <            inp_box = inp_box + ','
787 <            for addFile in jbt.additional_inbox_files:
788 <                addFile = os.path.abspath(addFile)
789 <                inp_box = inp_box+''+addFile+','
790 <                pass
750 > #        if (not jbt.additional_inbox_files == []):
751 > #            inp_box = inp_box + ','
752 > #            for addFile in jbt.additional_inbox_files:
753 > #                #addFile = os.path.abspath(addFile)
754 > #                inp_box = inp_box+''+addFile+','
755 > #                pass
756  
757          if inp_box[-1] == ',' : inp_box = inp_box[:-1]
758          inp_box = '<infiles> <![CDATA[\n' + inp_box + '\n]]> </infiles>\n'
# Line 818 | Line 783 | class SchedulerEdg(Scheduler):
783          INDY
784          something similar should be also done for infiles (if it makes sense!)
785          """
786 +        # Stuff to be returned _always_ via sandbox
787 +        for fl in jbt.output_file_sandbox:
788 +            out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
789 +            pass
790 +        pass
791 +
792 +        # via sandbox iif required return_data
793          if int(self.return_data) == 1:
794              for fl in jbt.output_file:
795                  out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
# Line 846 | Line 818 | class SchedulerEdg(Scheduler):
818          Function to check the Globus proxy.
819          """
820          if (self.proxyValid): return
821 <        timeleft = -999
821 >
822 >        ### Just return if asked to do so
823 >        if (self.dontCheckProxy==1):
824 >            self.proxyValid=1
825 >            return
826 >
827          minTimeLeft=10*3600 # in seconds
828  
829          minTimeLeftServer = 100 # in hours
# Line 866 | Line 843 | class SchedulerEdg(Scheduler):
843          pass
844  
845          if mustRenew:
846 <            common.logger.message( "No valid proxy found or remaining time of validity of already existing proxy shorter than 10 hours!\n Creating a user proxy with default length of 96h\n")
846 >            common.logger.message( "No valid proxy found or remaining time of validity of already existing proxy shorter than 10 hours!\n Creating a user proxy with default length of 192h\n")
847              cmd = 'voms-proxy-init -voms '+self.VO
848              if self.group:
849                  cmd += ':/'+self.VO+'/'+self.group
850              if self.role:
851                  cmd += '/role='+self.role
852 <            cmd += ' -valid 96:00'
852 >            cmd += ' -valid 192:00'
853              try:
854                  # SL as above: damn it!
855                  common.logger.debug(10,cmd)
# Line 891 | Line 868 | class SchedulerEdg(Scheduler):
868              common.logger.message('No credential delegated to myproxy server '+self.proxyServer+' will do now')
869              renewProxy = 1
870          else:
871 <            # if myproxy exist but not long enough, renew
872 <            reTime = re.compile( r'timeleft: (\d+)' )
873 <            #print "<"+str(reTime.search( cmd_out ).group(1))+">"
874 <            if reTime.match( cmd_out ):
875 <                time = reTime.search( line ).group(1)
876 <                if time < minTimeLeftServer:
877 <                    renewProxy = 1
878 <                    common.logger.message('No credential delegation will expire in '+time+' hours: renew it')
871 >            ## minimum time: 5 days
872 >            minTime = 4 * 24 * 3600
873 >            ## regex to extract the right information
874 >            myproxyRE = re.compile("timeleft: (?P<hours>[\\d]*):(?P<minutes>[\\d]*):(?P<seconds>[\\d]*)")
875 >            for row in cmd_out.split("\n"):
876 >                g = myproxyRE.search(row)
877 >                if g:
878 >                    hours = g.group("hours")
879 >                    minutes = g.group("minutes")
880 >                    seconds = g.group("seconds")
881 >                    timeleft = int(hours)*3600 + int(minutes)*60 + int(seconds)
882 >                    if timeleft < minTime:
883 >                        renewProxy = 1
884 >                        common.logger.message('Your proxy will expire in:\n\t'+hours+' hours '+minutes+' minutes '+seconds+' seconds\n')
885 >                        common.logger.message('Need to renew it:')
886 >                    pass
887                  pass
888              pass
889          
# Line 921 | Line 906 | class SchedulerEdg(Scheduler):
906          if self.edg_config_vo:
907              edg_ui_cfg_opt += ' --config-vo ' + self.edg_config_vo + ' '
908          return edg_ui_cfg_opt
909 +
910 +    def submitTout(self, list):
911 +        return 120
912 +
913 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines