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.35 by corvo, Wed Jan 18 18:30:47 2006 UTC vs.
Revision 1.137 by spiga, Tue Sep 18 15:17:55 2007 UTC

# Line 2 | Line 2 | from Scheduler import Scheduler
2   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 21 | Line 23 | class SchedulerEdg(Scheduler):
23  
24      def configure(self, cfg_params):
25  
26 <        try: self.edg_config = cfg_params["EDG.config"]
27 <        except KeyError: self.edg_config = ''
26 >        # init BlackWhiteListParser
27 >        self.blackWhiteListParser = BlackWhiteListParser(cfg_params)
28  
29 <        try: self.edg_config_vo = cfg_params["EDG.config_vo"]
30 <        except KeyError: self.edg_config_vo = ''
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 +            self.rb_param_file=self.rb_configure(RB)
36 +        except KeyError:
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  
58 <        try: self.EDG_requirements = cfg_params['EDG.requirements']
59 <        except KeyError: self.EDG_requirements = ''
58 >        try:
59 >            self.EDG_ce_black_list = cfg_params['EDG.ce_black_list']
60 >        except KeyError:
61 >            self.EDG_ce_black_list  = ''
62  
63 <        try: self.EDG_retry_count = cfg_params['EDG.retry_count']
64 <        except KeyError: self.EDG_retry_count = ''
63 >        try:
64 >            self.EDG_ce_white_list = cfg_params['EDG.ce_white_list']
65 >        except KeyError: self.EDG_ce_white_list = ''
66  
67          try: self.VO = cfg_params['EDG.virtual_organization']
68          except KeyError: self.VO = 'cms'
69  
70 +        try: self.copy_input_data = cfg_params["USER.copy_input_data"]
71 +        except KeyError: self.copy_input_data = 0
72 +
73          try: self.return_data = cfg_params['USER.return_data']
74 <        except KeyError: self.return_data = 1
74 >        except KeyError: self.return_data = 0
75  
76          try:
77              self.copy_data = cfg_params["USER.copy_data"]
# Line 59 | Line 90 | class SchedulerEdg(Scheduler):
90             msg = 'Warning: return_data = 0 and copy_data = 0 ==> your exe output will be lost\n'
91             msg = msg + 'Please modify return_data and copy_data value in your crab.cfg file\n'
92             raise CrabException(msg)
93 +
94 +        ########### 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:
128 +            msg = "Error. The [EDG] section does not have 'lfc_host' value"
129 +            msg = msg + " it's necessary to know the LFC host name"
130 +            common.logger.message(msg)
131 +            raise CrabException(msg)
132 +        try:
133 +            self.lcg_catalog_type = cfg_params['EDG.lcg_catalog_type']
134 +        except KeyError:
135 +            msg = "Error. The [EDG] section does not have 'lcg_catalog_type' value"
136 +            msg = msg + " it's necessary to know the catalog type"
137 +            common.logger.message(msg)
138 +            raise CrabException(msg)
139 +        try:
140 +            self.lfc_home = cfg_params['EDG.lfc_home']
141 +        except KeyError:
142 +            msg = "Error. The [EDG] section does not have 'lfc_home' value"
143 +            msg = msg + " it's necessary to know the home catalog dir"
144 +            common.logger.message(msg)
145 +            raise CrabException(msg)
146        
147          try:
148              self.register_data = cfg_params["USER.register_data"]
# Line 67 | Line 151 | class SchedulerEdg(Scheduler):
151                      self.LFN = cfg_params['USER.lfn_dir']
152                  except KeyError:
153                      msg = "Error. The [USER] section does not have 'lfn_dir' value"
154 <                    msg = msg + " it's necessary for RLS registration"
154 >                    msg = msg + " it's necessary for LCF registration"
155                      common.logger.message(msg)
156                      raise CrabException(msg)
157          except KeyError: self.register_data = 0
# Line 80 | 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 103 | 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
122 <        else:
123 <            return 0
301 >
302  
303      def wsSetupEnvironment(self):
304          """
305          Returns part of a job script which does scheduler-specific work.
306          """
129
307          txt = ''
308 <        if int(self.copy_data) == 1:
309 <           if self.SE:
310 <              txt += 'export SE='+self.SE+'\n'
311 <              txt += 'echo "SE = $SE"\n'
312 <           if self.SE_PATH:
313 <              if ( self.SE_PATH[-1] != '/' ) : self.SE_PATH = self.SE_PATH + '/'
314 <              txt += 'export SE_PATH='+self.SE_PATH+'\n'
315 <              txt += 'echo "SE_PATH = $SE_PATH"\n'
316 <                                                                                                                                                            
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 [ $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 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 > #        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 >        ### 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'
375 >        txt += '    fi\n'
376 >        txt += '    if [[ $LFC_HOST != \''+self.lfc_host+'\' ]]; then\n'
377 >        txt += '        export LFC_HOST='+self.lfc_host+'\n'
378 >        txt += '    fi\n'
379 >        txt += '    if [[ $LFC_HOME != \''+self.lfc_home+'\' ]]; then\n'
380 >        txt += '        export LFC_HOME='+self.lfc_home+'\n'
381 >        txt += '    fi\n'
382 >        txt += 'elif [ $middleware == OSG ]; then\n'
383 >        txt += '    echo "LFC catalog setting to be implemented for OSG"\n'
384 >        txt += 'fi\n'
385 >        #####
386          if int(self.register_data) == 1:
387 +           txt += 'if [ $middleware == LCG ]; then \n'
388 +           txt += '    export LFN='+self.LFN+'\n'
389 +           txt += '    lfc-ls $LFN\n'
390 +           txt += '    result=$?\n'
391 +           txt += '    echo $result\n'
392 +           ### creation of LFN dir in LFC catalog, under /grid/cms dir  
393 +           txt += '    if [ $result != 0 ]; then\n'
394 +           txt += '       lfc-mkdir $LFN\n'
395 +           txt += '       result=$?\n'
396 +           txt += '       echo $result\n'
397 +           txt += '    fi\n'
398 +           txt += 'elif [ $middleware == OSG ]; then\n'
399 +           txt += '    echo " Files registration to be implemented for OSG"\n'
400 +           txt += 'fi\n'
401 +           txt += '\n'
402 +
403             if self.VO:
404                txt += 'export VO='+self.VO+'\n'
405             if self.LFN:
406 <              txt += 'export LFN='+self.LFN+'\n'
406 >              txt += 'if [ $middleware == LCG ]; then \n'
407 >              txt += '    export LFN='+self.LFN+'\n'
408 >              txt += 'fi\n'
409                txt += '\n'
410 <        txt += 'CloseCEs=`edg-brokerinfo getCE`\n'
411 <        txt += 'echo "CloseCEs = $CloseCEs"\n'
412 <        txt += 'CE=`echo $CloseCEs | sed -e "s/:.*//"`\n'
413 <        txt += 'echo "CE = $CE"\n'
410 >
411 >        txt += 'if [ $middleware == LCG ]; then\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'
417 >        txt += 'elif [ $middleware == OSG ]; then \n'
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_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'
431 >
432          return txt
433  
434 <    def wsCopyOutput(self):
434 >    def wsCopyInput(self):
435          """
436 <        Write a CopyResults part of a job script, e.g.
155 <        to copy produced output into a storage element.
436 >        Copy input data from SE to WN    
437          """
438          txt = ''
439 <        if int(self.copy_data) == 1:
440 <           copy = 'globus-url-copy file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file'
441 <           txt += '#\n'
442 <           txt += '#   Copy output to SE = $SE\n'
443 <           txt += '#\n'
444 <           txt += 'if [ $exe_result -eq 0 ]; then\n'
445 <           txt += '    for out_file in $file_list ; do\n'
446 <           txt += '        echo "Trying to copy output file to $SE "\n'
447 <           txt += '        echo "lcg-cp --vo cms -t 30 file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
448 < #           txt += '        echo "globus-url-copy file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
449 <           txt += '        exitstring=`lcg-cp --vo cms -t 30 file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
450 < #           txt += '        exitstring=`globus-url-copy file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
451 <           txt += '        copy_exit_status=$?\n'
452 <           txt += '        echo "COPY_EXIT_STATUS = $copy_exit_status"\n'
453 <           txt += '        echo "STAGE_OUT = $copy_exit_status"\n'
454 <           txt += '        if [ $copy_exit_status -ne 0 ]; then\n'
455 <           txt += '            echo "Problems with SE = $SE"\n'
456 <           txt += '            echo "StageOutExitStatus = 198" | tee -a $RUNTIME_AREA/$repo\n'
457 <           txt += '            echo "StageOutExitStatusReason = $exitstring" | tee -a $RUNTIME_AREA/$repo\n'
458 <           txt += '        else\n'
459 <           txt += '            echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
460 <           txt += '            echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
461 <           txt += '            echo "output copied into $SE/$SE_PATH directory"\n'
462 <           txt += '            echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
463 <           txt += '         fi\n'
464 <           txt += '     done\n'
465 <           txt += 'fi\n'
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 --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  
482 <    def wsRegisterOutput(self):
482 >    def wsCopyOutput(self):
483          """
484 <        Returns part of a job script which does scheduler-specific work.
484 >        Write a CopyResults part of a job script, e.g.
485 >        to copy produced output into a storage element.
486          """
487 +        txt = '\n'
488  
489 <        txt = ''
490 <        if int(self.register_data) == 1:
491 <           txt += '#\n'
492 <           txt += '#  Register output to RLS\n'
493 <           txt += '#\n'
494 <           txt += 'if [[ $exe_result -eq 0 && $copy_exit_status -eq 0 ]]; then\n'
495 <           txt += '   for out_file in $file_list ; do\n'
496 <           txt += '      echo "Trying to register the output file into RLS"\n'
497 <           txt += '      echo "lcg-rf -l $LFN/$out_file --vo $VO sfn://$SE$SE_PATH/$out_file"\n'
498 <           txt += '      lcg-rf -l $LFN/$out_file --vo $VO sfn://$SE$SE_PATH/$out_file 2>&1 \n'
499 <           txt += '      register_exit_status=$?\n'
500 <           txt += '      echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
501 <           txt += '      echo "STAGE_OUT = $register_exit_status"\n'
502 <           txt += '      if [ $register_exit_status -ne 0 ]; then \n'
503 <           txt += '         echo "Problems with the registration to RLS" \n'
504 <           txt += '         echo "Try with srm protocol" \n'
505 <           txt += '         echo "lcg-rf -l $LFN/$out_file --vo $VO srm://$SE$SE_PATH/$out_file"\n'
506 <           txt += '         lcg-rf -l $LFN/$out_file --vo $VO srm://$SE$SE_PATH/$out_file 2>&1 \n'
507 <           txt += '         register_exit_status=$?\n'
508 <           txt += '         echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
509 <           txt += '         echo "STAGE_OUT = $register_exit_status"\n'
510 <           txt += '         if [ $register_exit_status -ne 0 ]; then \n'
511 <           txt += '            echo "Problems with the registration into RLS" \n'
512 <           txt += '         fi \n'
513 <           txt += '      else \n'
514 <           txt += '         echo "output registered to RLS"\n'
515 <           txt += '      fi \n'
516 <           txt += '      echo "StageOutExitStatus = $register_exit_status"" | tee -a $RUNTIME_AREA/$repo\n'
517 <           txt += '   done\n'
518 <           txt += 'elif [[ $exe_result -eq 0 && $copy_exit_status -ne 0 ]]; then \n'
519 <           txt += '   echo "Trying to copy output file to CloseSE"\n'
520 <           txt += '   CLOSE_SE=`edg-brokerinfo getCloseSEs | head -1`\n'
521 <           txt += '   for out_file in $file_list ; do\n'
522 <           txt += '      echo "lcg-cr -v -l lfn:${LFN}/$out_file -d $CLOSE_SE -P $LFN/$out_file --vo $VO file://`pwd`/$out_file" \n'
523 <           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'
524 <           txt += '      register_exit_status=$?\n'
525 <           txt += '      echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
526 <           txt += '      echo "STAGE_OUT = $register_exit_status"\n'
527 <           txt += '      if [ $register_exit_status -ne 0 ]; then \n'
528 <           txt += '         echo "Problems with CloseSE" \n'
529 <           txt += '      else \n'
530 <           txt += '         echo "The program was successfully executed"\n'
531 <           txt += '         echo "SE = $CLOSE_SE"\n'
532 <           txt += '         echo "LFN for the file is LFN=${LFN}/$out_file"\n'
533 <           txt += '      fi \n'
534 <           txt += '      echo "StageOutExitStatus = $register_exit_status"" | tee -a $RUNTIME_AREA/$repo\n'
535 <           txt += '   done\n'
536 <           txt += 'else\n'
537 <           txt += '   echo "Problem with the executable"\n'
538 <           txt += 'fi \n'
489 >        txt += '#\n'
490 >        txt += '# COPY OUTPUT FILE TO SE\n'
491 >        txt += '#\n\n'
492 >
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 247 | Line 546 | class SchedulerEdg(Scheduler):
546          """
547          self.checkProxy()
548          cmd = 'edg-job-get-logging-info -v 2 ' + id
250        #cmd_out = os.popen(cmd)
549          cmd_out = runCommand(cmd)
550          return cmd_out
551  
552 <    def listMatch(self, nj):
553 <        """
554 <        Check the compatibility of available resources
555 <        """
556 <        self.checkProxy()
259 <        jdl = common.job_list[nj].jdlFilename()
260 <        cmd = 'edg-job-list-match ' + self.configOpt_() + jdl
261 <        cmd_out = runCommand(cmd,0,10)
262 <        return self.parseListMatch_(cmd_out, jdl)
263 <
264 <    def parseListMatch_(self, out, jdl):
265 <        """
266 <        Parse the f* output of edg-list-match and produce something sensible
267 <        """
268 <        reComment = re.compile( r'^\**$' )
269 <        reEmptyLine = re.compile( r'^$' )
270 <        reVO = re.compile( r'Selected Virtual Organisation name.*' )
271 <        reLine = re.compile( r'.*')
272 <        reCE = re.compile( r'(.*:.*)')
273 <        reCEId = re.compile( r'CEId.*')
274 <        reNO = re.compile( r'No Computing Element matching' )
275 <        reRB = re.compile( r'Connecting to host' )
276 <        next = 0
277 <        CEs=[]
278 <        Match=0
279 <
280 <        #print out
281 <        lines = reLine.findall(out)
282 <
283 <        i=0
284 <        CEs=[]
285 <        for line in lines:
286 <            string.strip(line)
287 <            #print line
288 <            if reNO.match( line ):
289 <                common.logger.debug(5,line)
290 <                return 0
291 <                pass
292 <            if reVO.match( line ):
293 <                VO =reVO.match( line ).group()
294 <                common.logger.debug(5,"VO "+VO)
295 <                pass
296 <
297 <            if reRB.match( line ):
298 <                RB = reRB.match(line).group()
299 <                common.logger.debug(5,"RB "+RB)
300 <                pass
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 <            if reCEId.search( line ):
559 <                for lineCE in lines[i:-1]:
304 <                    if reCE.match( lineCE ):
305 <                        CE = string.strip(reCE.search(lineCE).group(1))
306 <                        CEs.append(CE.split(':')[0])
307 <                        pass
308 <                    pass
309 <                pass
310 <            i=i+1
311 <            pass
558 >    def findSites_(self, n):
559 >        itr4 =[]
560  
561 <        common.logger.debug(5,"All CE :"+str(CEs))
561 >        sites = common.jobDB.destination(n)
562  
563 <        sites = []
564 <        [sites.append(it) for it in CEs if not sites.count(it)]
563 >        if len(sites)>0 and sites[0]=="":
564 >            return itr4
565  
566 <        common.logger.debug(5,"All Sites :"+str(sites))
567 <        return len(sites)
568 <
569 <    def noMatchFound_(self, jdl):
570 <        reReq = re.compile( r'Requirements' )
571 <        reString = re.compile( r'"\S*"' )
572 <        f = file(jdl,'r')
573 <        for line in f.readlines():
574 <            line= line.strip()
575 <            if reReq.match(line):
576 <                for req in reString.findall(line):
577 <                    if re.search("VO",req):
578 <                        common.logger.message( "SW required: "+req)
579 <                        continue
580 <                    if re.search('"\d+',req):
581 <                        common.logger.message("Other req  : "+req)
582 <                        continue
583 <                    common.logger.message( "CE required: "+req)
336 <                break
337 <            pass
338 <        raise CrabException("No compatible resources found!")
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 submit(self, nj):
585 >    def createXMLSchScript(self, nj, argsList):
586 >      
587          """
588 <        Submit one EDG job.
588 >        Create a XML-file for BOSS4.
589          """
590 <
345 <        self.checkProxy()
346 <        jid = None
347 <        jdl = common.job_list[nj].jdlFilename()
348 <
349 <        cmd = 'edg-job-submit ' + self.configOpt_() + jdl
350 <        cmd_out = runCommand(cmd)
351 <        if cmd_out != None:
352 <            reSid = re.compile( r'https.+' )
353 <            jid = reSid.search(cmd_out).group()
354 <            pass
355 <        return jid
356 <
357 <    def resubmit(self, nj_list):
590 >  #      job = common.job_list[nj]
591          """
592 <        Prepare jobs to be submit
592 >        INDY
593 >        [begin] FIX-ME:
594 >        I would pass jobType instead of job
595          """
596 <        return
597 <
598 <    def getExitStatus(self, id):
599 <        return self.getStatusAttribute_(id, 'exit_code')
600 <
601 <    def queryStatus(self, id):
367 <        return self.getStatusAttribute_(id, 'status')
368 <
369 <    def queryDest(self, id):  
370 <        return self.getStatusAttribute_(id, 'destination')
371 <
372 <
373 <    def getStatusAttribute_(self, id, attr):
374 <        """ Query a status of the job with id """
375 <
376 <        self.checkProxy()
377 <        hstates = {}
378 <        Status = importName('edg_wl_userinterface_common_LbWrapper', 'Status')
379 <        # Bypass edg-job-status interfacing directly to C++ API
380 <        # Job attribute vector to retrieve status without edg-job-status
381 <        level = 0
382 <        # Instance of the Status class provided by LB API
383 <        jobStat = Status()
384 <        st = 0
385 <        jobStat.getStatus(id, level)
386 <        err, apiMsg = jobStat.get_error()
387 <        if err:
388 <            common.logger.debug(5,'Error caught' + apiMsg)
389 <            return None
390 <        else:
391 <            for i in range(len(self.states)):
392 <                # Fill an hash table with all information retrieved from LB API
393 <                hstates[ self.states[i] ] = jobStat.loadStatus(st)[i]
394 <            result = jobStat.loadStatus(st)[ self.states.index(attr) ]
395 <            return result
396 <
397 <    def queryDetailedStatus(self, id):
398 <        """ Query a detailed status of the job with id """
399 <        cmd = 'edg-job-status '+id
400 <        cmd_out = runCommand(cmd)
401 <        return cmd_out
402 <
403 <    def getOutput(self, id):
596 >        index = nj - 1
597 >        job = common.job_list[index]
598 >        jbt = job.type()
599 >        
600 >        inp_sandbox = jbt.inputSandbox(index)
601 >        #out_sandbox = jbt.outputSandbox(index)
602          """
603 <        Get output for a finished job with id.
406 <        Returns the name of directory with results.
603 >        [end] FIX-ME
604          """
605  
606 <        self.checkProxy()
607 <        cmd = 'edg-job-get-output --dir ' + common.work_space.resDir() + ' ' + id
608 <        cmd_out = runCommand(cmd)
606 >        
607 >        title = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'
608 >        jt_string = ''
609 >        
610 >        xml_fname = str(self.jobtypeName)+'.xml'
611 >        xml = open(common.work_space.shareDir()+'/'+xml_fname, 'a')
612  
613 <        # Determine the output directory name
614 <        dir = common.work_space.resDir()
615 <        dir += os.getlogin()
616 <        dir += '_' + os.path.basename(id)
617 <        return dir
613 >        #TaskName  
614 >        dir = string.split(common.work_space.topDir(), '/')
615 >        taskName = dir[len(dir)-2]
616 >  
617 >        to_write = ''
618 >
619 >        req=' '
620 >        req = req + jbt.getRequirements()
621 >
622 >        if self.EDG_requirements:
623 >            if (req == ' '):
624 >                req = req + self.EDG_requirements
625 >            else:
626 >                req = req +  ' && ' + self.EDG_requirements
627 >        if self.EDG_ce_white_list:
628 >            ce_white_list = string.split(self.EDG_ce_white_list,',')
629 >            for i in range(len(ce_white_list)):
630 >                if i == 0:
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))'
635 >                    pass
636 >                else:
637 >                    req = req +  ' || (RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
638 >            req = req + ')'
639 >        
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 == ' '):
644 >                    req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
645 >                else:
646 >                    req = req +  ' && (!RegExp("' + ce + '", other.GlueCEUniqueId))'
647 >                pass
648 >        if self.EDG_clock_time:
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 <    def cancel(self, id):
655 <        """ Cancel the EDG job with id """
656 <        self.checkProxy()
657 <        cmd = 'edg-job-cancel --noint ' + id
658 <        cmd_out = runCommand(cmd)
659 <        return cmd_out
654 >        if self.EDG_cpu_time:
655 >            if (req == ' '):
656 >                req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
657 >            else:
658 >                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
659 >                                                                                          
660 >        if ( self.EDG_retry_count ):              
661 >            to_write = to_write + 'RetryCount = "'+self.EDG_retry_count+'"\n'
662 >            pass
663  
664 <    def createSchScript(self, nj):
665 <        """
666 <        Create a JDL-file for EDG.
429 <        """
664 >        if ( self.EDG_shallow_retry_count ):              
665 >            to_write = to_write + 'ShallowRetryCount = "'+self.EDG_shallow_retry_count+'"\n'
666 >            pass
667  
668 <        job = common.job_list[nj]
669 <        jbt = job.type()
433 <        inp_sandbox = jbt.inputSandbox(nj)
434 <        out_sandbox = jbt.outputSandbox(nj)
435 <        inp_storage_subdir = ''
436 <        
437 <        title = '# This JDL was generated by '+\
438 <                common.prog_name+' (version '+common.prog_version_str+')\n'
439 <        jt_string = ''
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 <        SPL = inp_storage_subdir
709 <        if ( SPL and SPL[-1] != '/' ) : SPL = SPL + '/'
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 <        jdl_fname = job.jdlFilename()
447 <        jdl = open(jdl_fname, 'w')
448 <        jdl.write(title)
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 <        jdl.write('Executable = "' + os.path.basename(script) +'";\n')
720 <        jdl.write(jt_string)
721 <
722 <        ### only one .sh  JDL has arguments:
723 <        firstEvent = common.jobDB.firstEvent(nj)
724 <        maxEvents = common.jobDB.maxEvents(nj)
725 <        jdl.write('Arguments = "' + str(nj+1)+' '+str(firstEvent)+' '+str(maxEvents)+'";\n')
458 <
459 <        inp_box = 'InputSandbox = { '
460 <        inp_box = inp_box + '"' + script + '",'
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 + '",'
729 >                inp_box = inp_box + '' + fl + ','
730                  pass
731              pass
732  
733 <        #if common.use_jam:
734 <        #   inp_box = inp_box+' "'+common.bin_dir+'/'+common.run_jam+'",'
735 <        # Marco (VERY TEMPORARY ML STUFF)
736 <        inp_box = inp_box+' "' + os.path.abspath(os.environ['CRABDIR']+'/python/'+'report.py') + '", "' +\
737 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'Logger.py') + '", "'+\
738 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'ProcInfo.py') + '", "'+\
474 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'apmon.py') + '"'
475 <        # End Marco
476 <
477 <        for addFile in jbt.additional_inbox_files:
478 <            addFile = os.path.abspath(addFile)
479 <            inp_box = inp_box+' "'+addFile+'",'
480 <            pass
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 = inp_box + ' };\n'
742 <        jdl.write(inp_box)
485 <
486 <        jdl.write('StdOutput     = "' + job.stdout() + '";\n')
487 <        jdl.write('StdError      = "' + job.stderr() + '";\n')
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 <        if job.stdout() == job.stderr():
749 <          out_box = 'OutputSandbox = { "' + \
750 <                    job.stdout() + '", ".BrokerInfo",'
751 <        else:
752 <          out_box = 'OutputSandbox = { "' + \
753 <                    job.stdout() + '", "' + \
496 <                    job.stderr() + '", ".BrokerInfo",'
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 + '",'
759 >                    out_box = out_box + '' + fl + ','
760                      pass
761                  pass
762              pass
763 <                                                                                                                                                            
763 >        """
764 >
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 = out_box + ' };'
784 <        jdl.write(out_box+'\n')
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 <        ### if at least a CE exists ...
789 <        if common.analisys_common_info['sites']:
512 <            if common.analisys_common_info['sw_version']:
513 <                req='Requirements = '
514 <                req=req + 'Member("VO-cms-' + \
515 <                     common.analisys_common_info['sw_version'] + \
516 <                     '", other.GlueHostApplicationSoftwareRunTimeEnvironment)'
517 <            if len(common.analisys_common_info['sites'])>0:
518 <                req = req + ' && ('
519 <                for i in range(len(common.analisys_common_info['sites'])):
520 <                    req = req + 'other.GlueCEInfoHostName == "' \
521 <                         + common.analisys_common_info['sites'][i] + '"'
522 <                    if ( i < (int(len(common.analisys_common_info['sites']) - 1)) ):
523 <                        req = req + ' || '
524 <            req = req + ')'
788 >        xml.write('</program>\n')
789 >        xml.write('</chain>\n')
790  
791 <            #### and USER REQUIREMENT
792 <            if self.EDG_requirements:
528 <                req = req +  ' && ' + self.EDG_requirements
529 <            if self.EDG_clock_time:
530 <                req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
531 <            if self.EDG_cpu_time:
532 <                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
533 <            req = req + ';\n'
534 <            jdl.write(req)
535 <                                                                                                                                                            
536 <        jdl.write('VirtualOrganisation = "' + self.VO + '";\n')
791 >        xml.write('</iterator>\n')
792 >        xml.write('</task>\n')
793  
794 <        if ( self.EDG_retry_count ):              
795 <            jdl.write('RetryCount = '+self.EDG_retry_count+';\n')
540 <            pass
794 >        xml.close()
795 >      
796  
542        jdl.close()
797          return
798  
799      def checkProxy(self):
# Line 547 | Line 801 | class SchedulerEdg(Scheduler):
801          Function to check the Globus proxy.
802          """
803          if (self.proxyValid): return
804 <        timeleft = -999
805 <        minTimeLeft=10 # in hours
806 <        cmd = 'grid-proxy-info -e -v '+str(minTimeLeft)+':00'
807 <        # SL Here I have to use os.system since the stupid command exit with >0 if no valid proxy is found
808 <        cmd_out = os.system(cmd)
809 <        if (cmd_out>0):
810 <            common.logger.message( "No valid proxy found or timeleft too short!\n Creating a user proxy with default length of 100h\n")
811 <            cmd = 'grid-proxy-init -valid 100:00'
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 >
814 >        mustRenew = 0
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 2>/dev/null | head -1')
821 >            if not timeLeftServer or not isInt(timeLeftServer):
822 >                mustRenew = 1
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 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)
565            # cmd = 'grid-proxy-info -timeleft'
566            # cmd_out = runCommand(cmd,0,20)
844              pass
845 +
846 +        ## now I do have a voms proxy valid, and I check the myproxy server
847 +        renewProxy = 0
848 +        cmd = 'myproxy-info -d -s '+self.proxyServer
849 +        cmd_out = runCommand(cmd,0,20)
850 +        if not cmd_out:
851 +            common.logger.message('No credential delegated to myproxy server '+self.proxyServer+' will do now')
852 +            renewProxy = 1
853 +        else:
854 +            # if myproxy exist but not long enough, renew
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( 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')
862 +                pass
863 +            pass
864 +        
865 +        # if not, create one.
866 +        if renewProxy:
867 +            cmd = 'myproxy-init -d -n -s '+self.proxyServer
868 +            out = os.system(cmd)
869 +            if (out>0):
870 +                raise CrabException("Unable to delegate the proxy to myproxyserver "+self.proxyServer+" !\n")
871 +            pass
872 +
873 +        # cache proxy validity
874          self.proxyValid=1
875          return
876 <    
876 >
877      def configOpt_(self):
878          edg_ui_cfg_opt = ' '
879          if self.edg_config:
880 <          edg_ui_cfg_opt = ' -c ' + self.edg_config + ' '
880 >            edg_ui_cfg_opt = ' -c ' + self.edg_config + ' '
881          if self.edg_config_vo:
882 <          edg_ui_cfg_opt += ' --config-vo ' + 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