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.53 by fanzago, Thu Apr 20 12:53:58 2006 UTC vs.
Revision 1.137 by spiga, Tue Sep 18 15:17:55 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:
42              self.proxyServer = 'myproxy.cern.ch'
43          common.logger.debug(5,'Setting myproxy server to '+self.proxyServer)
44  
45 +        try:
46 +            self.group = cfg_params["EDG.group"]
47 +        except KeyError:
48 +            self.group = None
49 +            
50 +        try:
51 +            self.role = cfg_params["EDG.role"]
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'
57  
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
58          try:
59              self.EDG_ce_black_list = cfg_params['EDG.ce_black_list']
51            #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']
57            #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.return_data = cfg_params['USER.return_data']
64 <        except KeyError: self.return_data = 1
65 <
66 <        try:
67 <             self.copy_input_data = common.analisys_common_info['copy_input_data']
68 <             #print "self.copy_input_data = ", self.copy_input_data
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 +
76          try:
77              self.copy_data = cfg_params["USER.copy_data"]
78              if int(self.copy_data) == 1:
# Line 86 | Line 91 | class SchedulerEdg(Scheduler):
91             msg = msg + 'Please modify return_data and copy_data value in your crab.cfg file\n'
92             raise CrabException(msg)
93  
94 +        ########### FEDE FOR DBS2 ##############################
95 +        try:
96 +            self.publish_data = cfg_params["USER.publish_data"]
97 +            self.checkProxy()
98 +            if int(self.publish_data) == 1:
99 +                try:
100 +                    self.publish_data_name = cfg_params['USER.publish_data_name']
101 +                except KeyError:
102 +                    msg = "Error. The [USER] section does not have 'publish_data_name'"
103 +                    raise CrabException(msg)
104 +                try:
105 +                    tmp = runCommand("voms-proxy-info -identity")
106 +                    tmp = string.split(tmp,'/')
107 +                    reCN=re.compile(r'CN=')
108 +                    for t in tmp:
109 +                        if reCN.match(t):
110 +                            self.UserGridName=string.strip((t.replace('CN=','')).replace(' ',''))
111 +                        
112 +                    #self.UserGridName = string.strip(runCommand("voms-proxy-info -identity | awk -F\'CN\' \'{print $2$3$4}\' | tr -d \'=/ \'"))
113 +                except:
114 +                    msg = "Error. Problem with voms-proxy-info -identity command"
115 +                    raise CrabException(msg)
116 +        except KeyError: self.publish_data = 0
117 +
118 +        if ( int(self.copy_data) == 0 and int(self.publish_data) == 1 ):
119 +           msg = 'Warning: publish_data = 1 must be used with copy_data = 1\n'
120 +           msg = msg + 'Please modify copy_data value in your crab.cfg file\n'
121 +           common.logger.message(msg)
122 +           raise CrabException(msg)
123 +        #################################################
124 +
125          try:
126              self.lfc_host = cfg_params['EDG.lfc_host']
127          except KeyError:
# Line 128 | Line 164 | class SchedulerEdg(Scheduler):
164  
165          try: self.EDG_requirements = cfg_params['EDG.requirements']
166          except KeyError: self.EDG_requirements = ''
167 <                                                                                                                                                            
167 >
168 >        try: self.EDG_addJdlParam = string.split(cfg_params['EDG.additional_jdl_parameters'],',')
169 >        except KeyError: self.EDG_addJdlParam = []
170 >
171          try: self.EDG_retry_count = cfg_params['EDG.retry_count']
172          except KeyError: self.EDG_retry_count = ''
173 <                                                                                                                                                            
173 >
174 >        try: self.EDG_shallow_retry_count= cfg_params['EDG.shallow_retry_count']
175 >        except KeyError: self.EDG_shallow_retry_count = ''
176 >
177          try: self.EDG_clock_time = cfg_params['EDG.max_wall_clock_time']
178          except KeyError: self.EDG_clock_time= ''
179 <                                                                                                                                                            
179 >
180          try: self.EDG_cpu_time = cfg_params['EDG.max_cpu_time']
181          except KeyError: self.EDG_cpu_time = ''
182  
# Line 151 | Line 193 | class SchedulerEdg(Scheduler):
193          libPath=os.path.join(path, "lib", "python")
194          sys.path.append(libPath)
195  
196 <        self.proxyValid=0
196 >        try:
197 >            self._taskId = cfg_params['taskId']
198 >        except:
199 >            self._taskId = ''
200 >
201 >        try: self.jobtypeName = cfg_params['CRAB.jobtype']
202 >        except KeyError: self.jobtypeName = ''
203 >
204 >        try: self.schedulerName = cfg_params['CRAB.scheduler']
205 >        except KeyError: self.scheduler = ''
206 >
207          return
208      
209  
210 +    def rb_configure(self, RB):
211 +        self.edg_config = ''
212 +        self.edg_config_vo = ''
213 +        self.rb_param_file = ''
214 +
215 +        edgConfig = EdgConfig(RB)
216 +        self.edg_config = edgConfig.config()
217 +        self.edg_config_vo = edgConfig.configVO()
218 +
219 +        if (self.edg_config and self.edg_config_vo != ''):
220 +            self.rb_param_file = 'RBconfig = "'+self.edg_config+'";\nRBconfigVO = "'+self.edg_config_vo+'";\n'
221 +            #print "rb_param_file = ", self.rb_param_file
222 +        return self.rb_param_file
223 +      
224 +
225      def sched_parameter(self):
226          """
227 <        Returns file with scheduler-specific parameters
227 >        Returns file with requirements and scheduler-specific parameters
228          """
229 <      
230 <        if (self.edg_config and self.edg_config_vo != ''):
231 <            self.param='sched_param.clad'
229 >        index = int(common.jobDB.nJobs()) - 1
230 >        job = common.job_list[index]
231 >        jbt = job.type()
232 >        
233 >        lastBlock=-1
234 >        first = []
235 >        for n in range(common.jobDB.nJobs()):
236 >            currBlock=common.jobDB.block(n)
237 >            if (currBlock!=lastBlock):
238 >                lastBlock = currBlock
239 >                first.append(n)
240 >  
241 >        req = ''
242 >        req = req + jbt.getRequirements()
243 >    
244 >        if self.EDG_requirements:
245 >            if (req == ' '):
246 >                req = req + self.EDG_requirements
247 >            else:
248 >                req = req +  ' && ' + self.EDG_requirements
249 >
250 >        if self.EDG_ce_white_list:
251 >            ce_white_list = string.split(self.EDG_ce_white_list,',')
252 >            for i in range(len(ce_white_list)):
253 >                if i == 0:
254 >                    if (req == ' '):
255 >                        req = req + '((RegExp("' + string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
256 >                    else:
257 >                        req = req +  ' && ((RegExp("' +  string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
258 >                    pass
259 >                else:
260 >                    req = req +  ' || (RegExp("' +  string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
261 >            req = req + ')'
262 >        
263 >        if self.EDG_ce_black_list:
264 >            ce_black_list = string.split(self.EDG_ce_black_list,',')
265 >            for ce in ce_black_list:
266 >                if (req == ' '):
267 >                    req = req + '(!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))'
268 >                else:
269 >                    req = req +  ' && (!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))'
270 >                pass
271 >        if self.EDG_clock_time:
272 >            if (req == ' '):
273 >                req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
274 >            else:
275 >                req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
276 >
277 >        if self.EDG_cpu_time:
278 >            if (req == ' '):
279 >                req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
280 >            else:
281 >                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
282 >                
283 >        for i in range(len(first)): # Add loop DS
284 >            groupReq = req
285 >            self.param='sched_param_'+str(i)+'.clad'
286              param_file = open(common.work_space.shareDir()+'/'+self.param, 'w')
287 <            param_file.write('RBconfig = "'+self.edg_config+'";\n')  
288 <            param_file.write('RBconfigVO = "'+self.edg_config_vo+'";')
287 >
288 >            itr4=self.findSites_(first[i])
289 >            for arg in itr4:
290 >                groupReq = groupReq + ' && anyMatch(other.storage.CloseSEs, ('+str(arg)+'))'
291 >            param_file.write('Requirements = '+groupReq +';\n')  
292 >  
293 >            if (self.rb_param_file != ''):
294 >                param_file.write(self.rb_param_file)  
295 >
296 >            if len(self.EDG_addJdlParam):
297 >                for p in self.EDG_addJdlParam:
298 >                    param_file.write(p)
299 >
300              param_file.close()  
301 <            return 1
170 <        else:
171 <            return 0
301 >
302  
303      def wsSetupEnvironment(self):
304          """
305          Returns part of a job script which does scheduler-specific work.
306          """
307          txt = ''
308 +        txt += '# strip arguments\n'
309 +        txt += 'echo "strip arguments"\n'
310 +        txt += 'args=("$@")\n'
311 +        txt += 'nargs=$#\n'
312 +        txt += 'shift $nargs\n'
313 +        txt += "# job number (first parameter for job wrapper)\n"
314 +        #txt += "NJob=$1\n"
315 +        txt += "NJob=${args[0]}\n"
316 +
317 +        txt += '# job identification to DashBoard \n'
318 +        txt += 'MonitorJobID=`echo ${NJob}_$EDG_WL_JOBID`\n'
319 +        txt += 'SyncGridJobId=`echo $EDG_WL_JOBID`\n'
320 +        txt += 'MonitorID=`echo ' + self._taskId + '`\n'
321 +        txt += 'echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
322 +        txt += 'echo "SyncGridJobId=`echo $SyncGridJobId`" | tee -a $RUNTIME_AREA/$repo \n'
323 +        txt += 'echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
324 +
325          txt += 'echo "middleware discovery " \n'
326 <        txt += 'if [ $VO_CMS_SW_DIR ]; then\n'
180 <        txt += '    middleware=LCG \n'
181 <        txt += '    echo "middleware =$middleware" \n'
182 <        txt += 'elif [ $GRID3_APP_DIR ]; then\n'
326 >        txt += 'if [ $GRID3_APP_DIR ]; then\n'
327          txt += '    middleware=OSG \n'
328 +        txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
329 +        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
330          txt += '    echo "middleware =$middleware" \n'
331          txt += 'elif [ $OSG_APP ]; then \n'
332          txt += '    middleware=OSG \n'
333 +        txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
334 +        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
335 +        txt += '    echo "middleware =$middleware" \n'
336 +        txt += 'elif [ $VO_CMS_SW_DIR ]; then \n'
337 +        txt += '    middleware=LCG \n'
338 +   #     txt += '    echo "SyncCE=`edg-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
339 +        txt += '    echo "SyncCE=`glite-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
340 +        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
341          txt += '    echo "middleware =$middleware" \n'
342          txt += 'else \n'
343 <        txt += '    echo "SET_CMS_ENV 1 ==> middleware not identified" \n'
344 <        txt += '    echo "JOB_EXIT_STATUS = 1"\n'
345 <        txt += '    exit 1\n'
346 <        txt += 'fi\n'
347 <
343 >        txt += '    echo "SET_CMS_ENV 10030 ==> middleware not identified" \n'
344 >        txt += '    echo "JOB_EXIT_STATUS = 10030" \n'
345 >        txt += '    echo "JobExitCode=10030" | tee -a $RUNTIME_AREA/$repo \n'
346 >        txt += '    dumpStatus $RUNTIME_AREA/$repo \n'
347 >        txt += '    rm -f $RUNTIME_AREA/$repo \n'
348 >        txt += '    echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
349 >        txt += '    echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
350 >        txt += '    exit 1 \n'
351 >        txt += 'fi \n'
352 >
353 >        txt += '# report first time to DashBoard \n'
354 >        txt += 'dumpStatus $RUNTIME_AREA/$repo \n'
355 >        txt += 'rm -f $RUNTIME_AREA/$repo \n'
356 >        txt += 'echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
357 >        txt += 'echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
358 >        
359          txt += '\n\n'
360  
361 <        txt += 'if [ $middleware == LCG ]; then \n'
362 <        txt += '    echo "SyncGridJobId=`echo $EDG_WL_JOBID`" | tee -a $RUNTIME_AREA/$repo\n'
363 <        txt += 'fi\n'
364 <
365 <        if int(self.copy_data) == 1:
366 <           if self.SE:
367 <              txt += 'export SE='+self.SE+'\n'
368 <              txt += 'echo "SE = $SE"\n'
204 <           if self.SE_PATH:
205 <              if ( self.SE_PATH[-1] != '/' ) : self.SE_PATH = self.SE_PATH + '/'
206 <              txt += 'export SE_PATH='+self.SE_PATH+'\n'
207 <              txt += 'echo "SE_PATH = $SE_PATH"\n'
361 > #        if int(self.copy_data) == 1:
362 > #           if self.SE:
363 > #              txt += 'export SE='+self.SE+'\n'
364 > #              txt += 'echo "SE = $SE"\n'
365 > #           if self.SE_PATH:
366 > #              if ( self.SE_PATH[-1] != '/' ) : self.SE_PATH = self.SE_PATH + '/'
367 > #              txt += 'export SE_PATH='+self.SE_PATH+'\n'
368 > #              txt += 'echo "SE_PATH = $SE_PATH"\n'
369  
370          txt += 'export VO='+self.VO+'\n'
371 <        ### FEDE: add some line for LFC catalog setting
371 >        ### add some line for LFC catalog setting
372          txt += 'if [ $middleware == LCG ]; then \n'
373          txt += '    if [[ $LCG_CATALOG_TYPE != \''+self.lcg_catalog_type+'\' ]]; then\n'
374          txt += '        export LCG_CATALOG_TYPE='+self.lcg_catalog_type+'\n'
# Line 248 | Line 409 | class SchedulerEdg(Scheduler):
409                txt += '\n'
410  
411          txt += 'if [ $middleware == LCG ]; then\n'
412 <        txt += '    CloseCEs=`edg-brokerinfo getCE`\n'
412 >    #    txt += '    CloseCEs=`edg-brokerinfo getCE`\n'
413 >        txt += '    CloseCEs=`glite-brokerinfo getCE`\n'
414          txt += '    echo "CloseCEs = $CloseCEs"\n'
415          txt += '    CE=`echo $CloseCEs | sed -e "s/:.*//"`\n'
416          txt += '    echo "CE = $CE"\n'
# Line 256 | Line 418 | class SchedulerEdg(Scheduler):
418          txt += '    if [ $OSG_JOB_CONTACT ]; then \n'
419          txt += '        CE=`echo $OSG_JOB_CONTACT | /usr/bin/awk -F\/ \'{print $1}\'` \n'
420          txt += '    else \n'
421 <        txt += '        echo "SET_ENV 1 ==> ERROR in setting CE name - OSG mode -" \n'
421 >        txt += '        echo "SET_CMS_ENV 10099 ==> OSG mode: ERROR in setting CE name from OSG_JOB_CONTACT" \n'
422 >        txt += '        echo "JOB_EXIT_STATUS = 10099" \n'
423 >        txt += '        echo "JobExitCode=10099" | tee -a $RUNTIME_AREA/$repo \n'
424 >        txt += '        dumpStatus $RUNTIME_AREA/$repo \n'
425 >        txt += '        rm -f $RUNTIME_AREA/$repo \n'
426 >        txt += '        echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
427 >        txt += '        echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
428          txt += '        exit 1 \n'
429          txt += '    fi \n'
430          txt += 'fi \n'
# Line 268 | Line 436 | class SchedulerEdg(Scheduler):
436          Copy input data from SE to WN    
437          """
438          txt = ''
439 <        try:
440 <            self.copy_input_data = common.analisys_common_info['copy_input_data']
273 <            #print "self.copy_input_data = ", self.copy_input_data
274 <        except KeyError: self.copy_input_data = 0
275 <        if int(self.copy_input_data) == 1:
439 >        if not self.copy_input_data: return txt
440 >
441          ## OLI_Daniele deactivate for OSG (wait for LCG UI installed on OSG)
442 <           txt += 'if [ $middleware == OSG ]; then\n'
443 <           txt += '   #\n'
444 <           txt += '   #   Copy Input Data from SE to this WN deactivated in OSG mode\n'
445 <           txt += '   #\n'
446 <           txt += '   echo "Copy Input Data from SE to this WN deactivated in OSG mode"\n'
447 <           txt += 'elif [ $middleware == LCG ]; then \n'
448 <           txt += '   #\n'
449 <           txt += '   #   Copy Input Data from SE to this WN\n'
450 <           txt += '   #\n'
451 < ### changed by georgia (put a loop copying more than one input files per jobs)          
452 <           txt += '   for input_file in $cur_file_list \n'
453 <           txt += '   do \n'
454 <           txt += '    lcg-cp --vo $VO lfn:$input_lfn/$input_file file:`pwd`/$input_file 2>&1\n'
455 <           txt += '    copy_input_exit_status=$?\n'
456 <           txt += '    echo "COPY_INPUT_EXIT_STATUS = $copy_input_exit_status"\n'
457 <           txt += '    if [ $copy_input_exit_status -ne 0 ]; then \n'
458 <           txt += '       echo "Problems with copying to WN" \n'
459 <           txt += '    else \n'
460 <           txt += '       echo "input copied into WN" \n'
461 <           txt += '    fi \n'
462 <           txt += '   done \n'
463 < ### copy a set of PU ntuples (same for each jobs -- but accessed randomly)
464 <           txt += '   for file in $cur_pu_list \n'
465 <           txt += '   do \n'
466 <           txt += '    lcg-cp --vo $VO lfn:$pu_lfn/$file file:`pwd`/$file 2>&1\n'
467 <           txt += '    copy_input_exit_status=$?\n'
468 <           txt += '    echo "COPY_INPUT_PU_EXIT_STATUS = $copy_input_pu_exit_status"\n'
469 <           txt += '    if [ $copy_input_pu_exit_status -ne 0 ]; then \n'
470 <           txt += '       echo "Problems with copying pu to WN" \n'
471 <           txt += '    else \n'
472 <           txt += '       echo "input pu files copied into WN" \n'
473 <           txt += '    fi \n'
474 <           txt += '   done \n'
475 <           txt += '   \n'
476 <           txt += '   ### Check SCRATCH space available on WN : \n'
477 <           txt += '   df -h \n'
478 <           txt += 'fi \n'
442 >        txt += 'if [ $middleware == OSG ]; then\n'
443 >        txt += '   #\n'
444 >        txt += '   #   Copy Input Data from SE to this WN deactivated in OSG mode\n'
445 >        txt += '   #\n'
446 >        txt += '   echo "Copy Input Data from SE to this WN deactivated in OSG mode"\n'
447 >        txt += 'elif [ $middleware == LCG ]; then \n'
448 >        txt += '   #\n'
449 >        txt += '   #   Copy Input Data from SE to this WN\n'
450 >        txt += '   #\n'
451 >        ### changed by georgia (put a loop copying more than one input files per jobs)          
452 >        txt += '   for input_file in $cur_file_list \n'
453 >        txt += '   do \n'
454 >        txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$input_lfn/$input_file file:`pwd`/$input_file 2>&1\n'
455 >        txt += '      copy_input_exit_status=$?\n'
456 >        txt += '      echo "COPY_INPUT_EXIT_STATUS = $copy_input_exit_status"\n'
457 >        txt += '      if [ $copy_input_exit_status -ne 0 ]; then \n'
458 >        txt += '         echo "Problems with copying to WN" \n'
459 >        txt += '      else \n'
460 >        txt += '         echo "input copied into WN" \n'
461 >        txt += '      fi \n'
462 >        txt += '   done \n'
463 >        ### copy a set of PU ntuples (same for each jobs -- but accessed randomly)
464 >        txt += '   for file in $cur_pu_list \n'
465 >        txt += '   do \n'
466 >        txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$pu_lfn/$file file:`pwd`/$file 2>&1\n'
467 >        txt += '      copy_input_pu_exit_status=$?\n'
468 >        txt += '      echo "COPY_INPUT_PU_EXIT_STATUS = $copy_input_pu_exit_status"\n'
469 >        txt += '      if [ $copy_input_pu_exit_status -ne 0 ]; then \n'
470 >        txt += '         echo "Problems with copying pu to WN" \n'
471 >        txt += '      else \n'
472 >        txt += '         echo "input pu files copied into WN" \n'
473 >        txt += '      fi \n'
474 >        txt += '   done \n'
475 >        txt += '   \n'
476 >        txt += '   ### Check SCRATCH space available on WN : \n'
477 >        txt += '   df -h \n'
478 >        txt += 'fi \n'
479            
480          return txt
481  
# Line 319 | Line 484 | class SchedulerEdg(Scheduler):
484          Write a CopyResults part of a job script, e.g.
485          to copy produced output into a storage element.
486          """
487 <        txt = ''
323 <        if int(self.copy_data) == 1:
324 <           txt += '#\n'
325 <           txt += '#   Copy output to SE = $SE\n'
326 <           txt += '#\n'
327 <           txt += 'if [ $exe_result -eq 0 ]; then\n'
328 <           txt += '    for out_file in $file_list ; do\n'
329 <           txt += '        echo "Trying to copy output file to $SE "\n'
330 <           ## OLI_Daniele globus-* for OSG, lcg-* for LCG
331 <           txt += '        if [ $middleware == OSG ]; then\n'
332 <           txt += '           echo "globus-url-copy file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
333 <           txt += '           copy_exit_status=`globus-url-copy file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
334 <           #txt += '           exitstring=`globus-url-copy file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
335 <           txt += '        elif [ $middleware == LCG ]; then \n'
336 <           txt += '           echo "lcg-cp --vo cms -t 1200 file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
337 <           txt += '           copy_exit_status=`lcg-cp --vo cms -t 1200 file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
338 <           #txt += '           exitstring=`lcg-cp --vo cms -t 30 file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
339 <           txt += '        fi \n'
340 <           #txt += '        copy_exit_status=$?\n'
341 <           txt += '        echo "COPY_EXIT_STATUS = $copy_exit_status"\n'
342 <           txt += '        echo "STAGE_OUT = $copy_exit_status"\n'
343 <           txt += '        if [ $copy_exit_status -ne 0 ]; then\n'
344 <           txt += '            echo "Problems with SE = $SE"\n'
345 <           txt += '            echo "StageOutExitStatus = 198" | tee -a $RUNTIME_AREA/$repo\n'
346 <           txt += '            echo "StageOutExitStatusReason = $exitstring" | tee -a $RUNTIME_AREA/$repo\n'
347 <           txt += '        else\n'
348 <           txt += '            echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
349 <           txt += '            echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
350 <           txt += '            echo "output copied into $SE/$SE_PATH directory"\n'
351 <           txt += '            echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
352 <           txt += '         fi\n'
353 <           txt += '     done\n'
354 <           txt += 'fi\n'
355 <        return txt
487 >        txt = '\n'
488  
489 <    def wsRegisterOutput(self):
490 <        """
491 <        Returns part of a job script which does scheduler-specific work.
360 <        """
489 >        txt += '#\n'
490 >        txt += '# COPY OUTPUT FILE TO SE\n'
491 >        txt += '#\n\n'
492  
493 <        txt = ''
494 <        if int(self.register_data) == 1:
495 <        ## OLI_Daniele deactivate for OSG (wait for LCG UI installed on OSG)
496 <           txt += 'if [ $middleware == OSG ]; then\n'
497 <           txt += '   #\n'
498 <           txt += '   #   Register output to LFC deactivated in OSG mode\n'
499 <           txt += '   #\n'
500 <           txt += '   echo "Register output to LFC deactivated in OSG mode"\n'
501 <           txt += 'elif [ $middleware == LCG ]; then \n'
502 <           txt += '#\n'
503 <           txt += '#  Register output to LFC\n'
504 <           txt += '#\n'
505 <           txt += '   if [[ $exe_result -eq 0 && $copy_exit_status -eq 0 ]]; then\n'
506 <           txt += '      for out_file in $file_list ; do\n'
507 <           txt += '         echo "Trying to register the output file into LFC"\n'
508 <           txt += '         echo "lcg-rf -l $LFN/$out_file --vo $VO sfn://$SE$SE_PATH/$out_file"\n'
509 <           txt += '         lcg-rf -l $LFN/$out_file --vo $VO sfn://$SE$SE_PATH/$out_file 2>&1 \n'
510 <           txt += '         register_exit_status=$?\n'
511 <           txt += '         echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
512 <           txt += '         echo "STAGE_OUT = $register_exit_status"\n'
513 <           txt += '         if [ $register_exit_status -ne 0 ]; then \n'
514 <           txt += '            echo "Problems with the registration to LFC" \n'
515 <           txt += '            echo "Try with srm protocol" \n'
516 <           txt += '            echo "lcg-rf -l $LFN/$out_file --vo $VO srm://$SE$SE_PATH/$out_file"\n'
517 <           txt += '            lcg-rf -l $LFN/$out_file --vo $VO srm://$SE$SE_PATH/$out_file 2>&1 \n'
518 <           txt += '            register_exit_status=$?\n'
519 <           txt += '            echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
520 <           txt += '            echo "STAGE_OUT = $register_exit_status"\n'
521 <           txt += '            if [ $register_exit_status -ne 0 ]; then \n'
522 <           txt += '               echo "Problems with the registration into LFC" \n'
523 <           txt += '            fi \n'
524 <           txt += '         else \n'
525 <           txt += '            echo "output registered to LFC"\n'
526 <           txt += '         fi \n'
527 <           txt += '         echo "StageOutExitStatus = $register_exit_status" | tee -a $RUNTIME_AREA/$repo\n'
528 <           txt += '      done\n'
529 <           txt += '   elif [[ $exe_result -eq 0 && $copy_exit_status -ne 0 ]]; then \n'
530 <           txt += '      echo "Trying to copy output file to CloseSE"\n'
531 <           txt += '      CLOSE_SE=`edg-brokerinfo getCloseSEs | head -1`\n'
532 <           txt += '      for out_file in $file_list ; do\n'
533 <           txt += '         echo "lcg-cr -v -l lfn:${LFN}/$out_file -d $CLOSE_SE -P $LFN/$out_file --vo $VO file://`pwd`/$out_file" \n'
534 <           txt += '         lcg-cr -v -l lfn:${LFN}/$out_file -d $CLOSE_SE -P $LFN/$out_file --vo $VO file://`pwd`/$out_file 2>&1 \n'
535 <           txt += '         register_exit_status=$?\n'
536 <           txt += '         echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
537 <           txt += '         echo "STAGE_OUT = $register_exit_status"\n'
538 <           txt += '         if [ $register_exit_status -ne 0 ]; then \n'
539 <           txt += '            echo "Problems with CloseSE" \n'
540 <           txt += '         else \n'
410 <           txt += '            echo "The program was successfully executed"\n'
411 <           txt += '            echo "SE = $CLOSE_SE"\n'
412 <           txt += '            echo "LFN for the file is LFN=${LFN}/$out_file"\n'
413 <           txt += '         fi \n'
414 <           txt += '         echo "StageOutExitStatus = $register_exit_status" | tee -a $RUNTIME_AREA/$repo\n'
415 <           txt += '      done\n'
416 <           txt += '   else\n'
417 <           txt += '      echo "Problem with the executable"\n'
418 <           txt += '   fi \n'
419 <           txt += 'fi \n'
493 >        SE_PATH=''
494 >        if int(self.copy_data) == 1:
495 >            if self.SE:
496 >                txt += 'export SE='+self.SE+'\n'
497 >                txt += 'echo "SE = $SE"\n'
498 >            if self.SE_PATH:
499 >                if ( self.SE_PATH[-1] != '/' ) : self.SE_PATH = self.SE_PATH + '/'
500 >                SE_PATH=self.SE_PATH
501 >            if int(self.publish_data) == 1:
502 >                txt += '### publish_data = 1 so the SE path where to copy the output is: \n'
503 >                path_add = self.UserGridName + '/' + self.publish_data_name +'_${PSETHASH}/'
504 >                SE_PATH = SE_PATH + path_add
505 >            txt += 'export SE_PATH='+SE_PATH+'\n'
506 >            txt += 'echo "SE_PATH = $SE_PATH"\n'
507 >            
508 >            txt += 'echo "####################################################"\n'
509 >            txt += 'echo "# Copy output files from WN = `hostname` to SE = $SE"\n'
510 >            txt += 'echo "####################################################"\n'
511 >            
512 >            txt += 'for out_file in $file_list ; do\n'
513 >            txt += '   echo "Trying to copy output file to $SE using srmcp"\n'
514 >            txt += '   cmscp $out_file ${SE} ${SE_PATH} $out_file $middleware\n'
515 >            txt += '   copy_exit_status=$?\n'
516 >            txt += '   echo "COPY_EXIT_STATUS for srmcp = $copy_exit_status"\n'
517 >            txt += '   echo "STAGE_OUT = $copy_exit_status"\n'
518 >            
519 >            txt += '   if [ $copy_exit_status -ne 0 ]; then\n'
520 >            txt += '       echo "Problem copying $out_file to $SE $SE_PATH"\n'
521 >            txt += '       echo "StageOutExitStatus = $copy_exit_status " | tee -a $RUNTIME_AREA/$repo\n'
522 >            txt += '       echo "StageOutExitStatusReason = $exitstring" | tee -a $RUNTIME_AREA/$repo\n'
523 >            txt += '       copy_exit_status=60307\n'
524 >            
525 >            txt += '   else\n'
526 >            txt += '       echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
527 >            txt += '       echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
528 >            txt += '       echo "output copied into $SE/$SE_PATH directory"\n'
529 >            txt += '       echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
530 >            txt += '       echo "srmcp succeeded"\n'
531 >            txt += '    fi\n'
532 >            txt += 'done\n'
533 >            txt += 'if [ $copy_exit_status -ne 0 ]; then\n'
534 >            txt += '      SE=""\n'
535 >            txt += '      echo "SE = $SE"\n'
536 >            txt += '      SE_PATH=""\n'
537 >            txt += '      echo "SE_PATH = $SE_PATH"\n'
538 >            txt += 'fi\n'
539 >            txt += 'exit_status=$copy_exit_status\n'
540 >            pass
541          return txt
542  
543      def loggingInfo(self, id):
# Line 425 | Line 546 | class SchedulerEdg(Scheduler):
546          """
547          self.checkProxy()
548          cmd = 'edg-job-get-logging-info -v 2 ' + id
428        #cmd_out = os.popen(cmd)
549          cmd_out = runCommand(cmd)
550          return cmd_out
551  
432    def listMatch(self, nj):
433        """
434        Check the compatibility of available resources
435        """
436        self.checkProxy()
437        jdl = common.job_list[nj].jdlFilename()
438        cmd = 'edg-job-list-match ' + self.configOpt_() + jdl
439        cmd_out = runCommand(cmd,0,10)
440        if not cmd_out:
441            raise CrabException("ERROR: "+cmd+" failed!")
442
443        return self.parseListMatch_(cmd_out, jdl)
444
445    def parseListMatch_(self, out, jdl):
446        """
447        Parse the f* output of edg-list-match and produce something sensible
448        """
449        reComment = re.compile( r'^\**$' )
450        reEmptyLine = re.compile( r'^$' )
451        reVO = re.compile( r'Selected Virtual Organisation name.*' )
452        reLine = re.compile( r'.*')
453        reCE = re.compile( r'(.*:.*)')
454        reCEId = re.compile( r'CEId.*')
455        reNO = re.compile( r'No Computing Element matching' )
456        reRB = re.compile( r'Connecting to host' )
457        next = 0
458        CEs=[]
459        Match=0
460
461        #print out
462        lines = reLine.findall(out)
463
464        i=0
465        CEs=[]
466        for line in lines:
467            string.strip(line)
468            #print line
469            if reNO.match( line ):
470                common.logger.debug(5,line)
471                return 0
472                pass
473            if reVO.match( line ):
474                VO =reVO.match( line ).group()
475                common.logger.debug(5,"VO "+VO)
476                pass
477
478            if reRB.match( line ):
479                RB = reRB.match(line).group()
480                common.logger.debug(5,"RB "+RB)
481                pass
482
483            if reCEId.search( line ):
484                for lineCE in lines[i:-1]:
485                    if reCE.match( lineCE ):
486                        CE = string.strip(reCE.search(lineCE).group(1))
487                        CEs.append(CE.split(':')[0])
488                        pass
489                    pass
490                pass
491            i=i+1
492            pass
493
494        common.logger.debug(5,"All CE :"+str(CEs))
495
496        sites = []
497        [sites.append(it) for it in CEs if not sites.count(it)]
498
499        common.logger.debug(5,"All Sites :"+str(sites))
500        return len(sites)
501
502    def noMatchFound_(self, jdl):
503        reReq = re.compile( r'Requirements' )
504        reString = re.compile( r'"\S*"' )
505        f = file(jdl,'r')
506        for line in f.readlines():
507            line= line.strip()
508            if reReq.match(line):
509                for req in reString.findall(line):
510                    if re.search("VO",req):
511                        common.logger.message( "SW required: "+req)
512                        continue
513                    if re.search('"\d+',req):
514                        common.logger.message("Other req  : "+req)
515                        continue
516                    common.logger.message( "CE required: "+req)
517                break
518            pass
519        raise CrabException("No compatible resources found!")
520
521    def submit(self, nj):
522        """
523        Submit one EDG job.
524        """
525
526        self.checkProxy()
527        jid = None
528        jdl = common.job_list[nj].jdlFilename()
529
530        cmd = 'edg-job-submit ' + self.configOpt_() + jdl
531        cmd_out = runCommand(cmd)
532        if cmd_out != None:
533            reSid = re.compile( r'https.+' )
534            jid = reSid.search(cmd_out).group()
535            pass
536        return jid
537
538    def resubmit(self, nj_list):
539        """
540        Prepare jobs to be submit
541        """
542        return
543
544    def getExitStatus(self, id):
545        return self.getStatusAttribute_(id, 'exit_code')
546
547    def queryStatus(self, id):
548        return self.getStatusAttribute_(id, 'status')
549
550    def queryDest(self, id):  
551        return self.getStatusAttribute_(id, 'destination')
552
553
554    def getStatusAttribute_(self, id, attr):
555        """ Query a status of the job with id """
556
557        self.checkProxy()
558        hstates = {}
559        Status = importName('edg_wl_userinterface_common_LbWrapper', 'Status')
560        # Bypass edg-job-status interfacing directly to C++ API
561        # Job attribute vector to retrieve status without edg-job-status
562        level = 0
563        # Instance of the Status class provided by LB API
564        jobStat = Status()
565        st = 0
566        jobStat.getStatus(id, level)
567        err, apiMsg = jobStat.get_error()
568        if err:
569            common.logger.debug(5,'Error caught' + apiMsg)
570            return None
571        else:
572            for i in range(len(self.states)):
573                # Fill an hash table with all information retrieved from LB API
574                hstates[ self.states[i] ] = jobStat.loadStatus(st)[i]
575            result = jobStat.loadStatus(st)[ self.states.index(attr) ]
576            return result
577
552      def queryDetailedStatus(self, id):
553          """ Query a detailed status of the job with id """
554          cmd = 'edg-job-status '+id
555          cmd_out = runCommand(cmd)
556          return cmd_out
557  
558 <    def getOutput(self, id):
559 <        """
586 <        Get output for a finished job with id.
587 <        Returns the name of directory with results.
588 <        """
558 >    def findSites_(self, n):
559 >        itr4 =[]
560  
561 <        self.checkProxy()
591 <        cmd = 'edg-job-get-output --dir ' + common.work_space.resDir() + ' ' + id
592 <        cmd_out = runCommand(cmd)
561 >        sites = common.jobDB.destination(n)
562  
563 <        # Determine the output directory name
564 <        dir = common.work_space.resDir()
596 <        dir += os.getlogin()
597 <        dir += '_' + os.path.basename(id)
598 <        return dir
563 >        if len(sites)>0 and sites[0]=="":
564 >            return itr4
565  
566 <    def cancel(self, id):
567 <        """ Cancel the EDG job with id """
568 <        self.checkProxy()
569 <        cmd = 'edg-job-cancel --noint ' + id
570 <        cmd_out = runCommand(cmd)
571 <        return cmd_out
566 >        itr = ''
567 >        if sites != [""]:#CarlosDaniele
568 >            ##Addedd Daniele
569 >            replicas = self.blackWhiteListParser.checkBlackList(sites,n)
570 >            if len(replicas)!=0:
571 >                replicas = self.blackWhiteListParser.checkWhiteList(replicas,n)
572 >              
573 >            if len(replicas)==0:
574 >                msg = 'No sites remaining that host any part of the requested data! Exiting... '
575 >                raise CrabException(msg)
576 >            #####        
577 >           # for site in sites:
578 >            for site in replicas:
579 >                #itr = itr + 'target.GlueSEUniqueID==&quot;'+site+'&quot; || '
580 >                itr = itr + 'target.GlueSEUniqueID=="'+site+'" || '
581 >            itr = itr[0:-4]
582 >            itr4.append( itr )
583 >        return itr4
584  
585 <    def createSchScript(self, nj):
585 >    def createXMLSchScript(self, nj, argsList):
586 >      
587          """
588 <        Create a JDL-file for EDG.
588 >        Create a XML-file for BOSS4.
589          """
590 <
591 <        job = common.job_list[nj]
590 >  #      job = common.job_list[nj]
591 >        """
592 >        INDY
593 >        [begin] FIX-ME:
594 >        I would pass jobType instead of job
595 >        """
596 >        index = nj - 1
597 >        job = common.job_list[index]
598          jbt = job.type()
614        inp_sandbox = jbt.inputSandbox(nj)
615        out_sandbox = jbt.outputSandbox(nj)
616        inp_storage_subdir = ''
599          
600 <        title = '# This JDL was generated by '+\
601 <                common.prog_name+' (version '+common.prog_version_str+')\n'
602 <        jt_string = ''
603 <
604 <
623 <        
624 <        SPL = inp_storage_subdir
625 <        if ( SPL and SPL[-1] != '/' ) : SPL = SPL + '/'
626 <
627 <        jdl_fname = job.jdlFilename()
628 <        jdl = open(jdl_fname, 'w')
629 <        jdl.write(title)
630 <
631 <        script = job.scriptFilename()
632 <        jdl.write('Executable = "' + os.path.basename(script) +'";\n')
633 <        jdl.write(jt_string)
634 <
635 <        ### only one .sh  JDL has arguments:
636 <        firstEvent = common.jobDB.firstEvent(nj)
637 <        maxEvents = common.jobDB.maxEvents(nj)
638 <        jdl.write('Arguments = "' + str(nj+1)+' '+str(firstEvent)+' '+str(maxEvents)+'";\n')
639 <
640 <        inp_box = 'InputSandbox = { '
641 <        inp_box = inp_box + '"' + script + '",'
642 <
643 <        if inp_sandbox != None:
644 <            for fl in inp_sandbox:
645 <                inp_box = inp_box + ' "' + fl + '",'
646 <                pass
647 <            pass
648 <
649 <        #if common.use_jam:
650 <        #   inp_box = inp_box+' "'+common.bin_dir+'/'+common.run_jam+'",'
651 <
652 <        # Marco (VERY TEMPORARY ML STUFF)
653 <        inp_box = inp_box+' "' + os.path.abspath(os.environ['CRABDIR']+'/python/'+'report.py') + '", "' +\
654 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'DashboardAPI.py') + '", "'+\
655 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'Logger.py') + '", "'+\
656 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'ProcInfo.py') + '", "'+\
657 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'apmon.py') + '"'
658 <        # End Marco
659 <
660 <        if (not jbt.additional_inbox_files == []):
661 <            inp_box = inp_box + ', '
662 <            for addFile in jbt.additional_inbox_files:
663 <                addFile = os.path.abspath(addFile)
664 <                inp_box = inp_box+' "'+addFile+'",'
665 <                pass
666 <
667 <        if inp_box[-1] == ',' : inp_box = inp_box[:-1]
668 <        inp_box = inp_box + ' };\n'
669 <        jdl.write(inp_box)
600 >        inp_sandbox = jbt.inputSandbox(index)
601 >        #out_sandbox = jbt.outputSandbox(index)
602 >        """
603 >        [end] FIX-ME
604 >        """
605  
671        jdl.write('StdOutput     = "' + job.stdout() + '";\n')
672        jdl.write('StdError      = "' + job.stderr() + '";\n')
606          
607 +        title = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'
608 +        jt_string = ''
609          
610 <        if job.stdout() == job.stderr():
611 <          out_box = 'OutputSandbox = { "' + \
677 <                    job.stdout() + '", ".BrokerInfo",'
678 <        else:
679 <          out_box = 'OutputSandbox = { "' + \
680 <                    job.stdout() + '", "' + \
681 <                    job.stderr() + '", ".BrokerInfo",'
682 <
683 <        if int(self.return_data) == 1:
684 <            if out_sandbox != None:
685 <                for fl in out_sandbox:
686 <                    out_box = out_box + ' "' + fl + '",'
687 <                    pass
688 <                pass
689 <            pass
690 <                                                                                                                                                            
691 <        if out_box[-1] == ',' : out_box = out_box[:-1]
692 <        out_box = out_box + ' };'
693 <        jdl.write(out_box+'\n')
610 >        xml_fname = str(self.jobtypeName)+'.xml'
611 >        xml = open(common.work_space.shareDir()+'/'+xml_fname, 'a')
612  
613 +        #TaskName  
614 +        dir = string.split(common.work_space.topDir(), '/')
615 +        taskName = dir[len(dir)-2]
616 +  
617 +        to_write = ''
618  
619 <        req='Requirements = '
619 >        req=' '
620          req = req + jbt.getRequirements()
621 < #        ### if at least a CE exists ...
699 < #        if common.analisys_common_info['sites']:
700 < #           if common.analisys_common_info['sw_version']:
701 < #                req='Requirements = '
702 < #                req=req + 'Member("VO-cms-' + \
703 < #                     common.analisys_common_info['sw_version'] + \
704 < #                     '", other.GlueHostApplicationSoftwareRunTimeEnvironment)'
705 < #            if len(common.analisys_common_info['sites'])>0:
706 < #                req = req + ' && ('
707 < #                for i in range(len(common.analisys_common_info['sites'])):
708 < #                    req = req + 'other.GlueCEInfoHostName == "' \
709 < #                         + common.analisys_common_info['sites'][i] + '"'
710 < #                    if ( i < (int(len(common.analisys_common_info['sites']) - 1)) ):
711 < #                        req = req + ' || '
712 < #            req = req + ')'
713 <        #### and USER REQUIREMENT
621 >
622          if self.EDG_requirements:
623 <            if (req == 'Requirement = '):
623 >            if (req == ' '):
624                  req = req + self.EDG_requirements
625              else:
626                  req = req +  ' && ' + self.EDG_requirements
719        #### FEDE #####
627          if self.EDG_ce_white_list:
628              ce_white_list = string.split(self.EDG_ce_white_list,',')
722            #print "req = ", req
629              for i in range(len(ce_white_list)):
630                  if i == 0:
631 <                    if (req == 'Requirement = '):
631 >                    if (req == ' '):
632                          req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
633                      else:
634                          req = req +  ' && ((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
# Line 734 | Line 640 | class SchedulerEdg(Scheduler):
640          if self.EDG_ce_black_list:
641              ce_black_list = string.split(self.EDG_ce_black_list,',')
642              for ce in ce_black_list:
643 <                if (req == 'Requirement = '):
643 >                if (req == ' '):
644                      req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
645                  else:
646                      req = req +  ' && (!RegExp("' + ce + '", other.GlueCEUniqueId))'
647                  pass
742        ###############
648          if self.EDG_clock_time:
649 <            if (req == 'Requirement = '):
649 >            if (req == ' '):
650                  req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
651              else:
652                  req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
653  
654          if self.EDG_cpu_time:
655 <            if (req == 'Requirement = '):
655 >            if (req == ' '):
656                  req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
657              else:
658                  req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
659 <        if (req != 'Requirement = '):
755 <            req = req + ';\n'
756 <            jdl.write(req)
757 <                                                                                                                                                            
758 <        jdl.write('VirtualOrganisation = "' + self.VO + '";\n')
759 <
659 >                                                                                          
660          if ( self.EDG_retry_count ):              
661 <            jdl.write('RetryCount = '+self.EDG_retry_count+';\n')
661 >            to_write = to_write + 'RetryCount = "'+self.EDG_retry_count+'"\n'
662 >            pass
663 >
664 >        if ( self.EDG_shallow_retry_count ):              
665 >            to_write = to_write + 'ShallowRetryCount = "'+self.EDG_shallow_retry_count+'"\n'
666 >            pass
667 >
668 >        to_write = to_write + 'MyProxyServer = "&quot;' + self.proxyServer + '&quot;"\n'
669 >        to_write = to_write + 'VirtualOrganisation = "&quot;' + self.VO + '&quot;"\n'
670 >
671 >        #TaskName  
672 >        dir = string.split(common.work_space.topDir(), '/')
673 >        taskName = dir[len(dir)-2]
674 >
675 >        xml.write(str(title))
676 >        #xml.write('<task name="' +str(taskName)+'" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache">\n')
677 >
678 >        #xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + '" task_info="' + os.path.expandvars('X509_USER_PROXY') + '">\n')
679 >        x509_cmd = 'ls /tmp/x509up_u`id -u`'
680 >        x509=runCommand(x509_cmd).strip()
681 >        xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + ' task_info="' + str(x509) + '">\n')
682 >        xml.write(jt_string)
683 >        
684 >        if (to_write != ''):
685 >            xml.write('<extraTags\n')
686 >            xml.write(to_write)
687 >            xml.write('/>\n')
688 >            pass
689 >
690 >        xml.write('<iterator>\n')
691 >        xml.write('\t<iteratorRule name="ITR1">\n')
692 >        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ' </ruleElement>\n')
693 >        xml.write('\t</iteratorRule>\n')
694 >        xml.write('\t<iteratorRule name="ITR2">\n')
695 >        for arg in argsList:
696 >            xml.write('\t\t<ruleElement> <![CDATA[\n'+ arg + '\n\t\t]]> </ruleElement>\n')
697 >            pass
698 >        xml.write('\t</iteratorRule>\n')
699 >        #print jobList
700 >        xml.write('\t<iteratorRule name="ITR3">\n')
701 >        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ':1:6 </ruleElement>\n')
702 >        xml.write('\t</iteratorRule>\n')
703 >
704 >        '''
705 >        indy: here itr4
706 >        '''
707 >        
708 >        xml.write('<chain name="' +str(taskName)+'__ITR1_" scheduler="'+str(self.schedulerName)+'">\n')
709 >       # xml.write('<chain scheduler="'+str(self.schedulerName)+'">\n')
710 >        xml.write(jt_string)
711 >
712 >        #executable
713 >
714 >        """
715 >        INDY
716 >        script depends on jobType: it should be probably get in a different way
717 >        """        
718 >        script = job.scriptFilename()
719 >        xml.write('<program>\n')
720 >        xml.write('<exec> ' + os.path.basename(script) +' </exec>\n')
721 >        xml.write(jt_string)
722 >
723 >        xml.write('<args> <![CDATA[\n _ITR2_ \n]]> </args>\n')
724 >        xml.write('<program_types> crabjob </program_types>\n')
725 >        inp_box = common.work_space.pathForTgz() + 'job/' + jbt.scriptName + ','
726 >
727 >        if inp_sandbox != None:
728 >            for fl in inp_sandbox:
729 >                inp_box = inp_box + '' + fl + ','
730 >                pass
731 >            pass
732 >
733 > #        if (not jbt.additional_inbox_files == []):
734 > #            inp_box = inp_box + ','
735 > #            for addFile in jbt.additional_inbox_files:
736 > #                #addFile = os.path.abspath(addFile)
737 > #                inp_box = inp_box+''+addFile+','
738 > #                pass
739 >
740 >        if inp_box[-1] == ',' : inp_box = inp_box[:-1]
741 >        inp_box = '<infiles> <![CDATA[\n' + inp_box + '\n]]> </infiles>\n'
742 >        xml.write(inp_box)
743 >        
744 >        base = jbt.name()
745 >        stdout = base + '__ITR3_.stdout'
746 >        stderr = base + '__ITR3_.stderr'
747 >        
748 >        xml.write('<stderr> ' + stderr + '</stderr>\n')
749 >        xml.write('<stdout> ' + stdout + '</stdout>\n')
750 >        
751 >
752 >        out_box = stdout + ',' + \
753 >                  stderr + ',.BrokerInfo,'
754 >
755 >        """
756 >        if int(self.return_data) == 1:
757 >            if out_sandbox != None:
758 >                for fl in out_sandbox:
759 >                    out_box = out_box + '' + fl + ','
760 >                    pass
761 >                pass
762              pass
763 +        """
764  
765 <        jdl.write('MyProxyServer = "' + self.proxyServer + '";\n')
765 >        """
766 >        INDY
767 >        something similar should be also done for infiles (if it makes sense!)
768 >        """
769 >        # Stuff to be returned _always_ via sandbox
770 >        for fl in jbt.output_file_sandbox:
771 >            out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
772 >            pass
773 >        pass
774 >
775 >        # via sandbox iif required return_data
776 >        if int(self.return_data) == 1:
777 >            for fl in jbt.output_file:
778 >                out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
779 >                pass
780 >            pass
781 >
782 >        if out_box[-1] == ',' : out_box = out_box[:-1]
783 >        out_box = '<outfiles> <![CDATA[\n' + out_box + '\n]]></outfiles>\n'
784 >        xml.write(out_box)
785 >
786 >        xml.write('<BossAttr> crabjob.INTERNAL_ID=_ITR1_ </BossAttr>\n')
787 >
788 >        xml.write('</program>\n')
789 >        xml.write('</chain>\n')
790 >
791 >        xml.write('</iterator>\n')
792 >        xml.write('</task>\n')
793 >
794 >        xml.close()
795 >      
796  
766        jdl.close()
797          return
798  
799      def checkProxy(self):
# Line 771 | Line 801 | class SchedulerEdg(Scheduler):
801          Function to check the Globus proxy.
802          """
803          if (self.proxyValid): return
804 <        timeleft = -999
804 >
805 >        ### Just return if asked to do so
806 >        if (self.dontCheckProxy==1):
807 >            self.proxyValid=1
808 >            return
809 >
810          minTimeLeft=10*3600 # in seconds
811  
812          minTimeLeftServer = 100 # in hours
813  
779        #cmd = 'voms-proxy-info -exists -valid '+str(minTimeLeft)+':00'
780        #cmd = 'voms-proxy-info -timeleft'
814          mustRenew = 0
815 <        timeLeftLocal = runCommand('voms-proxy-info -timeleft')
815 >        timeLeftLocal = runCommand('voms-proxy-info -timeleft 2>/dev/null')
816          timeLeftServer = -999
817          if not timeLeftLocal or int(timeLeftLocal) <= 0 or not isInt(timeLeftLocal):
818              mustRenew = 1
819          else:
820 <            timeLeftServer = runCommand('voms-proxy-info -actimeleft | head -1')
820 >            timeLeftServer = runCommand('voms-proxy-info -actimeleft 2>/dev/null | head -1')
821              if not timeLeftServer or not isInt(timeLeftServer):
822                  mustRenew = 1
823 <            elif timeLeftServer<minTimeLeft or timeLeftServer<minTimeLeft:
823 >            elif timeLeftLocal<minTimeLeft or timeLeftServer<minTimeLeft:
824                  mustRenew = 1
825              pass
826          pass
827  
828          if mustRenew:
829 <            common.logger.message( "No valid proxy found or timeleft too short!\n Creating a user proxy with default length of 24h\n")
830 <            cmd = 'voms-proxy-init -voms cms -valid 24:00'
829 >            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")
830 >            cmd = 'voms-proxy-init -voms '+self.VO
831 >            if self.group:
832 >                cmd += ':/'+self.VO+'/'+self.group
833 >            if self.role:
834 >                cmd += '/role='+self.role
835 >            cmd += ' -valid 192:00'
836              try:
837                  # SL as above: damn it!
838 +                common.logger.debug(10,cmd)
839                  out = os.system(cmd)
840                  if (out>0): raise CrabException("Unable to create a valid proxy!\n")
841              except:
842                  msg = "Unable to create a valid proxy!\n"
843                  raise CrabException(msg)
805            # cmd = 'grid-proxy-info -timeleft'
806            # cmd_out = runCommand(cmd,0,20)
844              pass
845  
846          ## now I do have a voms proxy valid, and I check the myproxy server
# Line 818 | Line 855 | class SchedulerEdg(Scheduler):
855              reTime = re.compile( r'timeleft: (\d+)' )
856              #print "<"+str(reTime.search( cmd_out ).group(1))+">"
857              if reTime.match( cmd_out ):
858 <                time = reTime.search( line ).group(1)
858 >                time = reTime.search( cmd_out ).group(1)
859                  if time < minTimeLeftServer:
860                      renewProxy = 1
861                      common.logger.message('No credential delegation will expire in '+time+' hours: renew it')
# Line 844 | Line 881 | class SchedulerEdg(Scheduler):
881          if self.edg_config_vo:
882              edg_ui_cfg_opt += ' --config-vo ' + self.edg_config_vo + ' '
883          return edg_ui_cfg_opt
884 +
885 +    def submitTout(self, list):
886 +        return 120
887 +
888 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines