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

Comparing COMP/CRAB/python/SchedulerEdg.py (file contents):
Revision 1.73.2.2 by fanzago, Wed Jul 19 10:53:40 2006 UTC vs.
Revision 1.138 by fanzago, Wed Oct 3 17:01:45 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 21 | Line 22 | class SchedulerEdg(Scheduler):
22          return
23  
24      def configure(self, cfg_params):
25 <        # test branch 2
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  
154        self.proxyValid=0
155
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
176 <        else:
177 <            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"
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'
# Line 193 | Line 323 | class SchedulerEdg(Scheduler):
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'
197 <        txt += '    middleware=LCG \n'
198 <        txt += '    echo "SyncCE=`edg-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
199 <        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
200 <        txt += '    echo "middleware =$middleware" \n'
201 <        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'
# Line 208 | Line 333 | class SchedulerEdg(Scheduler):
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'
# Line 227 | Line 358 | class SchedulerEdg(Scheduler):
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'
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 278 | 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 304 | 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']
309 <            #print "self.copy_input_data = ", self.copy_input_data
310 <        except KeyError: self.copy_input_data = 0
311 <        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 <           #### FEDE
455 <           #txt += '      echo "which lcg-cp" \n'
456 <           #txt += '      which lcg-cp \n'
457 <           #########
458 <           txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$input_lfn/$input_file file:`pwd`/$input_file 2>&1\n'
459 <           txt += '      copy_input_exit_status=$?\n'
460 <           txt += '      echo "COPY_INPUT_EXIT_STATUS = $copy_input_exit_status"\n'
461 <           txt += '      if [ $copy_input_exit_status -ne 0 ]; then \n'
462 <           txt += '         echo "Problems with copying to WN" \n'
463 <           txt += '      else \n'
464 <           txt += '         echo "input copied into WN" \n'
465 <           txt += '      fi \n'
466 <           txt += '   done \n'
467 < ### copy a set of PU ntuples (same for each jobs -- but accessed randomly)
468 <           txt += '   for file in $cur_pu_list \n'
469 <           txt += '   do \n'
470 <           #### FEDE
471 <           #txt += '      echo "which lcg-cp" \n'
472 <           #txt += '      which lcg-cp \n'
473 <           #########
474 <           txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$pu_lfn/$file file:`pwd`/$file 2>&1\n'
475 <           txt += '      copy_input_pu_exit_status=$?\n'
476 <           txt += '      echo "COPY_INPUT_PU_EXIT_STATUS = $copy_input_pu_exit_status"\n'
477 <           txt += '      if [ $copy_input_pu_exit_status -ne 0 ]; then \n'
478 <           txt += '         echo "Problems with copying pu to WN" \n'
350 <           txt += '      else \n'
351 <           txt += '         echo "input pu files copied into WN" \n'
352 <           txt += '      fi \n'
353 <           txt += '   done \n'
354 <           txt += '   \n'
355 <           txt += '   ### Check SCRATCH space available on WN : \n'
356 <           txt += '   df -h \n'
357 <           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 363 | 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 = ''
367 <        if int(self.copy_data) == 1:
368 <           txt += '#\n'
369 <           txt += '#   Copy output to SE = $SE\n'
370 <           txt += '#\n'
371 <           #txt += 'if [ $exe_result -eq 0 ]; then\n'
372 <           txt += '    if [ $middleware == OSG ]; then\n'
373 <           txt += '        echo "X509_USER_PROXY = $X509_USER_PROXY"\n'
374 <           txt += '        echo "source $OSG_APP/glite/setup_glite_ui.sh"\n'
375 <           txt += '        source $OSG_APP/glite/setup_glite_ui.sh\n'
376 <           txt += '        export X509_CERT_DIR=$OSG_APP/glite/etc/grid-security/certificates\n'
377 <           txt += '        echo "export X509_CERT_DIR=$X509_CERT_DIR"\n'
378 <           txt += '    fi \n'
379 <           txt += '    for out_file in $file_list ; do\n'
380 <           txt += '        echo "Trying to copy output file to $SE using lcg-cp"\n'
381 <           txt += '        echo "lcg-cp --vo $VO -t 1200 --verbose file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
382 <           txt += '        exitstring=`lcg-cp --vo $VO -t 1200 --verbose file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
383 <           txt += '        copy_exit_status=$?\n'
384 <           txt += '        echo "COPY_EXIT_STATUS for lcg-cp = $copy_exit_status"\n'
385 <           txt += '        echo "STAGE_OUT = $copy_exit_status"\n'
386 <           txt += '        if [ $copy_exit_status -ne 0 ]; then\n'
387 <           txt += '            echo "Possible problem with SE = $SE"\n'
388 <           txt += '            echo "StageOutExitStatus = 198" | tee -a $RUNTIME_AREA/$repo\n'
389 <           txt += '            echo "StageOutExitStatusReason = $exitstring" | tee -a $RUNTIME_AREA/$repo\n'
390 <           txt += '            echo "lcg-cp failed, attempting srmcp"\n'
391 <           txt += '            echo "mkdir -p $HOME/.srmconfig"\n'
392 <           txt += '            mkdir -p $HOME/.srmconfig\n'
393 <           txt += '            if [ $middleware == LCG ]; then\n'
394 <           txt += '               echo "srmcp -retry_num 5 -retry_timeout 240000 file:////`pwd`/$out_file srm://${SE}:8443${SE_PATH}$out_file"\n'
395 <           txt += '               exitstring=`srmcp -retry_num 5 -retry_timeout 240000 file:////\`pwd\`/$out_file srm://${SE}:8443${SE_PATH}$out_file 2>&1`\n'
396 <           txt += '            elif [ $middleware == OSG ]; then\n'
397 <           txt += '               echo "srmcp -retry_num 5 -retry_timeout 240000 -x509_user_trusted_certificates $OSG_APP/glite/etc/grid-security/certificates file:////`pwd`/$out_file srm://${SE}:8443${SE_PATH}$out_file"\n'
398 <           txt += '               exitstring=`srmcp -retry_num 5 -retry_timeout 240000 -x509_user_trusted_certificates $OSG_APP/glite/etc/grid-security/certificates file:////\`pwd\`/$out_file srm://${SE}:8443${SE_PATH}$out_file 2>&1`\n'
399 <           txt += '            fi \n'
400 <           txt += '            copy_exit_status=$?\n'
401 <           txt += '            echo "COPY_EXIT_STATUS for srm = $copy_exit_status"\n'
402 <           txt += '            echo "STAGE_OUT = $copy_exit_status"\n'
403 <           txt += '            if [ $copy_exit_status -ne 0 ]; then\n'
404 <           txt += '               echo "Problems with SE = $SE"\n'
405 <           txt += '               echo "StageOutExitStatus = 198" | tee -a $RUNTIME_AREA/$repo\n'
406 <           txt += '               echo "StageOutExitStatusReason = $exitstring" | tee -a $RUNTIME_AREA/$repo\n'
407 <           txt += '               echo "lcg-cp and srm failed"\n'
408 <           txt += '               echo "If storage_path in your config file contains a ? you may need a \? instead."\n'
409 <           txt += '            else\n'
410 <           txt += '               echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
411 <           txt += '               echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
412 <           txt += '               echo "output copied into $SE/$SE_PATH directory"\n'
413 <           txt += '               echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
414 <           txt += '               echo "srmcp succeeded"\n'
415 <           txt += '            fi\n'
416 <           txt += '        else\n'
417 <           txt += '            echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
418 <           txt += '            echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
419 <           txt += '            echo "output copied into $SE/$SE_PATH directory"\n'
420 <           txt += '            echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
421 <           txt += '            echo "lcg-cp succeeded"\n'
422 <           txt += '         fi\n'
423 <           txt += '     done\n'
424 <           #txt += 'fi\n'
425 <        return txt
487 >        txt = '\n'
488  
489 <    def wsRegisterOutput(self):
490 <        """
491 <        Returns part of a job script which does scheduler-specific work.
430 <        """
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 += '   if [ $copy_exit_status -eq 0 ]; then\n'
507 <           txt += '      for out_file in $file_list ; do\n'
508 <           txt += '         echo "Trying to register the output file into LFC"\n'
509 <           #### FEDE
510 <           #txt += '         echo "which lcg-rf" \n'
511 <           #txt += '         which lcg-rf \n'
512 <           #########
513 <           txt += '         echo "lcg-rf -l $LFN/$out_file --vo $VO -t 1200 sfn://$SE$SE_PATH/$out_file 2>&1"\n'
514 <           txt += '         lcg-rf -l $LFN/$out_file --vo $VO -t 1200 sfn://$SE$SE_PATH/$out_file 2>&1 \n'
515 <           txt += '         register_exit_status=$?\n'
516 <           txt += '         echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
517 <           txt += '         echo "STAGE_OUT = $register_exit_status"\n'
518 <           txt += '         if [ $register_exit_status -ne 0 ]; then \n'
519 <           txt += '            echo "Problems with the registration to LFC" \n'
520 <           txt += '            echo "Try with srm protocol" \n'
521 <           #### FEDE
522 <           #txt += '            echo "which lcg-rf" \n'
523 <           #txt += '            which lcg-rf \n'
524 <           #########
525 <           txt += '            echo "lcg-rf -l $LFN/$out_file --vo $VO -t 1200 srm://$SE$SE_PATH/$out_file 2>&1"\n'
526 <           txt += '            lcg-rf -l $LFN/$out_file --vo $VO -t 1200 srm://$SE$SE_PATH/$out_file 2>&1 \n'
527 <           txt += '            register_exit_status=$?\n'
528 <           txt += '            echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
529 <           txt += '            echo "STAGE_OUT = $register_exit_status"\n'
530 <           txt += '            if [ $register_exit_status -ne 0 ]; then \n'
531 <           txt += '               echo "Problems with the registration into LFC" \n'
532 <           txt += '            fi \n'
533 <           txt += '         else \n'
534 <           txt += '            echo "output registered to LFC"\n'
535 <           txt += '         fi \n'
536 <           txt += '         echo "StageOutExitStatus = $register_exit_status" | tee -a $RUNTIME_AREA/$repo\n'
537 <           txt += '      done\n'
538 <           #txt += '   elif [[ $exe_result -eq 0 && $copy_exit_status -ne 0 ]]; then \n'
539 <           txt += '   else \n'
479 <           txt += '      echo "Trying to copy output file to CloseSE"\n'
480 <           txt += '      CLOSE_SE=`edg-brokerinfo getCloseSEs | head -1`\n'
481 <           txt += '      for out_file in $file_list ; do\n'
482 <           #### FEDE
483 <           #txt += '         echo "which lcg-cr" \n'
484 <           #txt += '         which lcg-cr \n'
485 <           #########
486 <           txt += '         echo "lcg-cr -v -l lfn:${LFN}/$out_file -d $CLOSE_SE -P $LFN/$out_file --vo $VO file://$RUNTIME_AREA/$out_file 2>&1" \n'
487 <           txt += '         lcg-cr -v -l lfn:${LFN}/$out_file -d $CLOSE_SE -P $LFN/$out_file --vo $VO file://$RUNTIME_AREA/$out_file 2>&1 \n'
488 <           txt += '         register_exit_status=$?\n'
489 <           txt += '         echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
490 <           txt += '         echo "STAGE_OUT = $register_exit_status"\n'
491 <           txt += '         if [ $register_exit_status -ne 0 ]; then \n'
492 <           txt += '            echo "Problems with CloseSE or Catalog" \n'
493 <           txt += '         else \n'
494 <           txt += '            echo "The program was successfully executed"\n'
495 <           txt += '            echo "SE = $CLOSE_SE"\n'
496 <           txt += '            echo "LFN for the file is LFN=${LFN}/$out_file"\n'
497 <           txt += '         fi \n'
498 <           txt += '         echo "StageOutExitStatus = $register_exit_status" | tee -a $RUNTIME_AREA/$repo\n'
499 <           txt += '      done\n'
500 <           #txt += '   else\n'
501 <           #txt += '      echo "Problem with the executable"\n'
502 <           txt += '   fi \n'
503 <           txt += '   exit_status=$register_exit_status\n'
504 <           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 += '       copy_exit_status=60307\n'
523 >            
524 >            txt += '   else\n'
525 >            txt += '       echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
526 >            txt += '       echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
527 >            txt += '       echo "output copied into $SE/$SE_PATH directory"\n'
528 >            txt += '       echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
529 >            txt += '       echo "srmcp succeeded"\n'
530 >            txt += '    fi\n'
531 >            txt += 'done\n'
532 >            txt += 'if [ $copy_exit_status -ne 0 ]; then\n'
533 >            txt += '      SE=""\n'
534 >            txt += '      echo "SE = $SE"\n'
535 >            txt += '      SE_PATH=""\n'
536 >            txt += '      echo "SE_PATH = $SE_PATH"\n'
537 >            txt += 'fi\n'
538 >            txt += 'exit_status=$copy_exit_status\n'
539 >            pass
540          return txt
541  
542      def loggingInfo(self, id):
# Line 510 | Line 545 | class SchedulerEdg(Scheduler):
545          """
546          self.checkProxy()
547          cmd = 'edg-job-get-logging-info -v 2 ' + id
513        #cmd_out = os.popen(cmd)
548          cmd_out = runCommand(cmd)
549          return cmd_out
550  
551 <    def listMatch(self, nj):
552 <        """
553 <        Check the compatibility of available resources
554 <        """
555 <        self.checkProxy()
522 <        jdl = common.job_list[nj].jdlFilename()
523 <        cmd = 'edg-job-list-match ' + self.configOpt_() + jdl
524 <        cmd_out = runCommand(cmd,0,10)
525 <        if not cmd_out:
526 <            raise CrabException("ERROR: "+cmd+" failed!")
527 <
528 <        return self.parseListMatch_(cmd_out, jdl)
529 <
530 <    def parseListMatch_(self, out, jdl):
531 <        """
532 <        Parse the f* output of edg-list-match and produce something sensible
533 <        """
534 <        reComment = re.compile( r'^\**$' )
535 <        reEmptyLine = re.compile( r'^$' )
536 <        reVO = re.compile( r'Selected Virtual Organisation name.*' )
537 <        reLine = re.compile( r'.*')
538 <        reCE = re.compile( r'(.*:.*)')
539 <        reCEId = re.compile( r'CEId.*')
540 <        reNO = re.compile( r'No Computing Element matching' )
541 <        reRB = re.compile( r'Connecting to host' )
542 <        next = 0
543 <        CEs=[]
544 <        Match=0
545 <
546 <        #print out
547 <        lines = reLine.findall(out)
548 <
549 <        i=0
550 <        CEs=[]
551 <        for line in lines:
552 <            string.strip(line)
553 <            #print line
554 <            if reNO.match( line ):
555 <                common.logger.debug(5,line)
556 <                return 0
557 <                pass
558 <            if reVO.match( line ):
559 <                VO =reVO.match( line ).group()
560 <                common.logger.debug(5,"VO "+VO)
561 <                pass
562 <
563 <            if reRB.match( line ):
564 <                RB = reRB.match(line).group()
565 <                common.logger.debug(5,"RB "+RB)
566 <                pass
551 >    def queryDetailedStatus(self, id):
552 >        """ Query a detailed status of the job with id """
553 >        cmd = 'edg-job-status '+id
554 >        cmd_out = runCommand(cmd)
555 >        return cmd_out
556  
557 <            if reCEId.search( line ):
558 <                for lineCE in lines[i:-1]:
570 <                    if reCE.match( lineCE ):
571 <                        CE = string.strip(reCE.search(lineCE).group(1))
572 <                        CEs.append(CE.split(':')[0])
573 <                        pass
574 <                    pass
575 <                pass
576 <            i=i+1
577 <            pass
557 >    def findSites_(self, n):
558 >        itr4 =[]
559  
560 <        common.logger.debug(5,"All CE :"+str(CEs))
560 >        sites = common.jobDB.destination(n)
561  
562 <        sites = []
563 <        [sites.append(it) for it in CEs if not sites.count(it)]
562 >        if len(sites)>0 and sites[0]=="":
563 >            return itr4
564  
565 <        common.logger.debug(5,"All Sites :"+str(sites))
566 <        common.logger.message("Matched 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
602 <                    common.logger.message( "CE required: "+req)
603 <                break
604 <            pass
605 <        raise CrabException("No compatible resources found!")
565 >        itr = ''
566 >        if sites != [""]:#CarlosDaniele
567 >            ##Addedd Daniele
568 >            replicas = self.blackWhiteListParser.checkBlackList(sites,n)
569 >            if len(replicas)!=0:
570 >                replicas = self.blackWhiteListParser.checkWhiteList(replicas,n)
571 >              
572 >            if len(replicas)==0:
573 >                msg = 'No sites remaining that host any part of the requested data! Exiting... '
574 >                raise CrabException(msg)
575 >            #####        
576 >           # for site in sites:
577 >            for site in replicas:
578 >                #itr = itr + 'target.GlueSEUniqueID==&quot;'+site+'&quot; || '
579 >                itr = itr + 'target.GlueSEUniqueID=="'+site+'" || '
580 >            itr = itr[0:-4]
581 >            itr4.append( itr )
582 >        return itr4
583  
584 <    def submit(self, nj):
584 >    def createXMLSchScript(self, nj, argsList):
585 >      
586          """
587 <        Submit one EDG job.
587 >        Create a XML-file for BOSS4.
588          """
589 <
612 <        self.checkProxy()
613 <        jid = None
614 <        jdl = common.job_list[nj].jdlFilename()
615 <
616 <        cmd = 'edg-job-submit ' + self.configOpt_() + jdl
617 <        cmd_out = runCommand(cmd)
618 <        if cmd_out != None:
619 <            reSid = re.compile( r'https.+' )
620 <            jid = reSid.search(cmd_out).group()
621 <            pass
622 <        return jid
623 <
624 <    def resubmit(self, nj_list):
589 >  #      job = common.job_list[nj]
590          """
591 <        Prepare jobs to be submit
591 >        INDY
592 >        [begin] FIX-ME:
593 >        I would pass jobType instead of job
594 >        """
595 >        index = nj - 1
596 >        job = common.job_list[index]
597 >        jbt = job.type()
598 >        
599 >        inp_sandbox = jbt.inputSandbox(index)
600 >        #out_sandbox = jbt.outputSandbox(index)
601 >        """
602 >        [end] FIX-ME
603          """
628        return
629
630    def getExitStatus(self, id):
631        return self.getStatusAttribute_(id, 'exit_code')
632
633    def queryStatus(self, id):
634        return self.getStatusAttribute_(id, 'status')
635
636    def queryDest(self, id):  
637        return self.getStatusAttribute_(id, 'destination')
638
604  
605 <    def getStatusAttribute_(self, id, attr):
606 <        """ Query a status of the job with id """
605 >        
606 >        title = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'
607 >        jt_string = ''
608 >        
609 >        xml_fname = str(self.jobtypeName)+'.xml'
610 >        xml = open(common.work_space.shareDir()+'/'+xml_fname, 'a')
611  
612 <        self.checkProxy()
613 <        hstates = {}
614 <        Status = importName('edg_wl_userinterface_common_LbWrapper', 'Status')
615 <        # Bypass edg-job-status interfacing directly to C++ API
616 <        # Job attribute vector to retrieve status without edg-job-status
648 <        level = 0
649 <        # Instance of the Status class provided by LB API
650 <        jobStat = Status()
651 <        st = 0
652 <        jobStat.getStatus(id, level)
653 <        err, apiMsg = jobStat.get_error()
654 <        if err:
655 <            common.logger.debug(5,'Error caught' + apiMsg)
656 <            return None
657 <        else:
658 <            for i in range(len(self.states)):
659 <                # Fill an hash table with all information retrieved from LB API
660 <                hstates[ self.states[i] ] = jobStat.loadStatus(st)[i]
661 <            result = jobStat.loadStatus(st)[ self.states.index(attr) ]
662 <            return result
612 >        #TaskName  
613 >        dir = string.split(common.work_space.topDir(), '/')
614 >        taskName = dir[len(dir)-2]
615 >  
616 >        to_write = ''
617  
618 <    def queryDetailedStatus(self, id):
619 <        """ Query a detailed status of the job with id """
666 <        cmd = 'edg-job-status '+id
667 <        cmd_out = runCommand(cmd)
668 <        return cmd_out
669 <
670 <    def getOutput(self, id):
671 <        """
672 <        Get output for a finished job with id.
673 <        Returns the name of directory with results.
674 <        """
618 >        req=' '
619 >        req = req + jbt.getRequirements()
620  
621 <        self.checkProxy()
622 <        cmd = 'edg-job-get-output --dir ' + common.work_space.resDir() + ' ' + id
623 <        cmd_out = runCommand(cmd)
621 >        if self.EDG_requirements:
622 >            if (req == ' '):
623 >                req = req + self.EDG_requirements
624 >            else:
625 >                req = req +  ' && ' + self.EDG_requirements
626 >        if self.EDG_ce_white_list:
627 >            ce_white_list = string.split(self.EDG_ce_white_list,',')
628 >            for i in range(len(ce_white_list)):
629 >                if i == 0:
630 >                    if (req == ' '):
631 >                        req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
632 >                    else:
633 >                        req = req +  ' && ((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
634 >                    pass
635 >                else:
636 >                    req = req +  ' || (RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
637 >            req = req + ')'
638 >        
639 >        if self.EDG_ce_black_list:
640 >            ce_black_list = string.split(self.EDG_ce_black_list,',')
641 >            for ce in ce_black_list:
642 >                if (req == ' '):
643 >                    req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
644 >                else:
645 >                    req = req +  ' && (!RegExp("' + ce + '", other.GlueCEUniqueId))'
646 >                pass
647 >        if self.EDG_clock_time:
648 >            if (req == ' '):
649 >                req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
650 >            else:
651 >                req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
652  
653 <        # Determine the output directory name
654 <        dir = common.work_space.resDir()
655 <        dir += os.environ['USER']
656 <        dir += '_' + os.path.basename(id)
657 <        return dir
653 >        if self.EDG_cpu_time:
654 >            if (req == ' '):
655 >                req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
656 >            else:
657 >                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
658 >                                                                                          
659 >        if ( self.EDG_retry_count ):              
660 >            to_write = to_write + 'RetryCount = "'+self.EDG_retry_count+'"\n'
661 >            pass
662  
663 <    def cancel(self, id):
664 <        """ Cancel the EDG job with id """
665 <        self.checkProxy()
689 <        cmd = 'edg-job-cancel --noint ' + id
690 <        cmd_out = runCommand(cmd)
691 <        return cmd_out
663 >        if ( self.EDG_shallow_retry_count ):              
664 >            to_write = to_write + 'ShallowRetryCount = "'+self.EDG_shallow_retry_count+'"\n'
665 >            pass
666  
667 <    def createSchScript(self, nj):
668 <        """
695 <        Create a JDL-file for EDG.
696 <        """
667 >        to_write = to_write + 'MyProxyServer = "&quot;' + self.proxyServer + '&quot;"\n'
668 >        to_write = to_write + 'VirtualOrganisation = "&quot;' + self.VO + '&quot;"\n'
669  
670 <        job = common.job_list[nj]
671 <        jbt = job.type()
672 <        inp_sandbox = jbt.inputSandbox(nj)
673 <        out_sandbox = jbt.outputSandbox(nj)
674 <        inp_storage_subdir = ''
670 >        #TaskName  
671 >        dir = string.split(common.work_space.topDir(), '/')
672 >        taskName = dir[len(dir)-2]
673 >
674 >        xml.write(str(title))
675 >        #xml.write('<task name="' +str(taskName)+'" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache">\n')
676 >
677 >        #xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + '" task_info="' + os.path.expandvars('X509_USER_PROXY') + '">\n')
678 >        x509_cmd = 'ls /tmp/x509up_u`id -u`'
679 >        x509=runCommand(x509_cmd).strip()
680 >        xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + ' task_info="' + str(x509) + '">\n')
681 >        xml.write(jt_string)
682          
683 <        title = '# This JDL was generated by '+\
684 <                common.prog_name+' (version '+common.prog_version_str+')\n'
685 <        jt_string = ''
686 <
683 >        if (to_write != ''):
684 >            xml.write('<extraTags\n')
685 >            xml.write(to_write)
686 >            xml.write('/>\n')
687 >            pass
688  
689 +        xml.write('<iterator>\n')
690 +        xml.write('\t<iteratorRule name="ITR1">\n')
691 +        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ' </ruleElement>\n')
692 +        xml.write('\t</iteratorRule>\n')
693 +        xml.write('\t<iteratorRule name="ITR2">\n')
694 +        for arg in argsList:
695 +            xml.write('\t\t<ruleElement> <![CDATA[\n'+ arg + '\n\t\t]]> </ruleElement>\n')
696 +            pass
697 +        xml.write('\t</iteratorRule>\n')
698 +        #print jobList
699 +        xml.write('\t<iteratorRule name="ITR3">\n')
700 +        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ':1:6 </ruleElement>\n')
701 +        xml.write('\t</iteratorRule>\n')
702 +
703 +        '''
704 +        indy: here itr4
705 +        '''
706          
707 <        SPL = inp_storage_subdir
708 <        if ( SPL and SPL[-1] != '/' ) : SPL = SPL + '/'
707 >        xml.write('<chain name="' +str(taskName)+'__ITR1_" scheduler="'+str(self.schedulerName)+'">\n')
708 >       # xml.write('<chain scheduler="'+str(self.schedulerName)+'">\n')
709 >        xml.write(jt_string)
710  
711 <        jdl_fname = job.jdlFilename()
714 <        jdl = open(jdl_fname, 'w')
715 <        jdl.write(title)
711 >        #executable
712  
713 +        """
714 +        INDY
715 +        script depends on jobType: it should be probably get in a different way
716 +        """        
717          script = job.scriptFilename()
718 <        jdl.write('Executable = "' + os.path.basename(script) +'";\n')
719 <        jdl.write(jt_string)
720 <
721 <        ### only one .sh  JDL has arguments:
722 <
723 <        ### Fabio
724 <        jdl.write('Arguments = "' + str(nj+1)+' '+ jbt.getJobTypeArguments(nj, "EDG") +'";\n')
725 <        inp_box = 'InputSandbox = { '
726 <        inp_box = inp_box + '"' + script + '",'
718 >        xml.write('<program>\n')
719 >        xml.write('<exec> ' + os.path.basename(script) +' </exec>\n')
720 >        xml.write(jt_string)
721 >
722 >        xml.write('<args> <![CDATA[\n _ITR2_ \n]]> </args>\n')
723 >        xml.write('<program_types> crabjob </program_types>\n')
724 >        inp_box = common.work_space.pathForTgz() + 'job/' + jbt.scriptName + ','
725  
726          if inp_sandbox != None:
727              for fl in inp_sandbox:
728 <                inp_box = inp_box + ' "' + fl + '",'
728 >                inp_box = inp_box + '' + fl + ','
729                  pass
730              pass
731  
732 <        #if common.use_jam:
733 <        #   inp_box = inp_box+' "'+common.bin_dir+'/'+common.run_jam+'",'
734 <
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/'+'DashboardAPI.py') + '", "'+\
740 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'Logger.py') + '", "'+\
741 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'ProcInfo.py') + '", "'+\
742 <                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'apmon.py') + '"'
743 <        # End Marco
744 <
745 <        if (not jbt.additional_inbox_files == []):
746 <            inp_box = inp_box + ', '
747 <            for addFile in jbt.additional_inbox_files:
748 <                addFile = os.path.abspath(addFile)
749 <                inp_box = inp_box+' "'+addFile+'",'
750 <                pass
732 > #        if (not jbt.additional_inbox_files == []):
733 > #            inp_box = inp_box + ','
734 > #            for addFile in jbt.additional_inbox_files:
735 > #                #addFile = os.path.abspath(addFile)
736 > #                inp_box = inp_box+''+addFile+','
737 > #                pass
738  
739          if inp_box[-1] == ',' : inp_box = inp_box[:-1]
740 <        inp_box = inp_box + ' };\n'
741 <        jdl.write(inp_box)
755 <
756 <        jdl.write('StdOutput     = "' + job.stdout() + '";\n')
757 <        jdl.write('StdError      = "' + job.stderr() + '";\n')
740 >        inp_box = '<infiles> <![CDATA[\n' + inp_box + '\n]]> </infiles>\n'
741 >        xml.write(inp_box)
742          
743 +        base = jbt.name()
744 +        stdout = base + '__ITR3_.stdout'
745 +        stderr = base + '__ITR3_.stderr'
746 +        
747 +        xml.write('<stderr> ' + stderr + '</stderr>\n')
748 +        xml.write('<stdout> ' + stdout + '</stdout>\n')
749          
760        if job.stdout() == job.stderr():
761          out_box = 'OutputSandbox = { "' + \
762                    job.stdout() + '", ".BrokerInfo",'
763        else:
764          out_box = 'OutputSandbox = { "' + \
765                    job.stdout() + '", "' + \
766                    job.stderr() + '", ".BrokerInfo",'
750  
751 +        out_box = stdout + ',' + \
752 +                  stderr + ',.BrokerInfo,'
753 +
754 +        """
755          if int(self.return_data) == 1:
756              if out_sandbox != None:
757                  for fl in out_sandbox:
758 <                    out_box = out_box + ' "' + fl + '",'
758 >                    out_box = out_box + '' + fl + ','
759                      pass
760                  pass
761              pass
762 <                                                                                                                                                            
776 <        if out_box[-1] == ',' : out_box = out_box[:-1]
777 <        out_box = out_box + ' };'
778 <        jdl.write(out_box+'\n')
762 >        """
763  
764 +        """
765 +        INDY
766 +        something similar should be also done for infiles (if it makes sense!)
767 +        """
768 +        # Stuff to be returned _always_ via sandbox
769 +        for fl in jbt.output_file_sandbox:
770 +            out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
771 +            pass
772 +        pass
773  
774 <        req='Requirements = '
775 <        noreq=req
776 <        req = req + jbt.getRequirements()
777 <        #### and USER REQUIREMENT
785 <        if self.EDG_requirements:
786 <            if (req != noreq):
787 <                req = req +  ' && '
788 <            req = req + self.EDG_requirements
789 <        #### FEDE #####
790 <        if self.EDG_ce_white_list:
791 <            ce_white_list = string.split(self.EDG_ce_white_list,',')
792 <            #print "req = ", req
793 <            for i in range(len(ce_white_list)):
794 <                if i == 0:
795 <                    if (req != noreq):
796 <                        req = req +  ' && '
797 <                    req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
798 <                    pass
799 <                else:
800 <                    req = req +  ' || (RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
801 <            req = req + ')'
802 <        
803 <        if self.EDG_ce_black_list:
804 <            ce_black_list = string.split(self.EDG_ce_black_list,',')
805 <            for ce in ce_black_list:
806 <                if (req != noreq):
807 <                    req = req +  ' && '
808 <                req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
774 >        # via sandbox iif required return_data
775 >        if int(self.return_data) == 1:
776 >            for fl in jbt.output_file:
777 >                out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
778                  pass
779 +            pass
780  
781 <        ###############
782 <        clockTime=480
783 <        if self.EDG_clock_time:
784 <            clockTime= self.EDG_clock_time
785 <        if (req != noreq):
816 <            req = req + ' && '
817 <        req = req + '((other.GlueCEPolicyMaxWallClockTime == 0) || (other.GlueCEPolicyMaxWallClockTime>='+str(clockTime)+'))'
781 >        if out_box[-1] == ',' : out_box = out_box[:-1]
782 >        out_box = '<outfiles> <![CDATA[\n' + out_box + '\n]]></outfiles>\n'
783 >        xml.write(out_box)
784 >
785 >        xml.write('<BossAttr> crabjob.INTERNAL_ID=_ITR1_ </BossAttr>\n')
786  
787 <        cpuTime=1000
788 <        if self.EDG_cpu_time:
821 <            cpuTime=self.EDG_cpu_time
822 <        if (req != noreq):
823 <            req = req + ' && '
824 <        req = req + '((other.GlueCEPolicyMaxCPUTime == 0) || (other.GlueCEPolicyMaxCPUTime>='+str(cpuTime)+'))'
825 <
826 <        if (req != noreq):
827 <            req = req + ';\n'
828 <            jdl.write(req)
829 <                                                                                                                                                            
830 <        jdl.write('VirtualOrganisation = "' + self.VO + '";\n')
787 >        xml.write('</program>\n')
788 >        xml.write('</chain>\n')
789  
790 <        if ( self.EDG_retry_count ):              
791 <            jdl.write('RetryCount = '+self.EDG_retry_count+';\n')
834 <            pass
790 >        xml.write('</iterator>\n')
791 >        xml.write('</task>\n')
792  
793 <        jdl.write('MyProxyServer = "' + self.proxyServer + '";\n')
793 >        xml.close()
794 >      
795  
838        jdl.close()
796          return
797  
798      def checkProxy(self):
# Line 843 | Line 800 | class SchedulerEdg(Scheduler):
800          Function to check the Globus proxy.
801          """
802          if (self.proxyValid): return
803 <        timeleft = -999
803 >
804 >        ### Just return if asked to do so
805 >        if (self.dontCheckProxy==1):
806 >            self.proxyValid=1
807 >            return
808 >
809          minTimeLeft=10*3600 # in seconds
810  
811          minTimeLeftServer = 100 # in hours
812  
851        #cmd = 'voms-proxy-info -exists -valid '+str(minTimeLeft)+':00'
852        #cmd = 'voms-proxy-info -timeleft'
813          mustRenew = 0
814          timeLeftLocal = runCommand('voms-proxy-info -timeleft 2>/dev/null')
815          timeLeftServer = -999
# Line 865 | Line 825 | class SchedulerEdg(Scheduler):
825          pass
826  
827          if mustRenew:
828 <            common.logger.message( "No valid proxy found or remaining time of validity of already existing proxy shorter than 10 hours!\n Creating a user proxy with default length of 96h\n")
829 <            cmd = 'voms-proxy-init -voms cms -valid 96:00'
828 >            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")
829 >            cmd = 'voms-proxy-init -voms '+self.VO
830 >            if self.group:
831 >                cmd += ':/'+self.VO+'/'+self.group
832 >            if self.role:
833 >                cmd += '/role='+self.role
834 >            cmd += ' -valid 192:00'
835              try:
836                  # SL as above: damn it!
837 +                common.logger.debug(10,cmd)
838                  out = os.system(cmd)
839                  if (out>0): raise CrabException("Unable to create a valid proxy!\n")
840              except:
841                  msg = "Unable to create a valid proxy!\n"
842                  raise CrabException(msg)
877            # cmd = 'grid-proxy-info -timeleft'
878            # cmd_out = runCommand(cmd,0,20)
843              pass
844  
845          ## now I do have a voms proxy valid, and I check the myproxy server
# Line 890 | Line 854 | class SchedulerEdg(Scheduler):
854              reTime = re.compile( r'timeleft: (\d+)' )
855              #print "<"+str(reTime.search( cmd_out ).group(1))+">"
856              if reTime.match( cmd_out ):
857 <                time = reTime.search( line ).group(1)
857 >                time = reTime.search( cmd_out ).group(1)
858                  if time < minTimeLeftServer:
859                      renewProxy = 1
860                      common.logger.message('No credential delegation will expire in '+time+' hours: renew it')
# Line 916 | Line 880 | class SchedulerEdg(Scheduler):
880          if self.edg_config_vo:
881              edg_ui_cfg_opt += ' --config-vo ' + self.edg_config_vo + ' '
882          return edg_ui_cfg_opt
883 +
884 +    def submitTout(self, list):
885 +        return 120
886 +
887 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines