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.73.2.5.2.3 by fanzago, Thu Aug 24 15:32:15 2006 UTC vs.
Revision 1.108 by slacapra, Wed Dec 6 10:27:30 2006 UTC

# Line 5 | Line 5 | from crab_util import *
5   from EdgConfig import *
6   import common
7  
8 < import os, sys, time
8 > import os, sys, time, gzip
9  
10   class SchedulerEdg(Scheduler):
11      def __init__(self):
# Line 18 | Line 18 | class SchedulerEdg(Scheduler):
18                        "owner","parent_job", "reason","resubmitted","rsl","seed",\
19                        "stateEnterTime","stateEnterTimes","subjob_failed", \
20                        "user tags" , "status" , "status_code","hierarchy"]
21 +        
22          return
23  
24      def configure(self, cfg_params):
25  
26          try:
27 <            RB = cfg_params["EDG.rb"]
28 <            edgConfig = EdgConfig(RB)
28 <            self.edg_config = edgConfig.config()
29 <            self.edg_config_vo = edgConfig.configVO()
27 >            RB=cfg_params["EDG.rb"]
28 >            self.rb_param_file=self.rb_configure(RB)
29          except KeyError:
30 <            self.edg_config = ''
31 <            self.edg_config_vo = ''
33 <
30 >            self.rb_param_file=''
31 >            pass
32          try:
33              self.proxyServer = cfg_params["EDG.proxy_server"]
34          except KeyError:
35              self.proxyServer = 'myproxy.cern.ch'
36          common.logger.debug(5,'Setting myproxy server to '+self.proxyServer)
37  
38 +        try:
39 +            self.group = cfg_params["EDG.group"]
40 +        except KeyError:
41 +            self.group = None
42 +            
43 +        try:
44 +            self.role = cfg_params["EDG.role"]
45 +        except KeyError:
46 +            self.role = None
47 +            
48          try: self.LCG_version = cfg_params["EDG.lcg_version"]
49          except KeyError: self.LCG_version = '2'
50  
43        try: self.EDG_requirements = cfg_params['EDG.requirements']
44        except KeyError: self.EDG_requirements = ''
45
46        try: self.EDG_retry_count = cfg_params['EDG.retry_count']
47        except KeyError: self.EDG_retry_count = ''
48
51          try:
52              self.EDG_ce_black_list = cfg_params['EDG.ce_black_list']
53          except KeyError:
# Line 58 | Line 60 | class SchedulerEdg(Scheduler):
60          try: self.VO = cfg_params['EDG.virtual_organization']
61          except KeyError: self.VO = 'cms'
62  
63 <        try: self.return_data = cfg_params['USER.return_data']
62 <        except KeyError: self.return_data = 1
63 <
64 <        try:
65 <             self.copy_input_data = common.analisys_common_info['copy_input_data']
63 >        try: self.copy_input_data = cfg_params["USER.copy_input_data"]
64          except KeyError: self.copy_input_data = 0
65  
66 +        try: self.return_data = cfg_params['USER.return_data']
67 +        except KeyError: self.return_data = 0
68 +
69          try:
70              self.copy_data = cfg_params["USER.copy_data"]
71              if int(self.copy_data) == 1:
# Line 125 | Line 126 | class SchedulerEdg(Scheduler):
126  
127          try: self.EDG_requirements = cfg_params['EDG.requirements']
128          except KeyError: self.EDG_requirements = ''
129 <                                                                                                                                                            
129 >
130 >        try: self.EDG_addJdlParam = string.split(cfg_params['EDG.additional_jdl_parameters'],',')
131 >        except KeyError: self.EDG_addJdlParam = []
132 >
133          try: self.EDG_retry_count = cfg_params['EDG.retry_count']
134          except KeyError: self.EDG_retry_count = ''
135 <                                                                                                                                                            
135 >
136 >        try: self.EDG_shallow_retry_count= cfg_params['EDG.shallow_retry_count']
137 >        except KeyError: self.EDG_shallow_retry_count = ''
138 >
139          try: self.EDG_clock_time = cfg_params['EDG.max_wall_clock_time']
140          except KeyError: self.EDG_clock_time= ''
141 <                                                                                                                                                            
141 >
142          try: self.EDG_cpu_time = cfg_params['EDG.max_cpu_time']
143          except KeyError: self.EDG_cpu_time = ''
144  
145          # Add EDG_WL_LOCATION to the python path
146 +
147          try:
148              path = os.environ['EDG_WL_LOCATION']
149          except:
# Line 160 | Line 168 | class SchedulerEdg(Scheduler):
168          try: self.schedulerName = cfg_params['CRAB.scheduler']
169          except KeyError: self.scheduler = ''
170  
171 +        try: self.dontCheckProxy=cfg_params["EDG.dont_check_proxy"]
172 +        except KeyError: self.dontCheckProxy = 0
173 +
174          return
175      
176  
177 +    def rb_configure(self, RB):
178 +        self.edg_config = ''
179 +        self.edg_config_vo = ''
180 +        self.rb_param_file = ''
181 +
182 +        edgConfig = EdgConfig(RB)
183 +        self.edg_config = edgConfig.config()
184 +        self.edg_config_vo = edgConfig.configVO()
185 +
186 +        if (self.edg_config and self.edg_config_vo != ''):
187 +            self.rb_param_file = 'RBconfig = "'+self.edg_config+'";\nRBconfigVO = "'+self.edg_config_vo+'";'
188 +            #print "rb_param_file = ", self.rb_param_file
189 +        return self.rb_param_file
190 +      
191 +
192      def sched_parameter(self):
193          """
194 <        Returns file with scheduler-specific parameters
194 >        Returns file with requirements and scheduler-specific parameters
195          """
196 <        if (self.edg_config and self.edg_config_vo != ''):
197 <            self.param='sched_param.clad'
196 >        index = int(common.jobDB.nJobs()) - 1
197 >        job = common.job_list[index]
198 >        jbt = job.type()
199 >        
200 >        lastBlock=-1
201 >        first = []
202 >        for n in range(common.jobDB.nJobs()):
203 >            currBlock=common.jobDB.block(n)
204 >            if (currBlock!=lastBlock):
205 >                lastBlock = currBlock
206 >                first.append(n)
207 >  
208 >        req = ''
209 >        req = req + jbt.getRequirements()
210 >    
211 >        if self.EDG_requirements:
212 >            if (req == ' '):
213 >                req = req + self.EDG_requirements
214 >            else:
215 >                req = req +  ' && ' + self.EDG_requirements
216 >
217 >        if self.EDG_ce_white_list:
218 >            ce_white_list = string.split(self.EDG_ce_white_list,',')
219 >            for i in range(len(ce_white_list)):
220 >                if i == 0:
221 >                    if (req == ' '):
222 >                        req = req + '((RegExp("' + string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
223 >                    else:
224 >                        req = req +  ' && ((RegExp("' +  string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
225 >                    pass
226 >                else:
227 >                    req = req +  ' || (RegExp("' +  string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
228 >            req = req + ')'
229 >        
230 >        if self.EDG_ce_black_list:
231 >            ce_black_list = string.split(self.EDG_ce_black_list,',')
232 >            for ce in ce_black_list:
233 >                if (req == ' '):
234 >                    req = req + '(!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))'
235 >                else:
236 >                    req = req +  ' && (!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))'
237 >                pass
238 >        if self.EDG_clock_time:
239 >            if (req == ' '):
240 >                req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
241 >            else:
242 >                req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
243 >
244 >        if self.EDG_cpu_time:
245 >            if (req == ' '):
246 >                req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
247 >            else:
248 >                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
249 >                
250 >        for i in range(len(first)): # Add loop DS
251 >            groupReq = req
252 >            self.param='sched_param_'+str(i)+'.clad'
253              param_file = open(common.work_space.shareDir()+'/'+self.param, 'w')
254 <            param_file.write('RBconfig = "'+self.edg_config+'";\n')  
255 <            param_file.write('RBconfigVO = "'+self.edg_config_vo+'";')
254 >
255 >            itr4=self.findSites_(first[i])
256 >            for arg in itr4:
257 >                groupReq = groupReq + ' && anyMatch(other.storage.CloseSEs, ('+str(arg)+'))'
258 >            param_file.write('Requirements = '+groupReq +';\n')  
259 >  
260 >            if (self.rb_param_file != ''):
261 >                param_file.write(self.rb_param_file)  
262 >
263 >            if len(self.EDG_addJdlParam):
264 >                for p in self.EDG_addJdlParam:
265 >                    param_file.write(p)
266 >
267              param_file.close()  
268 <            return 1
177 <        else:
178 <            return 0
268 >
269  
270      def wsSetupEnvironment(self):
271          """
272          Returns part of a job script which does scheduler-specific work.
273          """
274          txt = ''
275 +        txt += '# strip arguments\n'
276 +        txt += 'echo "strip arguments"\n'
277 +        txt += 'args=("$@")\n'
278 +        txt += 'nargs=$#\n'
279 +        txt += 'shift $nargs\n'
280          txt += "# job number (first parameter for job wrapper)\n"
281 <        txt += "NJob=$1\n"
281 >        #txt += "NJob=$1\n"
282 >        txt += "NJob=${args[0]}\n"
283  
284          txt += '# job identification to DashBoard \n'
285          txt += 'MonitorJobID=`echo ${NJob}_$EDG_WL_JOBID`\n'
# Line 194 | Line 290 | class SchedulerEdg(Scheduler):
290          txt += 'echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
291  
292          txt += 'echo "middleware discovery " \n'
293 <        txt += 'if [ $VO_CMS_SW_DIR ]; then \n'
198 <        txt += '    middleware=LCG \n'
199 <        txt += '    echo "SyncCE=`edg-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
200 <        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
201 <        txt += '    echo "middleware =$middleware" \n'
202 <        txt += 'elif [ $GRID3_APP_DIR ]; then\n'
293 >        txt += 'if [ $GRID3_APP_DIR ]; then\n'
294          txt += '    middleware=OSG \n'
295          txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
296          txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
# Line 209 | Line 300 | class SchedulerEdg(Scheduler):
300          txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
301          txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
302          txt += '    echo "middleware =$middleware" \n'
303 +        txt += 'elif [ $VO_CMS_SW_DIR ]; then \n'
304 +        txt += '    middleware=LCG \n'
305 +        txt += '    echo "SyncCE=`edg-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
306 +        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
307 +        txt += '    echo "middleware =$middleware" \n'
308          txt += 'else \n'
309          txt += '    echo "SET_CMS_ENV 10030 ==> middleware not identified" \n'
310          txt += '    echo "JOB_EXIT_STATUS = 10030" \n'
# Line 238 | Line 334 | class SchedulerEdg(Scheduler):
334                txt += 'echo "SE_PATH = $SE_PATH"\n'
335  
336          txt += 'export VO='+self.VO+'\n'
337 <        ### FEDE: add some line for LFC catalog setting
337 >        ### add some line for LFC catalog setting
338          txt += 'if [ $middleware == LCG ]; then \n'
339          txt += '    if [[ $LCG_CATALOG_TYPE != \''+self.lcg_catalog_type+'\' ]]; then\n'
340          txt += '        export LCG_CATALOG_TYPE='+self.lcg_catalog_type+'\n'
# Line 305 | Line 401 | class SchedulerEdg(Scheduler):
401          Copy input data from SE to WN    
402          """
403          txt = ''
404 <        try:
405 <            self.copy_input_data = common.analisys_common_info['copy_input_data']
310 <            #print "self.copy_input_data = ", self.copy_input_data
311 <        except KeyError: self.copy_input_data = 0
312 <        if int(self.copy_input_data) == 1:
404 >        if not self.copy_input_data: return txt
405 >
406          ## OLI_Daniele deactivate for OSG (wait for LCG UI installed on OSG)
407 <           txt += 'if [ $middleware == OSG ]; then\n'
408 <           txt += '   #\n'
409 <           txt += '   #   Copy Input Data from SE to this WN deactivated in OSG mode\n'
410 <           txt += '   #\n'
411 <           txt += '   echo "Copy Input Data from SE to this WN deactivated in OSG mode"\n'
412 <           txt += 'elif [ $middleware == LCG ]; then \n'
413 <           txt += '   #\n'
414 <           txt += '   #   Copy Input Data from SE to this WN\n'
415 <           txt += '   #\n'
416 < ### changed by georgia (put a loop copying more than one input files per jobs)          
417 <           txt += '   for input_file in $cur_file_list \n'
418 <           txt += '   do \n'
419 <           #### FEDE
420 <           #txt += '      echo "which lcg-cp" \n'
421 <           #txt += '      which lcg-cp \n'
422 <           #########
423 <           txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$input_lfn/$input_file file:`pwd`/$input_file 2>&1\n'
424 <           txt += '      copy_input_exit_status=$?\n'
425 <           txt += '      echo "COPY_INPUT_EXIT_STATUS = $copy_input_exit_status"\n'
426 <           txt += '      if [ $copy_input_exit_status -ne 0 ]; then \n'
427 <           txt += '         echo "Problems with copying to WN" \n'
428 <           txt += '      else \n'
429 <           txt += '         echo "input copied into WN" \n'
430 <           txt += '      fi \n'
431 <           txt += '   done \n'
432 < ### copy a set of PU ntuples (same for each jobs -- but accessed randomly)
433 <           txt += '   for file in $cur_pu_list \n'
434 <           txt += '   do \n'
435 <           #### FEDE
436 <           #txt += '      echo "which lcg-cp" \n'
437 <           #txt += '      which lcg-cp \n'
438 <           #########
439 <           txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$pu_lfn/$file file:`pwd`/$file 2>&1\n'
440 <           txt += '      copy_input_pu_exit_status=$?\n'
441 <           txt += '      echo "COPY_INPUT_PU_EXIT_STATUS = $copy_input_pu_exit_status"\n'
442 <           txt += '      if [ $copy_input_pu_exit_status -ne 0 ]; then \n'
443 <           txt += '         echo "Problems with copying pu to WN" \n'
351 <           txt += '      else \n'
352 <           txt += '         echo "input pu files copied into WN" \n'
353 <           txt += '      fi \n'
354 <           txt += '   done \n'
355 <           txt += '   \n'
356 <           txt += '   ### Check SCRATCH space available on WN : \n'
357 <           txt += '   df -h \n'
358 <           txt += 'fi \n'
407 >        txt += 'if [ $middleware == OSG ]; then\n'
408 >        txt += '   #\n'
409 >        txt += '   #   Copy Input Data from SE to this WN deactivated in OSG mode\n'
410 >        txt += '   #\n'
411 >        txt += '   echo "Copy Input Data from SE to this WN deactivated in OSG mode"\n'
412 >        txt += 'elif [ $middleware == LCG ]; then \n'
413 >        txt += '   #\n'
414 >        txt += '   #   Copy Input Data from SE to this WN\n'
415 >        txt += '   #\n'
416 >        ### changed by georgia (put a loop copying more than one input files per jobs)          
417 >        txt += '   for input_file in $cur_file_list \n'
418 >        txt += '   do \n'
419 >        txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$input_lfn/$input_file file:`pwd`/$input_file 2>&1\n'
420 >        txt += '      copy_input_exit_status=$?\n'
421 >        txt += '      echo "COPY_INPUT_EXIT_STATUS = $copy_input_exit_status"\n'
422 >        txt += '      if [ $copy_input_exit_status -ne 0 ]; then \n'
423 >        txt += '         echo "Problems with copying to WN" \n'
424 >        txt += '      else \n'
425 >        txt += '         echo "input copied into WN" \n'
426 >        txt += '      fi \n'
427 >        txt += '   done \n'
428 >        ### copy a set of PU ntuples (same for each jobs -- but accessed randomly)
429 >        txt += '   for file in $cur_pu_list \n'
430 >        txt += '   do \n'
431 >        txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$pu_lfn/$file file:`pwd`/$file 2>&1\n'
432 >        txt += '      copy_input_pu_exit_status=$?\n'
433 >        txt += '      echo "COPY_INPUT_PU_EXIT_STATUS = $copy_input_pu_exit_status"\n'
434 >        txt += '      if [ $copy_input_pu_exit_status -ne 0 ]; then \n'
435 >        txt += '         echo "Problems with copying pu to WN" \n'
436 >        txt += '      else \n'
437 >        txt += '         echo "input pu files copied into WN" \n'
438 >        txt += '      fi \n'
439 >        txt += '   done \n'
440 >        txt += '   \n'
441 >        txt += '   ### Check SCRATCH space available on WN : \n'
442 >        txt += '   df -h \n'
443 >        txt += 'fi \n'
444            
445          return txt
446  
# Line 369 | Line 454 | class SchedulerEdg(Scheduler):
454             txt += '#\n'
455             txt += '#   Copy output to SE = $SE\n'
456             txt += '#\n'
372           #txt += 'if [ $exe_result -eq 0 ]; then\n'
457             txt += '    if [ $middleware == OSG ]; then\n'
458             txt += '        echo "X509_USER_PROXY = $X509_USER_PROXY"\n'
459             txt += '        echo "source $OSG_APP/glite/setup_glite_ui.sh"\n'
# Line 377 | Line 461 | class SchedulerEdg(Scheduler):
461             txt += '        export X509_CERT_DIR=$OSG_APP/glite/etc/grid-security/certificates\n'
462             txt += '        echo "export X509_CERT_DIR=$X509_CERT_DIR"\n'
463             txt += '    fi \n'
464 +
465             txt += '    for out_file in $file_list ; do\n'
466 <           txt += '        echo "Trying to copy output file to $SE using lcg-cp"\n'
467 <           txt += '        echo "lcg-cp --vo $VO -t 1200 --verbose file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
468 <           txt += '        exitstring=`lcg-cp --vo $VO -t 1200 --verbose file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
466 >           txt += '        echo "Trying to copy output file to $SE using srmcp"\n'
467 >           txt += '        echo "mkdir -p $HOME/.srmconfig"\n'
468 >           txt += '        mkdir -p $HOME/.srmconfig\n'
469 >           txt += '        if [ $middleware == LCG ]; then\n'
470 >           txt += '           echo "srmcp -retry_num 3 -retry_timeout 480000 file:////`pwd`/$out_file srm://${SE}:8443${SE_PATH}$out_file"\n'
471 >           txt += '           exitstring=`srmcp -retry_num 3 -retry_timeout 480000 file:////\`pwd\`/$out_file srm://${SE}:8443${SE_PATH}$out_file 2>&1`\n'
472 >           txt += '        elif [ $middleware == OSG ]; then\n'
473 >           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'
474 >           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'
475 >           txt += '        fi \n'
476             txt += '        copy_exit_status=$?\n'
477 <           txt += '        echo "COPY_EXIT_STATUS for lcg-cp = $copy_exit_status"\n'
477 >           txt += '        echo "COPY_EXIT_STATUS for srmcp = $copy_exit_status"\n'
478             txt += '        echo "STAGE_OUT = $copy_exit_status"\n'
479 +
480             txt += '        if [ $copy_exit_status -ne 0 ]; then\n'
481             txt += '            echo "Possible problem with SE = $SE"\n'
482             txt += '            echo "StageOutExitStatus = 198" | tee -a $RUNTIME_AREA/$repo\n'
483             txt += '            echo "StageOutExitStatusReason = $exitstring" | tee -a $RUNTIME_AREA/$repo\n'
484 <           txt += '            echo "lcg-cp failed, attempting srmcp"\n'
485 <           txt += '            echo "mkdir -p $HOME/.srmconfig"\n'
486 <           txt += '            mkdir -p $HOME/.srmconfig\n'
487 <           txt += '            if [ $middleware == LCG ]; then\n'
488 <           txt += '               echo "srmcp -retry_num 5 -retry_timeout 240000 file:////`pwd`/$out_file srm://${SE}:8443${SE_PATH}$out_file"\n'
489 <           txt += '               exitstring=`srmcp -retry_num 5 -retry_timeout 240000 file:////\`pwd\`/$out_file srm://${SE}:8443${SE_PATH}$out_file 2>&1`\n'
490 <           txt += '            elif [ $middleware == OSG ]; then\n'
398 <           txt += '               echo "srmcp -retry_num 5 -retry_timeout 240000 -x509_user_trusted_certificates $OSG_APP/glite/etc/grid-security/certificates file:////`pwd`/$out_file srm://${SE}:8443${SE_PATH}$out_file"\n'
399 <           txt += '               exitstring=`srmcp -retry_num 5 -retry_timeout 240000 -x509_user_trusted_certificates $OSG_APP/glite/etc/grid-security/certificates file:////\`pwd\`/$out_file srm://${SE}:8443${SE_PATH}$out_file 2>&1`\n'
400 <           txt += '            fi \n'
484 >           txt += '            echo "srmcp failed, attempting lcg-cp."\n'
485 >           if common.logger.debugLevel() >= 5:
486 >               txt += '            echo "lcg-cp --vo $VO -t 2400 --verbose file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
487 >               txt += '            exitstring=`lcg-cp --vo $VO -t 2400 --verbose file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
488 >           else:              
489 >               txt += '            echo "lcg-cp --vo $VO -t 2400 file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
490 >               txt += '            exitstring=`lcg-cp --vo $VO -t 2400 file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
491             txt += '            copy_exit_status=$?\n'
492 <           txt += '            echo "COPY_EXIT_STATUS for srm = $copy_exit_status"\n'
492 >           txt += '            echo "COPY_EXIT_STATUS for lcg-cp = $copy_exit_status"\n'
493             txt += '            echo "STAGE_OUT = $copy_exit_status"\n'
494 +
495             txt += '            if [ $copy_exit_status -ne 0 ]; then\n'
496             txt += '               echo "Problems with SE = $SE"\n'
497             txt += '               echo "StageOutExitStatus = 198" | tee -a $RUNTIME_AREA/$repo\n'
498             txt += '               echo "StageOutExitStatusReason = $exitstring" | tee -a $RUNTIME_AREA/$repo\n'
499 <           txt += '               echo "lcg-cp and srm failed"\n'
409 <           txt += '               echo "If storage_path in your config file contains a ? you may need a \? instead."\n'
499 >           txt += '               echo "srmcp and lcg-cp and failed!"\n'
500             txt += '            else\n'
501             txt += '               echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
502             txt += '               echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
503             txt += '               echo "output copied into $SE/$SE_PATH directory"\n'
504             txt += '               echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
505 <           txt += '               echo "srmcp succeeded"\n'
505 >           txt += '               echo "lcg-cp succeeded"\n'
506             txt += '            fi\n'
507             txt += '        else\n'
508             txt += '            echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
509             txt += '            echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
510             txt += '            echo "output copied into $SE/$SE_PATH directory"\n'
511             txt += '            echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
512 <           txt += '            echo "lcg-cp succeeded"\n'
512 >           txt += '            echo "srmcp succeeded"\n'
513             txt += '         fi\n'
514             txt += '     done\n'
425           #txt += 'fi\n'
515          return txt
516  
517      def wsRegisterOutput(self):
# Line 442 | Line 531 | class SchedulerEdg(Scheduler):
531             txt += '#\n'
532             txt += '#  Register output to LFC\n'
533             txt += '#\n'
445           #txt += '   if [[ $exe_result -eq 0 && $copy_exit_status -eq 0 ]]; then\n'
534             txt += '   if [ $copy_exit_status -eq 0 ]; then\n'
535             txt += '      for out_file in $file_list ; do\n'
536             txt += '         echo "Trying to register the output file into LFC"\n'
449           #### FEDE
450           #txt += '         echo "which lcg-rf" \n'
451           #txt += '         which lcg-rf \n'
452           #########
537             txt += '         echo "lcg-rf -l $LFN/$out_file --vo $VO -t 1200 sfn://$SE$SE_PATH/$out_file 2>&1"\n'
538             txt += '         lcg-rf -l $LFN/$out_file --vo $VO -t 1200 sfn://$SE$SE_PATH/$out_file 2>&1 \n'
539             txt += '         register_exit_status=$?\n'
# Line 458 | Line 542 | class SchedulerEdg(Scheduler):
542             txt += '         if [ $register_exit_status -ne 0 ]; then \n'
543             txt += '            echo "Problems with the registration to LFC" \n'
544             txt += '            echo "Try with srm protocol" \n'
461           #### FEDE
462           #txt += '            echo "which lcg-rf" \n'
463           #txt += '            which lcg-rf \n'
464           #########
545             txt += '            echo "lcg-rf -l $LFN/$out_file --vo $VO -t 1200 srm://$SE$SE_PATH/$out_file 2>&1"\n'
546             txt += '            lcg-rf -l $LFN/$out_file --vo $VO -t 1200 srm://$SE$SE_PATH/$out_file 2>&1 \n'
547             txt += '            register_exit_status=$?\n'
# Line 475 | Line 555 | class SchedulerEdg(Scheduler):
555             txt += '         fi \n'
556             txt += '         echo "StageOutExitStatus = $register_exit_status" | tee -a $RUNTIME_AREA/$repo\n'
557             txt += '      done\n'
478           #txt += '   elif [[ $exe_result -eq 0 && $copy_exit_status -ne 0 ]]; then \n'
558             txt += '   else \n'
559             txt += '      echo "Trying to copy output file to CloseSE"\n'
560             txt += '      CLOSE_SE=`edg-brokerinfo getCloseSEs | head -1`\n'
561             txt += '      for out_file in $file_list ; do\n'
483           #### FEDE
484           #txt += '         echo "which lcg-cr" \n'
485           #txt += '         which lcg-cr \n'
486           #########
562             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'
563             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'
564             txt += '         register_exit_status=$?\n'
# Line 498 | Line 573 | class SchedulerEdg(Scheduler):
573             txt += '         fi \n'
574             txt += '         echo "StageOutExitStatus = $register_exit_status" | tee -a $RUNTIME_AREA/$repo\n'
575             txt += '      done\n'
501           #txt += '   else\n'
502           #txt += '      echo "Problem with the executable"\n'
576             txt += '   fi \n'
577             txt += '   exit_status=$register_exit_status\n'
578             txt += 'fi \n'
# Line 511 | Line 584 | class SchedulerEdg(Scheduler):
584          """
585          self.checkProxy()
586          cmd = 'edg-job-get-logging-info -v 2 ' + id
514        #cmd_out = os.popen(cmd)
587          cmd_out = runCommand(cmd)
588          return cmd_out
589  
518    def listMatch(self, nj):
519        """
520        Check the compatibility of available resources
521        """
522        self.checkProxy()
523        jdl = common.work_space.shareDir()+"fake.jdl"
524        cmd = 'edg-job-list-match ' + self.configOpt_() + str(jdl)
525        cmd_out = runCommand(cmd,0,10)
526        if not cmd_out:
527            raise CrabException("ERROR: "+cmd+" failed!")
528
529        return self.parseListMatch_(cmd_out, jdl)
530
531    def parseListMatch_(self, out, jdl):
532        """
533        Parse the f* output of edg-list-match and produce something sensible
534        """
535        reComment = re.compile( r'^\**$' )
536        reEmptyLine = re.compile( r'^$' )
537        reVO = re.compile( r'Selected Virtual Organisation name.*' )
538        reLine = re.compile( r'.*')
539        reCE = re.compile( r'(.*:.*)')
540        reCEId = re.compile( r'CEId.*')
541        reNO = re.compile( r'No Computing Element matching' )
542        reRB = re.compile( r'Connecting to host' )
543        next = 0
544        CEs=[]
545        Match=0
546
547        #print out
548        lines = reLine.findall(out)
549
550        i=0
551        CEs=[]
552        for line in lines:
553            string.strip(line)
554            #print line
555            if reNO.match( line ):
556                common.logger.debug(5,line)
557                return 0
558                pass
559            if reVO.match( line ):
560                VO =reVO.match( line ).group()
561                common.logger.debug(5,"VO "+VO)
562                pass
563
564            if reRB.match( line ):
565                RB = reRB.match(line).group()
566                common.logger.debug(5,"RB "+RB)
567                pass
568
569            if reCEId.search( line ):
570                for lineCE in lines[i:-1]:
571                    if reCE.match( lineCE ):
572                        CE = string.strip(reCE.search(lineCE).group(1))
573                        CEs.append(CE.split(':')[0])
574                        pass
575                    pass
576                pass
577            i=i+1
578            pass
579
580        common.logger.debug(5,"All CE :"+str(CEs))
581
582        sites = []
583        [sites.append(it) for it in CEs if not sites.count(it)]
584
585        common.logger.debug(5,"All Sites :"+str(sites))
586        common.logger.message("Matched Sites :"+str(sites))
587        return len(sites)
588
589    def noMatchFound_(self, jdl):
590        reReq = re.compile( r'Requirements' )
591        reString = re.compile( r'"\S*"' )
592        f = file(jdl,'r')
593        for line in f.readlines():
594            line= line.strip()
595            if reReq.match(line):
596                for req in reString.findall(line):
597                    if re.search("VO",req):
598                        common.logger.message( "SW required: "+req)
599                        continue
600                    if re.search('"\d+',req):
601                        common.logger.message("Other req  : "+req)
602                        continue
603                    common.logger.message( "CE required: "+req)
604                break
605            pass
606        raise CrabException("No compatible resources found!")
607
608    def submit(self, nj):
609        """
610        Submit one EDG job.
611        """
612
613        self.checkProxy()
614        jid = None
615        jdl = common.job_list[nj].jdlFilename()
616
617        cmd = 'edg-job-submit ' + self.configOpt_() + jdl
618        cmd_out = runCommand(cmd)
619        if cmd_out != None:
620            reSid = re.compile( r'https.+' )
621            jid = reSid.search(cmd_out).group()
622            pass
623        return jid
624
625    def resubmit(self, nj_list):
626        """
627        Prepare jobs to be submit
628        """
629        return
630
631    def getExitStatus(self, id):
632        return self.getStatusAttribute_(id, 'exit_code')
633
634    def queryStatus(self, id):
635        return self.getStatusAttribute_(id, 'status')
636
637    def queryDest(self, id):  
638        return self.getStatusAttribute_(id, 'destination')
639
640
641    def getStatusAttribute_(self, id, attr):
642        """ Query a status of the job with id """
643
644        self.checkProxy()
645        hstates = {}
646        Status = importName('edg_wl_userinterface_common_LbWrapper', 'Status')
647        # Bypass edg-job-status interfacing directly to C++ API
648        # Job attribute vector to retrieve status without edg-job-status
649        level = 0
650        # Instance of the Status class provided by LB API
651        jobStat = Status()
652        st = 0
653        jobStat.getStatus(id, level)
654        err, apiMsg = jobStat.get_error()
655        if err:
656            common.logger.debug(5,'Error caught' + apiMsg)
657            return None
658        else:
659            for i in range(len(self.states)):
660                # Fill an hash table with all information retrieved from LB API
661                hstates[ self.states[i] ] = jobStat.loadStatus(st)[i]
662            result = jobStat.loadStatus(st)[ self.states.index(attr) ]
663            return result
664
590      def queryDetailedStatus(self, id):
591          """ Query a detailed status of the job with id """
592          cmd = 'edg-job-status '+id
593          cmd_out = runCommand(cmd)
594          return cmd_out
595  
596 <    def getOutput(self, id):
597 <        """
598 <        Get output for a finished job with id.
599 <        Returns the name of directory with results.
600 <        """
596 >    ##### FEDE ######        
597 >    def findSites_(self, n):
598 >        itr4 =[]
599 >        sites = common.jobDB.destination(n)
600 >        if len(sites)>0 and sites[0]=="Any":
601 >            return itr4
602 >        itr = ''
603 >        if sites != [""]:#CarlosDaniele
604 >            for site in sites:
605 >                #itr = itr + 'target.GlueSEUniqueID==&quot;'+site+'&quot; || '
606 >                itr = itr + 'target.GlueSEUniqueID=="'+site+'" || '
607 >            itr = itr[0:-4]
608 >            itr4.append( itr )
609 >        return itr4
610  
611 <        self.checkProxy()
612 <        cmd = 'edg-job-get-output --dir ' + common.work_space.resDir() + ' ' + id
679 <        cmd_out = runCommand(cmd)
680 <
681 <        # Determine the output directory name
682 <        dir = common.work_space.resDir()
683 <        dir += os.environ['USER']
684 <        dir += '_' + os.path.basename(id)
685 <        return dir
686 <
687 <    def cancel(self, id):
688 <        """ Cancel the EDG job with id """
689 <        self.checkProxy()
690 <        cmd = 'edg-job-cancel --noint ' + id
691 <        cmd_out = runCommand(cmd)
692 <        return cmd_out
693 <
694 <    def createFakeJdl(self,nj):  # TMP Just waiting listmatch functionalitly  
695 <                                  # implementation into BOSS4   Daniele
696 <        """                          
697 <        Create a fake jdl considering
698 <        only requirements  
699 <        """
700 <        #job = common.job_list[nj]
701 <        job = common.job_list[0]
702 <        jbt = job.type()
703 <        inp_storage_subdir = ''
704 <        
705 <        
706 <        SPL = inp_storage_subdir
707 <        if ( SPL and SPL[-1] != '/' ) : SPL = SPL + '/'
708 <
709 <        jdl = open(common.work_space.shareDir()+"fake.jdl","w")
710 <
711 <        script = job.scriptFilename()
712 <        jdl.write('Executable = "' + os.path.basename(script) +'";\n')
713 <
714 <        req='Requirements = '
715 <        noreq=req
716 <        req = req + jbt.getRequirements()
717 <        #### and USER REQUIREMENT
718 <        if self.EDG_requirements:
719 <            if (req != noreq):
720 <                req = req +  ' && '
721 <            req = req + self.EDG_requirements
722 <        #### FEDE #####
723 <        if self.EDG_ce_white_list:
724 <            ce_white_list = string.split(self.EDG_ce_white_list,',')
725 <            #print "req = ", req
726 <            for i in range(len(ce_white_list)):
727 <                if i == 0:
728 <                    if (req != noreq):
729 <                        req = req +  ' && '
730 <                    req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
731 <                    pass
732 <                else:
733 <                    req = req +  ' || (RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
734 <            req = req + ')'
735 <        
736 <        if self.EDG_ce_black_list:
737 <            ce_black_list = string.split(self.EDG_ce_black_list,',')
738 <            for ce in ce_black_list:
739 <                if (req != noreq):
740 <                    req = req +  ' && '
741 <                req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
742 <                pass
743 <
744 <        ###############
745 <        clockTime=480
746 <        if self.EDG_clock_time:
747 <            clockTime= self.EDG_clock_time
748 <        if (req != noreq):
749 <            req = req + ' && '
750 <        req = req + '((other.GlueCEPolicyMaxWallClockTime == 0) || (other.GlueCEPolicyMaxWallClockTime>='+str(clockTime)+'))'
751 <
752 <        cpuTime=1000
753 <        if self.EDG_cpu_time:
754 <            cpuTime=self.EDG_cpu_time
755 <        if (req != noreq):
756 <            req = req + ' && '
757 <        req = req + '((other.GlueCEPolicyMaxCPUTime == 0) || (other.GlueCEPolicyMaxCPUTime>='+str(cpuTime)+'))'
758 <
759 <        if (req != noreq):
760 <            req = req + ';\n'
761 <            jdl.write(req)
762 <                                                                                                                                                            
763 <        jdl.write('VirtualOrganisation = "' + self.VO + '";\n')
764 <
765 <        if ( self.EDG_retry_count ):              
766 <            jdl.write('RetryCount = '+self.EDG_retry_count+';\n')
767 <            pass
768 <
769 <        jdl.write('MyProxyServer = "' + self.proxyServer + '";\n')
770 <
771 <        jdl.close()
772 <        return
773 <        
774 <
775 <    def createXMLSchScript(self, nj, argsList, jobList):
776 <   # def createXMLSchScript(self, nj):
611 >    def createXMLSchScript(self, nj, argsList):
612 >      
613          """
614          Create a XML-file for BOSS4.
615          """
616    #      job = common.job_list[nj]
781
617          """
618          INDY
619 <        [begin] da rivedere:
620 <        in particolare passerei il jobType ed eliminerei le dipendenze da job
619 >        [begin] FIX-ME:
620 >        I would pass jobType instead of job
621          """
622          index = nj - 1
623          job = common.job_list[index]
# Line 791 | Line 626 | class SchedulerEdg(Scheduler):
626          inp_sandbox = jbt.inputSandbox(index)
627          out_sandbox = jbt.outputSandbox(index)
628          """
629 <        [end] da rivedere
629 >        [end] FIX-ME
630          """
631  
632          
# Line 807 | Line 642 | class SchedulerEdg(Scheduler):
642    
643          to_writeReq = ''
644          to_write = ''
645 +
646          req=' '
647          req = req + jbt.getRequirements()
648 +
649          if self.EDG_requirements:
650              if (req == ' '):
651                  req = req + self.EDG_requirements
# Line 846 | Line 683 | class SchedulerEdg(Scheduler):
683                  req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
684              else:
685                  req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
686 <        if (req != ' '):
850 <            req = req + '\n'
851 <            to_writeReq = req
852 <                                                                                                                                                            
853 <
686 >                                                                                          
687          if ( self.EDG_retry_count ):              
688              to_write = to_write + 'RetryCount = "'+self.EDG_retry_count+'"\n'
689              pass
690  
691 <        #to_write = to_write + 'MyProxyServer = "&quot;' + self.proxyServer + '&quot;"\n'
692 <        to_write = to_write + 'MyProxyServer = "' + self.proxyServer + '"\n'
693 <        to_write = to_write + 'VirtualOrganisation = "' + self.VO + '"\n'
691 >        if ( self.EDG_shallow_retry_count ):              
692 >            to_write = to_write + 'ShallowRetryCount = "'+self.EDG_shallow_retry_count+'"\n'
693 >            pass
694  
695 +        to_write = to_write + 'MyProxyServer = "&quot;' + self.proxyServer + '&quot;"\n'
696 +        to_write = to_write + 'VirtualOrganisation = "&quot;' + self.VO + '&quot;"\n'
697  
698          #TaskName  
699          dir = string.split(common.work_space.topDir(), '/')
700          taskName = dir[len(dir)-2]
701  
867
702          xml.write(str(title))
703 <        xml.write('<task name="' +str(taskName)+'">\n')
703 >        xml.write('<task name="' +str(taskName)+'" sub_path="' + common.work_space.bossCache() + '">\n')
704          xml.write(jt_string)
871        #Here it must pass the extra Tags.. (into Task & out of chain)  
872        if (to_writeReq != ''):
873            xml.write('<extraTags>\n')
874            xml.write('<Requirements>\n')
875            xml.write('<![CDATA[\n')
876            xml.write(to_writeReq)
877            xml.write(']]>\n')
878            xml.write('</Requirements>\n')
879            xml.write('</extraTags>\n')
880            pass
705          
706          if (to_write != ''):
707              xml.write('<extraTags\n')
# Line 886 | Line 710 | class SchedulerEdg(Scheduler):
710              pass
711  
712          xml.write('<iterator>\n')
713 <        print str(nj)
714 <        xml.write('\t<iteratorRule name="ITR1" rule="1:'+ str(nj) + '" />\n')
715 <        print argsList
716 <        xml.write('\t<iteratorRule name="ITR2" rule="'+ argsList + '" />\n')
717 <        print jobList
718 <        xml.write('\t<iteratorRule name="ITR3" rule="'+ jobList + '" />\n')
719 <
713 >        xml.write('\t<iteratorRule name="ITR1">\n')
714 >        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ' </ruleElement>\n')
715 >        xml.write('\t</iteratorRule>\n')
716 >        xml.write('\t<iteratorRule name="ITR2">\n')
717 >        for arg in argsList:
718 >            xml.write('\t\t<ruleElement> <![CDATA[\n'+ arg + '\n\t\t]]> </ruleElement>\n')
719 >            pass
720 >        xml.write('\t</iteratorRule>\n')
721 >        #print jobList
722 >        xml.write('\t<iteratorRule name="ITR3">\n')
723 >        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ':1:6 </ruleElement>\n')
724 >        xml.write('\t</iteratorRule>\n')
725 >
726 >        '''
727 >        indy: here itr4
728 >        '''
729 >        
730 >
731          xml.write('<chain scheduler="'+str(self.schedulerName)+'">\n')
732          xml.write(jt_string)
733  
# Line 900 | Line 735 | class SchedulerEdg(Scheduler):
735  
736          """
737          INDY
738 <        script dipende dal jobType: dovrebbe essere semplice tirarlo fuori in altro modo
738 >        script depends on jobType: it should be probably get in a different way
739          """        
740          script = job.scriptFilename()
741 <        xml.write('<program exec="' + os.path.basename(script) +'"\n')
741 >        xml.write('<program>\n')
742 >        xml.write('<exec> ' + os.path.basename(script) +' </exec>\n')
743          xml.write(jt_string)
744 <    
745 <          
746 <        ### only one .sh  JDL has arguments:
747 <        ### Fabio
912 < #        xml.write('args = "' + str(nj+1)+' '+ jbt.getJobTypeArguments(nj, "EDG") +'"\n')
913 <        xml.write('args = "_ITR2_"\n')
914 <        xml.write('program_types="crabjob"\n')
915 <        inp_box = 'infiles="'
916 <        inp_box = inp_box + '' + script + ','
744 >
745 >        xml.write('<args> <![CDATA[\n _ITR2_ \n]]> </args>\n')
746 >        xml.write('<program_types> crabjob </program_types>\n')
747 >        inp_box = common.work_space.pathForTgz() + 'job/' + jbt.scriptName + ','
748  
749          if inp_sandbox != None:
750              for fl in inp_sandbox:
# Line 921 | Line 752 | class SchedulerEdg(Scheduler):
752                  pass
753              pass
754  
924        # Marco (VERY TEMPORARY ML STUFF)
925        inp_box = inp_box + os.path.abspath(os.environ['CRABDIR']+'/python/'+'report.py') + ',' +\
926                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'DashboardAPI.py') + ','+\
927                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'Logger.py') + ','+\
928                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'ProcInfo.py') + ','+\
929                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'apmon.py')
930        # End Marco
931
755          if (not jbt.additional_inbox_files == []):
756 <            inp_box = inp_box + ', '
756 >            inp_box = inp_box + ','
757              for addFile in jbt.additional_inbox_files:
758                  addFile = os.path.abspath(addFile)
759                  inp_box = inp_box+''+addFile+','
760                  pass
761  
762          if inp_box[-1] == ',' : inp_box = inp_box[:-1]
763 <        inp_box = inp_box + ' "\n'
763 >        inp_box = '<infiles> <![CDATA[\n' + inp_box + '\n]]> </infiles>\n'
764          xml.write(inp_box)
765          
766          base = jbt.name()
767          stdout = base + '__ITR3_.stdout'
768          stderr = base + '__ITR3_.stderr'
769          
770 <        xml.write('stderr="' + stdout + '"\n')
771 <        xml.write('stdout="' + stderr + '"\n')
770 >        xml.write('<stderr> ' + stderr + '</stderr>\n')
771 >        xml.write('<stdout> ' + stdout + '</stdout>\n')
772          
773  
774 <        out_box = 'outfiles="' + \
952 <                  stdout + ',' + \
774 >        out_box = stdout + ',' + \
775                    stderr + ',.BrokerInfo,'
776  
777          """
# Line 964 | Line 786 | class SchedulerEdg(Scheduler):
786  
787          """
788          INDY
789 <        qualcosa del genere andrebbe fatta per gli infiles
790 <        """        
789 >        something similar should be also done for infiles (if it makes sense!)
790 >        """
791 >        # Stuff to be returned _always_ via sandbox
792 >        for fl in jbt.output_file_sandbox:
793 >            out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
794 >            pass
795 >        pass
796 >
797 >        # via sandbox iif required return_data
798          if int(self.return_data) == 1:
799              for fl in jbt.output_file:
800                  out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
# Line 973 | Line 802 | class SchedulerEdg(Scheduler):
802              pass
803  
804          if out_box[-1] == ',' : out_box = out_box[:-1]
805 <        out_box = out_box + '"'
806 <        xml.write(out_box+'\n')
805 >        out_box = '<outfiles> <![CDATA[\n' + out_box + '\n]]></outfiles>\n'
806 >        xml.write(out_box)
807  
808 <        xml.write('group="'+taskName+'"\n')
980 <       # xml.write('BossAttr="[crabjob.INTERNAL_ID=' + str(nj+1) +']"\n')
981 <        #xml.write('BossAttr="[crabjob.INTERNAL_ID=_ITR1_]"\n')
982 <        xml.write('BossAttr="crabjob.INTERNAL_ID=_ITR1_"\n')
808 >        xml.write('<BossAttr> crabjob.INTERNAL_ID=_ITR1_ </BossAttr>\n')
809  
810 <        
985 <      
986 <        xml.write('/>\n')
810 >        xml.write('</program>\n')
811          xml.write('</chain>\n')
812  
989       # if int(nj) == int(common.jobDB.nJobs()-1): xml.write('</task>\n')
813          xml.write('</iterator>\n')
814          xml.write('</task>\n')
815  
993
816          xml.close()
817 +      
818  
819          return
820  
998
999
821      def checkProxy(self):
822          """
823          Function to check the Globus proxy.
824          """
825          if (self.proxyValid): return
826 +
827 +        ### Just return if asked to do so
828 +        if (self.dontCheckProxy):
829 +            self.proxyValid=1
830 +            return
831 +
832          timeleft = -999
833          minTimeLeft=10*3600 # in seconds
834  
835          minTimeLeftServer = 100 # in hours
836  
1010        #cmd = 'voms-proxy-info -exists -valid '+str(minTimeLeft)+':00'
1011        #cmd = 'voms-proxy-info -timeleft'
837          mustRenew = 0
838          timeLeftLocal = runCommand('voms-proxy-info -timeleft 2>/dev/null')
839          timeLeftServer = -999
# Line 1024 | Line 849 | class SchedulerEdg(Scheduler):
849          pass
850  
851          if mustRenew:
852 <            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")
853 <            cmd = 'voms-proxy-init -voms cms -valid 96:00'
852 >            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")
853 >            cmd = 'voms-proxy-init -voms '+self.VO
854 >            if self.group:
855 >                cmd += ':/'+self.VO+'/'+self.group
856 >            if self.role:
857 >                cmd += '/role='+self.role
858 >            cmd += ' -valid 192:00'
859              try:
860                  # SL as above: damn it!
861 +                common.logger.debug(10,cmd)
862                  out = os.system(cmd)
863                  if (out>0): raise CrabException("Unable to create a valid proxy!\n")
864              except:
865                  msg = "Unable to create a valid proxy!\n"
866                  raise CrabException(msg)
1036            # cmd = 'grid-proxy-info -timeleft'
1037            # cmd_out = runCommand(cmd,0,20)
867              pass
868  
869          ## now I do have a voms proxy valid, and I check the myproxy server

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines