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.29 by fanzago, Fri Nov 18 15:50:23 2005 UTC vs.
Revision 1.142 by fanzago, Fri Oct 5 12:55:05 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: self.LCG_version = cfg_params["EDG.lcg_version"]
34 <        except KeyError: self.LCG_version = '2'
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: self.EDG_requirements = cfg_params['EDG.requirements']
46 <        except KeyError: self.EDG_requirements = ''
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_retry_count = cfg_params['EDG.retry_count']
59 <        except KeyError: self.EDG_retry_count = ''
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:
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 = ''
74 >        except KeyError: self.return_data = 0
75  
76          try:
77              self.copy_data = cfg_params["USER.copy_data"]
78 <            try:
79 <                self.SE = cfg_params['USER.storage_element']
80 <                self.SE_PATH = cfg_params['USER.storage_path']
81 <            except KeyError:
82 <                msg = "Error. The [USER] section does not have 'storage_element'"
83 <                msg = msg + " and/or 'storage_path' entries, necessary to copy the output"
84 <                common.logger.message(msg)
85 <                raise CrabException(msg)
86 <        except KeyError: self.copy_data = ''
78 >            if int(self.copy_data) == 1:
79 >                try:
80 >                    self.SE = cfg_params['USER.storage_element']
81 >                    self.SE_PATH = cfg_params['USER.storage_path']
82 >                except KeyError:
83 >                    msg = "Error. The [USER] section does not have 'storage_element'"
84 >                    msg = msg + " and/or 'storage_path' entries, necessary to copy the output"
85 >                    common.logger.message(msg)
86 >                    raise CrabException(msg)
87 >        except KeyError: self.copy_data = 0
88 >
89 >        if ( int(self.return_data) == 0 and int(self.copy_data) == 0 ):
90 >           msg = 'Warning: return_data = 0 and copy_data = 0 ==> your exe output will be lost\n'
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.register_data = cfg_params["USER.register_data"]
97 <            try:
98 <                 self.LFN = cfg_params['USER.lfn_dir']
99 <            except KeyError:
100 <                msg = "Error. The [USER] section does not have 'lfn_dir' value"
101 <                msg = msg + " it's necessary for RLS registration"
102 <                common.logger.message(msg)
103 <                raise CrabException(msg)
104 <        except KeyError: self.register_data= ''
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"]
149 >        #    if int(self.register_data) == 1:
150 >        #        try:
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 LCF registration"
155 >        #            common.logger.message(msg)
156 >        #            raise CrabException(msg)
157 >        #except KeyError: self.register_data = 0
158 >
159 >        #if ( int(self.copy_data) == 0 and int(self.register_data) == 1 ):
160 >        #   msg = 'Warning: register_data = 1 must be used with copy_data = 1\n'
161 >        #   msg = msg + 'Please modify copy_data value in your crab.cfg file\n'
162 >        #   common.logger.message(msg)
163 >        #   raise CrabException(msg)
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 90 | 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
109 <        else:
110 <            return 0
301 >
302  
303      def wsSetupEnvironment(self):
304          """
305          Returns part of a job script which does scheduler-specific work.
306          """
116
307          txt = ''
308 <        if self.copy_data:
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 <                                                                                                                                                            
317 <        if self.register_data:
318 <           if self.VO:
319 <              txt += 'export VO='+self.VO+'\n'
320 <           if self.LFN:
321 <              txt += 'export LFN='+self.LFN+'\n'
322 <              txt += '\n'
323 <        txt += 'CloseCEs=`edg-brokerinfo getCE`\n'
324 <        txt += 'echo "CloseCEs = $CloseCEs"\n'
325 <        txt += 'CE=`echo $CloseCEs | sed -e "s/:.*//"`\n'
326 <        txt += 'echo "CE = $CE"\n'
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 >        #   if self.VO:
403 >        #      txt += 'export VO='+self.VO+'\n'
404 >        #   if self.LFN:
405 >        #      txt += 'if [ $middleware == LCG ]; then \n'
406 >        #      txt += '    export LFN='+self.LFN+'\n'
407 >        #      txt += 'fi\n'
408 >        #      txt += '\n'
409 >
410 >        txt += 'if [ $middleware == LCG ]; then\n'
411 >    #    txt += '    CloseCEs=`edg-brokerinfo getCE`\n'
412 >        txt += '    CloseCEs=`glite-brokerinfo getCE`\n'
413 >        txt += '    echo "CloseCEs = $CloseCEs"\n'
414 >        txt += '    CE=`echo $CloseCEs | sed -e "s/:.*//"`\n'
415 >        txt += '    echo "CE = $CE"\n'
416 >        txt += 'elif [ $middleware == OSG ]; then \n'
417 >        txt += '    if [ $OSG_JOB_CONTACT ]; then \n'
418 >        txt += '        CE=`echo $OSG_JOB_CONTACT | /usr/bin/awk -F\/ \'{print $1}\'` \n'
419 >        txt += '    else \n'
420 >        txt += '        echo "SET_CMS_ENV 10099 ==> OSG mode: ERROR in setting CE name from OSG_JOB_CONTACT" \n'
421 >        txt += '        echo "JOB_EXIT_STATUS = 10099" \n'
422 >        txt += '        echo "JobExitCode=10099" | tee -a $RUNTIME_AREA/$repo \n'
423 >        txt += '        dumpStatus $RUNTIME_AREA/$repo \n'
424 >        txt += '        rm -f $RUNTIME_AREA/$repo \n'
425 >        txt += '        echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
426 >        txt += '        echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
427 >        txt += '        exit 1 \n'
428 >        txt += '    fi \n'
429 >        txt += 'fi \n'
430 >
431          return txt
432  
433 <    def wsCopyOutput(self):
433 >    def wsCopyInput(self):
434          """
435 <        Write a CopyResults part of a job script, e.g.
142 <        to copy produced output into a storage element.
435 >        Copy input data from SE to WN    
436          """
437          txt = ''
438 <        if self.copy_data:
439 <           copy = 'globus-url-copy file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file'
440 <           txt += '#\n'
441 <           txt += '#   Copy output to SE = $SE\n'
442 <           txt += '#\n'
443 <           txt += 'if [ $exe_result -eq 0 ]; then\n'
444 <           txt += '  for out_file in $file_list ; do\n'
445 <           txt += '    echo "Trying to copy output file to $SE "\n'
446 <           txt += '    echo "'+copy+'"\n'
447 <           txt += '    '+copy+' 2>&1\n'
448 <           txt += '    copy_exit_status=$?\n'
449 <           txt += '    echo "COPY_EXIT_STATUS = $copy_exit_status"\n'
450 <           txt += '    echo "STAGE_OUT = $copy_exit_status"\n'
451 <           txt += '    if [ $copy_exit_status -ne 0 ]; then \n'
452 <           txt += '       echo "Problems with SE= $SE" \n'
453 <           txt += '    else \n'
454 <           txt += '       echo "output copied into $SE/$SE_PATH directory"\n'
455 <           txt += '    fi \n'
456 <           txt += '  done\n'
457 <           txt += 'fi \n'
438 >        if not self.copy_input_data: return txt
439 >
440 >        ## OLI_Daniele deactivate for OSG (wait for LCG UI installed on OSG)
441 >        txt += 'if [ $middleware == OSG ]; then\n'
442 >        txt += '   #\n'
443 >        txt += '   #   Copy Input Data from SE to this WN deactivated in OSG mode\n'
444 >        txt += '   #\n'
445 >        txt += '   echo "Copy Input Data from SE to this WN deactivated in OSG mode"\n'
446 >        txt += 'elif [ $middleware == LCG ]; then \n'
447 >        txt += '   #\n'
448 >        txt += '   #   Copy Input Data from SE to this WN\n'
449 >        txt += '   #\n'
450 >        ### changed by georgia (put a loop copying more than one input files per jobs)          
451 >        txt += '   for input_file in $cur_file_list \n'
452 >        txt += '   do \n'
453 >        txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$input_lfn/$input_file file:`pwd`/$input_file 2>&1\n'
454 >        txt += '      copy_input_exit_status=$?\n'
455 >        txt += '      echo "COPY_INPUT_EXIT_STATUS = $copy_input_exit_status"\n'
456 >        txt += '      if [ $copy_input_exit_status -ne 0 ]; then \n'
457 >        txt += '         echo "Problems with copying to WN" \n'
458 >        txt += '      else \n'
459 >        txt += '         echo "input copied into WN" \n'
460 >        txt += '      fi \n'
461 >        txt += '   done \n'
462 >        ### copy a set of PU ntuples (same for each jobs -- but accessed randomly)
463 >        txt += '   for file in $cur_pu_list \n'
464 >        txt += '   do \n'
465 >        txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$pu_lfn/$file file:`pwd`/$file 2>&1\n'
466 >        txt += '      copy_input_pu_exit_status=$?\n'
467 >        txt += '      echo "COPY_INPUT_PU_EXIT_STATUS = $copy_input_pu_exit_status"\n'
468 >        txt += '      if [ $copy_input_pu_exit_status -ne 0 ]; then \n'
469 >        txt += '         echo "Problems with copying pu to WN" \n'
470 >        txt += '      else \n'
471 >        txt += '         echo "input pu files copied into WN" \n'
472 >        txt += '      fi \n'
473 >        txt += '   done \n'
474 >        txt += '   \n'
475 >        txt += '   ### Check SCRATCH space available on WN : \n'
476 >        txt += '   df -h \n'
477 >        txt += 'fi \n'
478 >          
479          return txt
480  
481 <    def wsRegisterOutput(self):
481 >    def wsCopyOutput(self):
482          """
483 <        Returns part of a job script which does scheduler-specific work.
483 >        Write a CopyResults part of a job script, e.g.
484 >        to copy produced output into a storage element.
485          """
486 +        txt = '\n'
487  
488 <        txt = ''
489 <        if self.register_data:
490 <           txt += '#\n'
491 <           txt += '#  Register output to RLS\n'
492 <           txt += '#\n'
493 <           txt += 'if [[ $exe_result -eq 0 && $copy_exit_status -eq 0 ]]; then\n'
494 <           txt += '   for out_file in $file_list ; do\n'
495 <           txt += '      echo "Trying to register the output file into RLS"\n'
496 <           txt += '      echo "lcg-rf -l $LFN/$out_file --vo $VO sfn://$SE$SE_PATH/$out_file"\n'
497 <           txt += '      lcg-rf -l $LFN/$out_file --vo $VO sfn://$SE$SE_PATH/$out_file 2>&1 \n'
498 <           txt += '      register_exit_status=$?\n'
499 <           txt += '      echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
500 <           txt += '      echo "STAGE_OUT = $register_exit_status"\n'
501 <           txt += '      if [ $register_exit_status -ne 0 ]; then \n'
502 <           txt += '         echo "Problems with the registration to RLS" \n'
503 <           txt += '         echo "Try with srm protocol" \n'
504 <           txt += '         echo "lcg-rf -l $LFN/$out_file --vo $VO srm://$SE$SE_PATH/$out_file"\n'
505 <           txt += '         lcg-rf -l $LFN/$out_file --vo $VO srm://$SE$SE_PATH/$out_file 2>&1 \n'
506 <           txt += '         register_exit_status=$?\n'
507 <           txt += '         echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
508 <           txt += '         echo "STAGE_OUT = $register_exit_status"\n'
509 <           txt += '         if [ $register_exit_status -ne 0 ]; then \n'
510 <           txt += '            echo "Problems with the registration into RLS" \n'
511 <           txt += '         fi \n'
512 <           txt += '      else \n'
513 <           txt += '         echo "output registered to RLS"\n'
514 <           txt += '      fi \n'
515 <           txt += '   done\n'
516 <           txt += 'elif [[ $exe_result -eq 0 && $copy_exit_status -ne 0 ]]; then \n'
517 <           txt += '   echo "Trying to copy output file to CloseSE"\n'
518 <           txt += '   CLOSE_SE=`edg-brokerinfo getCloseSEs | head -1`\n'
519 <           txt += '   for out_file in $file_list ; do\n'
520 <           txt += '      echo "lcg-cr -v -l lfn:${LFN}/$out_file -d $CLOSE_SE -P $LFN/$out_file --vo $VO file://`pwd`/$out_file" \n'
521 <           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'
522 <           txt += '      register_exit_status=$?\n'
523 <           txt += '      echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
524 <           txt += '      echo "STAGE_OUT = $register_exit_status"\n'
525 <           txt += '      if [ $register_exit_status -ne 0 ]; then \n'
526 <           txt += '         echo "Problems with CloseSE" \n'
527 <           txt += '      else \n'
528 <           txt += '         echo "The program was successfully executed"\n'
529 <           txt += '         echo "SE = $CLOSE_SE"\n'
530 <           txt += '         echo "LFN for the file is LFN=${LFN}/$out_file"\n'
531 <           txt += '      fi \n'
532 <           txt += '   done\n'
533 <           txt += 'else\n'
534 <           txt += '   echo "Problem with the executable"\n'
535 <           txt += 'fi \n'
488 >        txt += '#\n'
489 >        txt += '# COPY OUTPUT FILE TO SE\n'
490 >        txt += '#\n\n'
491 >
492 >        SE_PATH=''
493 >        if int(self.copy_data) == 1:
494 >            if self.SE:
495 >                txt += 'export SE='+self.SE+'\n'
496 >                txt += 'echo "SE = $SE"\n'
497 >            if self.SE_PATH:
498 >                if ( self.SE_PATH[-1] != '/' ) : self.SE_PATH = self.SE_PATH + '/'
499 >                SE_PATH=self.SE_PATH
500 >            if int(self.publish_data) == 1:
501 >                txt += '### publish_data = 1 so the SE path where to copy the output is: \n'
502 >                path_add = self.UserGridName + '/' + self.publish_data_name +'_${PSETHASH}/'
503 >                SE_PATH = SE_PATH + path_add
504 >            txt += 'export SE_PATH='+SE_PATH+'\n'
505 >            txt += 'echo "SE_PATH = $SE_PATH"\n'
506 >            
507 >            txt += 'echo "####################################################"\n'
508 >            txt += 'echo "# Copy output files from WN = `hostname` to SE = $SE"\n'
509 >            txt += 'echo "####################################################"\n'
510 >            
511 >            txt += 'for out_file in $file_list ; do\n'
512 >            txt += '   echo "Trying to copy output file to $SE"\n'
513 >            txt += '   cmscp $out_file ${SE} ${SE_PATH} $out_file $middleware\n'
514 >            txt += '   copy_exit_status=$?\n'
515 >            txt += '   echo "COPY_EXIT_STATUS = $copy_exit_status"\n'
516 >            txt += '   echo "STAGE_OUT = $copy_exit_status"\n'
517 >            
518 >            txt += '   if [ $copy_exit_status -ne 0 ]; then\n'
519 >            txt += '       echo "Problem copying $out_file to $SE $SE_PATH"\n'
520 >            txt += '       echo "StageOutExitStatus = $copy_exit_status " | tee -a $RUNTIME_AREA/$repo\n'
521 >            txt += '       copy_exit_status=60307\n'
522 >            
523 >            txt += '   else\n'
524 >            txt += '       echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
525 >            txt += '       echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
526 >            txt += '       echo "output copied into $SE/$SE_PATH directory"\n'
527 >            txt += '       echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
528 >            txt += '    fi\n'
529 >            txt += 'done\n'
530 >            txt += 'if [ $copy_exit_status -ne 0 ]; then\n'
531 >            txt += '      SE=""\n'
532 >            txt += '      echo "SE = $SE"\n'
533 >            txt += '      SE_PATH=""\n'
534 >            txt += '      echo "SE_PATH = $SE_PATH"\n'
535 >            txt += 'fi\n'
536 >            txt += 'exit_status=$copy_exit_status\n'
537 >            pass
538          return txt
539  
540      def loggingInfo(self, id):
# Line 224 | Line 542 | class SchedulerEdg(Scheduler):
542          retrieve the logging info from logging and bookkeeping and return it
543          """
544          self.checkProxy()
227      #  id = common.jobDB.jobId(nj)
545          cmd = 'edg-job-get-logging-info -v 2 ' + id
229        cmd_out = os.popen(cmd)
230      #  cmd_out = runCommand(cmd)
231        return cmd_out
232
233    def listMatch(self, nj):
234        """
235        Check the compatibility of available resources
236        """
237        self.checkProxy()
238        jdl = common.job_list[nj].jdlFilename()
239        cmd = 'edg-job-list-match ' + self.configOpt_() + jdl
240        myCmd = os.popen(cmd)
241        cmd_out = myCmd.readlines()
242        myCmd.close()
243        return self.parseListMatch_(cmd_out, jdl)
244
245    def parseListMatch_(self, out, jdl):
246
247        reComment = re.compile( r'^\**$' )
248        reEmptyLine = re.compile( r'^$' )
249        reVO = re.compile( r'Selected Virtual Organisation name.*' )
250        reCE = re.compile( r'CEId' )
251        reNO = re.compile( r'No Computing Element matching' )
252        reRB = re.compile( r'Connecting to host' )
253        next = 0
254        CEs=[]
255        Match=0
256
257        for line in out:
258            line = line.strip()
259            if reComment.match( line ):
260                next = 0
261                continue
262            if reEmptyLine.match(line):
263                continue
264            if reVO.match( line ):
265                VO =line.split()[-1]
266                common.logger.debug(5, 'VO           :'+VO)
267                pass
268            if reRB.match( line ):
269                RB =line.split()[3]
270                common.logger.debug(5, 'Using RB     :'+RB)
271                pass
272            if reCE.search( line ):
273                next = 1
274                continue
275            if next:
276                CE=line.split(':')[0]
277                if (CEs.count(CE) > 0):
278                   pass
279                else:
280                   CEs.append(CE)  
281                   Match=Match+1
282                common.logger.debug(5, 'Matched CE   :'+CE)
283                pass
284            if reNO.match( line ):
285                common.logger.debug(5,line)
286                self.noMatchFound_(jdl)
287                Match=0
288                pass
289        return Match
290
291    def noMatchFound_(self, jdl):
292        reReq = re.compile( r'Requirements' )
293        reString = re.compile( r'"\S*"' )
294        f = file(jdl,'r')
295        for line in f.readlines():
296            line= line.strip()
297            if reReq.match(line):
298                for req in reString.findall(line):
299                    if re.search("VO",req):
300                        common.logger.message( "SW required: "+req)
301                        continue
302                    if re.search('"\d+',req):
303                        common.logger.message("Other req  : "+req)
304                        continue
305                    common.logger.message( "CE required: "+req)
306                break
307            pass
308        raise CrabException("No compatible resources found!")
309
310    def submit(self, nj):
311        """
312        Submit one EDG job.
313        """
314
315        self.checkProxy()
316        jid = None
317        jdl = common.job_list[nj].jdlFilename()
318
319        cmd = 'edg-job-submit ' + self.configOpt_() + jdl
546          cmd_out = runCommand(cmd)
547 <        if cmd_out != None:
322 <            reSid = re.compile( r'https.+' )
323 <            jid = reSid.search(cmd_out).group()
324 <            pass
325 <        return jid
326 <
327 <    def getExitStatus(self, id):
328 <        return self.getStatusAttribute_(id, 'exit_code')
329 <
330 <    def queryStatus(self, id):
331 <        return self.getStatusAttribute_(id, 'status')
332 <
333 <    def queryDest(self, id):  
334 <        return self.getStatusAttribute_(id, 'destination')
335 <
336 <
337 <    def getStatusAttribute_(self, id, attr):
338 <        """ Query a status of the job with id """
339 <
340 <        self.checkProxy()
341 <        hstates = {}
342 <        Status = importName('edg_wl_userinterface_common_LbWrapper', 'Status')
343 <        # Bypass edg-job-status interfacing directly to C++ API
344 <        # Job attribute vector to retrieve status without edg-job-status
345 <        level = 0
346 <        # Instance of the Status class provided by LB API
347 <        jobStat = Status()
348 <        st = 0
349 <        jobStat.getStatus(id, level)
350 <        err, apiMsg = jobStat.get_error()
351 <        if err:
352 <            #print 'Error caught', apiMsg
353 <            #common.log.message(apiMsg)
354 <            common.logger.debug(5,'Error caught' + apiMsg)
355 <            return None
356 <        else:
357 <            for i in range(len(self.states)):
358 <                # Fill an hash table with all information retrieved from LB API
359 <                hstates[ self.states[i] ] = jobStat.loadStatus(st)[i]
360 <            result = jobStat.loadStatus(st)[ self.states.index(attr) ]
361 <            return result
547 >        return cmd_out
548  
549      def queryDetailedStatus(self, id):
550          """ Query a detailed status of the job with id """
# Line 366 | Line 552 | class SchedulerEdg(Scheduler):
552          cmd_out = runCommand(cmd)
553          return cmd_out
554  
555 <    def getOutput(self, id):
556 <        """
371 <        Get output for a finished job with id.
372 <        Returns the name of directory with results.
373 <        """
555 >    def findSites_(self, n):
556 >        itr4 =[]
557  
558 <        self.checkProxy()
376 <        cmd = 'edg-job-get-output --dir ' + common.work_space.resDir() + ' ' + id
377 <        cmd_out = runCommand(cmd)
558 >        sites = common.jobDB.destination(n)
559  
560 <        # Determine the output directory name
561 <        dir = common.work_space.resDir()
381 <        dir += os.getlogin()
382 <        dir += '_' + os.path.basename(id)
383 <        return dir
560 >        if len(sites)>0 and sites[0]=="":
561 >            return itr4
562  
563 <    def cancel(self, id):
564 <        """ Cancel the EDG job with id """
565 <        self.checkProxy()
566 <        cmd = 'edg-job-cancel --noint ' + id
567 <        cmd_out = runCommand(cmd)
568 <        return cmd_out
563 >        itr = ''
564 >        if sites != [""]:#CarlosDaniele
565 >            ##Addedd Daniele
566 >            replicas = self.blackWhiteListParser.checkBlackList(sites,n)
567 >            if len(replicas)!=0:
568 >                replicas = self.blackWhiteListParser.checkWhiteList(replicas,n)
569 >              
570 >            if len(replicas)==0:
571 >                msg = 'No sites remaining that host any part of the requested data! Exiting... '
572 >                raise CrabException(msg)
573 >            #####        
574 >           # for site in sites:
575 >            for site in replicas:
576 >                #itr = itr + 'target.GlueSEUniqueID==&quot;'+site+'&quot; || '
577 >                itr = itr + 'target.GlueSEUniqueID=="'+site+'" || '
578 >            itr = itr[0:-4]
579 >            itr4.append( itr )
580 >        return itr4
581  
582 <    def createSchScript(self, nj):
582 >    def createXMLSchScript(self, nj, argsList):
583 >      
584          """
585 <        Create a JDL-file for EDG.
585 >        Create a XML-file for BOSS4.
586          """
587 <
588 <        job = common.job_list[nj]
587 >  #      job = common.job_list[nj]
588 >        """
589 >        INDY
590 >        [begin] FIX-ME:
591 >        I would pass jobType instead of job
592 >        """
593 >        index = nj - 1
594 >        job = common.job_list[index]
595          jbt = job.type()
399        inp_sandbox = jbt.inputSandbox(nj)
400        out_sandbox = jbt.outputSandbox(nj)
401        inp_storage_subdir = ''
596          
597 <        title = '# This JDL was generated by '+\
598 <                common.prog_name+' (version '+common.prog_version_str+')\n'
599 <        jt_string = ''
597 >        inp_sandbox = jbt.inputSandbox(index)
598 >        #out_sandbox = jbt.outputSandbox(index)
599 >        """
600 >        [end] FIX-ME
601 >        """
602  
603 +        
604 +        title = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'
605 +        jt_string = ''
606 +        
607 +        xml_fname = str(self.jobtypeName)+'.xml'
608 +        xml = open(common.work_space.shareDir()+'/'+xml_fname, 'a')
609  
610 +        #TaskName  
611 +        dir = string.split(common.work_space.topDir(), '/')
612 +        taskName = dir[len(dir)-2]
613 +  
614 +        to_write = ''
615 +
616 +        req=' '
617 +        req = req + jbt.getRequirements()
618 +
619 +        if self.EDG_requirements:
620 +            if (req == ' '):
621 +                req = req + self.EDG_requirements
622 +            else:
623 +                req = req +  ' && ' + self.EDG_requirements
624 +        if self.EDG_ce_white_list:
625 +            ce_white_list = string.split(self.EDG_ce_white_list,',')
626 +            for i in range(len(ce_white_list)):
627 +                if i == 0:
628 +                    if (req == ' '):
629 +                        req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
630 +                    else:
631 +                        req = req +  ' && ((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
632 +                    pass
633 +                else:
634 +                    req = req +  ' || (RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
635 +            req = req + ')'
636          
637 <        SPL = inp_storage_subdir
638 <        if ( SPL and SPL[-1] != '/' ) : SPL = SPL + '/'
637 >        if self.EDG_ce_black_list:
638 >            ce_black_list = string.split(self.EDG_ce_black_list,',')
639 >            for ce in ce_black_list:
640 >                if (req == ' '):
641 >                    req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
642 >                else:
643 >                    req = req +  ' && (!RegExp("' + ce + '", other.GlueCEUniqueId))'
644 >                pass
645 >        if self.EDG_clock_time:
646 >            if (req == ' '):
647 >                req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
648 >            else:
649 >                req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
650  
651 <        jdl_fname = job.jdlFilename()
652 <        jdl = open(jdl_fname, 'w')
653 <        jdl.write(title)
651 >        if self.EDG_cpu_time:
652 >            if (req == ' '):
653 >                req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
654 >            else:
655 >                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
656 >                                                                                          
657 >        if ( self.EDG_retry_count ):              
658 >            to_write = to_write + 'RetryCount = "'+self.EDG_retry_count+'"\n'
659 >            pass
660  
661 <        script = job.scriptFilename()
662 <        jdl.write('Executable = "' + os.path.basename(script) +'";\n')
663 <        jdl.write(jt_string)
661 >        if ( self.EDG_shallow_retry_count ):              
662 >            to_write = to_write + 'ShallowRetryCount = "'+self.EDG_shallow_retry_count+'"\n'
663 >            pass
664  
665 <        ### only one .sh  JDL has arguments:
666 <        firstEvent = common.jobDB.firstEvent(nj)
422 <        maxEvents = common.jobDB.maxEvents(nj)
423 <        jdl.write('Arguments = "' + str(nj+1)+' '+str(firstEvent)+' '+str(maxEvents)+'";\n')
665 >        to_write = to_write + 'MyProxyServer = "&quot;' + self.proxyServer + '&quot;"\n'
666 >        to_write = to_write + 'VirtualOrganisation = "&quot;' + self.VO + '&quot;"\n'
667  
668 <        inp_box = 'InputSandbox = { '
669 <        inp_box = inp_box + '"' + script + '",'
668 >        #TaskName  
669 >        dir = string.split(common.work_space.topDir(), '/')
670 >        taskName = dir[len(dir)-2]
671 >
672 >        xml.write(str(title))
673 >        #xml.write('<task name="' +str(taskName)+'" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache">\n')
674 >
675 >        #xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + '" task_info="' + os.path.expandvars('X509_USER_PROXY') + '">\n')
676 >        x509_cmd = 'ls /tmp/x509up_u`id -u`'
677 >        x509=runCommand(x509_cmd).strip()
678 >        xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + ' task_info="' + str(x509) + '">\n')
679 >        xml.write(jt_string)
680 >        
681 >        if (to_write != ''):
682 >            xml.write('<extraTags\n')
683 >            xml.write(to_write)
684 >            xml.write('/>\n')
685 >            pass
686 >
687 >        xml.write('<iterator>\n')
688 >        xml.write('\t<iteratorRule name="ITR1">\n')
689 >        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ' </ruleElement>\n')
690 >        xml.write('\t</iteratorRule>\n')
691 >        xml.write('\t<iteratorRule name="ITR2">\n')
692 >        for arg in argsList:
693 >            xml.write('\t\t<ruleElement> <![CDATA[\n'+ arg + '\n\t\t]]> </ruleElement>\n')
694 >            pass
695 >        xml.write('\t</iteratorRule>\n')
696 >        #print jobList
697 >        xml.write('\t<iteratorRule name="ITR3">\n')
698 >        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ':1:6 </ruleElement>\n')
699 >        xml.write('\t</iteratorRule>\n')
700 >
701 >        '''
702 >        indy: here itr4
703 >        '''
704 >        
705 >        xml.write('<chain name="' +str(taskName)+'__ITR1_" scheduler="'+str(self.schedulerName)+'">\n')
706 >       # xml.write('<chain scheduler="'+str(self.schedulerName)+'">\n')
707 >        xml.write(jt_string)
708 >
709 >        #executable
710 >
711 >        """
712 >        INDY
713 >        script depends on jobType: it should be probably get in a different way
714 >        """        
715 >        script = job.scriptFilename()
716 >        xml.write('<program>\n')
717 >        xml.write('<exec> ' + os.path.basename(script) +' </exec>\n')
718 >        xml.write(jt_string)
719 >
720 >        xml.write('<args> <![CDATA[\n _ITR2_ \n]]> </args>\n')
721 >        xml.write('<program_types> crabjob </program_types>\n')
722 >        inp_box = common.work_space.pathForTgz() + 'job/' + jbt.scriptName + ','
723  
724          if inp_sandbox != None:
725              for fl in inp_sandbox:
726 <                inp_box = inp_box + ' "' + fl + '",'
726 >                inp_box = inp_box + '' + fl + ','
727                  pass
728              pass
729  
730 <        #if common.use_jam:
731 <        #   inp_box = inp_box+' "'+common.bin_dir+'/'+common.run_jam+'",'
732 <
733 <        for addFile in jbt.additional_inbox_files:
734 <            addFile = os.path.abspath(addFile)
735 <            inp_box = inp_box+' "'+addFile+'",'
440 <            pass
730 > #        if (not jbt.additional_inbox_files == []):
731 > #            inp_box = inp_box + ','
732 > #            for addFile in jbt.additional_inbox_files:
733 > #                #addFile = os.path.abspath(addFile)
734 > #                inp_box = inp_box+''+addFile+','
735 > #                pass
736  
737          if inp_box[-1] == ',' : inp_box = inp_box[:-1]
738 <        inp_box = inp_box + ' };\n'
739 <        jdl.write(inp_box)
445 <
446 <        jdl.write('StdOutput     = "' + job.stdout() + '";\n')
447 <        jdl.write('StdError      = "' + job.stderr() + '";\n')
738 >        inp_box = '<infiles> <![CDATA[\n' + inp_box + '\n]]> </infiles>\n'
739 >        xml.write(inp_box)
740          
741 +        base = jbt.name()
742 +        stdout = base + '__ITR3_.stdout'
743 +        stderr = base + '__ITR3_.stderr'
744 +        
745 +        xml.write('<stderr> ' + stderr + '</stderr>\n')
746 +        xml.write('<stdout> ' + stdout + '</stdout>\n')
747          
450        if job.stdout() == job.stderr():
451          out_box = 'OutputSandbox = { "' + \
452                    job.stdout() + '", ".BrokerInfo",'
453        else:
454          out_box = 'OutputSandbox = { "' + \
455                    job.stdout() + '", "' + \
456                    job.stderr() + '", ".BrokerInfo",'
748  
749 <        if self.return_data :
749 >        out_box = stdout + ',' + \
750 >                  stderr + ',.BrokerInfo,'
751 >
752 >        """
753 >        if int(self.return_data) == 1:
754              if out_sandbox != None:
755                  for fl in out_sandbox:
756 <                    out_box = out_box + ' "' + fl + '",'
756 >                    out_box = out_box + '' + fl + ','
757                      pass
758                  pass
759              pass
760 <                                                                                                                                                            
760 >        """
761 >
762 >        """
763 >        INDY
764 >        something similar should be also done for infiles (if it makes sense!)
765 >        """
766 >        # Stuff to be returned _always_ via sandbox
767 >        for fl in jbt.output_file_sandbox:
768 >            out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
769 >            pass
770 >        pass
771 >
772 >        # via sandbox iif required return_data
773 >        if int(self.return_data) == 1:
774 >            for fl in jbt.output_file:
775 >                out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
776 >                pass
777 >            pass
778 >
779          if out_box[-1] == ',' : out_box = out_box[:-1]
780 <        out_box = out_box + ' };'
781 <        jdl.write(out_box+'\n')
780 >        out_box = '<outfiles> <![CDATA[\n' + out_box + '\n]]></outfiles>\n'
781 >        xml.write(out_box)
782 >
783 >        xml.write('<BossAttr> crabjob.INTERNAL_ID=_ITR1_ </BossAttr>\n')
784  
785 <        ### if at least a CE exists ...
786 <        if common.analisys_common_info['sites']:
472 <            if common.analisys_common_info['sw_version']:
473 <                req='Requirements = '
474 <                req=req + 'Member("VO-cms-' + \
475 <                     common.analisys_common_info['sw_version'] + \
476 <                     '", other.GlueHostApplicationSoftwareRunTimeEnvironment)'
477 <            if len(common.analisys_common_info['sites'])>0:
478 <                req = req + ' && ('
479 <                for i in range(len(common.analisys_common_info['sites'])):
480 <                    req = req + 'other.GlueCEInfoHostName == "' \
481 <                         + common.analisys_common_info['sites'][i] + '"'
482 <                    if ( i < (int(len(common.analisys_common_info['sites']) - 1)) ):
483 <                        req = req + ' || '
484 <            req = req + ')'
785 >        xml.write('</program>\n')
786 >        xml.write('</chain>\n')
787  
788 <            #### and USER REQUIREMENT
789 <            if self.EDG_requirements:
488 <                req = req +  ' && ' + self.EDG_requirements
489 <            if self.EDG_clock_time:
490 <                req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
491 <            if self.EDG_cpu_time:
492 <                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
493 <            req = req + ';\n'
494 <            jdl.write(req)
495 <                                                                                                                                                            
496 <        jdl.write('VirtualOrganisation = "' + self.VO + '";\n')
788 >        xml.write('</iterator>\n')
789 >        xml.write('</task>\n')
790  
791 <        if ( self.EDG_retry_count ):              
792 <            jdl.write('RetryCount = '+self.EDG_retry_count+';\n')
500 <            pass
791 >        xml.close()
792 >      
793  
502        jdl.close()
794          return
795  
796      def checkProxy(self):
# Line 507 | Line 798 | class SchedulerEdg(Scheduler):
798          Function to check the Globus proxy.
799          """
800          if (self.proxyValid): return
801 <        timeleft = -999
802 <        minTimeLeft=10 # in hours
803 <        cmd = 'grid-proxy-info -e -v '+str(minTimeLeft)+':00'
804 <        try: cmd_out = runCommand(cmd,0)
805 <        except: print cmd_out
806 <        if (cmd_out == None or cmd_out=='1'):
807 <            common.logger.message( "No valid proxy found or timeleft too short!\n Creating a user proxy with default length of 100h\n")
808 <            cmd = 'grid-proxy-init -valid 100:00'
801 >
802 >        ### Just return if asked to do so
803 >        if (self.dontCheckProxy==1):
804 >            self.proxyValid=1
805 >            return
806 >
807 >        minTimeLeft=10*3600 # in seconds
808 >
809 >        minTimeLeftServer = 100 # in hours
810 >
811 >        mustRenew = 0
812 >        timeLeftLocal = runCommand('voms-proxy-info -timeleft 2>/dev/null')
813 >        timeLeftServer = -999
814 >        if not timeLeftLocal or int(timeLeftLocal) <= 0 or not isInt(timeLeftLocal):
815 >            mustRenew = 1
816 >        else:
817 >            timeLeftServer = runCommand('voms-proxy-info -actimeleft 2>/dev/null | head -1')
818 >            if not timeLeftServer or not isInt(timeLeftServer):
819 >                mustRenew = 1
820 >            elif timeLeftLocal<minTimeLeft or timeLeftServer<minTimeLeft:
821 >                mustRenew = 1
822 >            pass
823 >        pass
824 >
825 >        if mustRenew:
826 >            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")
827 >            cmd = 'voms-proxy-init -voms '+self.VO
828 >            if self.group:
829 >                cmd += ':/'+self.VO+'/'+self.group
830 >            if self.role:
831 >                cmd += '/role='+self.role
832 >            cmd += ' -valid 192:00'
833              try:
834 +                # SL as above: damn it!
835 +                common.logger.debug(10,cmd)
836                  out = os.system(cmd)
837                  if (out>0): raise CrabException("Unable to create a valid proxy!\n")
838              except:
839                  msg = "Unable to create a valid proxy!\n"
840                  raise CrabException(msg)
524            cmd = 'grid-proxy-info -timeleft'
525            cmd_out = runCommand(cmd,0)
526            #print cmd_out, time.time()
527            #time.time(cms_out)
841              pass
842 +
843 +        ## now I do have a voms proxy valid, and I check the myproxy server
844 +        renewProxy = 0
845 +        cmd = 'myproxy-info -d -s '+self.proxyServer
846 +        cmd_out = runCommand(cmd,0,20)
847 +        if not cmd_out:
848 +            common.logger.message('No credential delegated to myproxy server '+self.proxyServer+' will do now')
849 +            renewProxy = 1
850 +        else:
851 +            # if myproxy exist but not long enough, renew
852 +            reTime = re.compile( r'timeleft: (\d+)' )
853 +            #print "<"+str(reTime.search( cmd_out ).group(1))+">"
854 +            if reTime.match( cmd_out ):
855 +                time = reTime.search( cmd_out ).group(1)
856 +                if time < minTimeLeftServer:
857 +                    renewProxy = 1
858 +                    common.logger.message('No credential delegation will expire in '+time+' hours: renew it')
859 +                pass
860 +            pass
861 +        
862 +        # if not, create one.
863 +        if renewProxy:
864 +            cmd = 'myproxy-init -d -n -s '+self.proxyServer
865 +            out = os.system(cmd)
866 +            if (out>0):
867 +                raise CrabException("Unable to delegate the proxy to myproxyserver "+self.proxyServer+" !\n")
868 +            pass
869 +
870 +        # cache proxy validity
871          self.proxyValid=1
872          return
873 <    
873 >
874      def configOpt_(self):
875          edg_ui_cfg_opt = ' '
876          if self.edg_config:
877 <          edg_ui_cfg_opt = ' -c ' + self.edg_config + ' '
877 >            edg_ui_cfg_opt = ' -c ' + self.edg_config + ' '
878          if self.edg_config_vo:
879 <          edg_ui_cfg_opt += ' --config-vo ' + self.edg_config_vo + ' '
879 >            edg_ui_cfg_opt += ' --config-vo ' + self.edg_config_vo + ' '
880          return edg_ui_cfg_opt
881 +
882 +    def submitTout(self, list):
883 +        return 120
884 +
885 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines