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.19 by slacapra, Tue Oct 18 14:11:12 2005 UTC vs.
Revision 1.107 by corvo, Mon Dec 4 11:11:35 2006 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   import common
7  
8 < import os, sys, time
8 > import os, sys, time, gzip
9  
10   class SchedulerEdg(Scheduler):
11      def __init__(self):
# Line 17 | Line 18 | class SchedulerEdg(Scheduler):
18                        "owner","parent_job", "reason","resubmitted","rsl","seed",\
19                        "stateEnterTime","stateEnterTimes","subjob_failed", \
20                        "user tags" , "status" , "status_code","hierarchy"]
21 +        
22          return
23  
24      def configure(self, cfg_params):
25  
26 <        try: self.edg_config = cfg_params["EDG.config"]
27 <        except KeyError: self.edg_config = ''
28 <
29 <        try: self.edg_config_vo = cfg_params["EDG.config_vo"]
30 <        except KeyError: self.edg_config_vo = ''
26 >        try:
27 >            RB=cfg_params["EDG.rb"]
28 >            self.rb_param_file=self.rb_configure(RB)
29 >        except KeyError:
30 >            self.rb_param_file=''
31 >            pass
32 >        try:
33 >            self.proxyServer = cfg_params["EDG.proxy_server"]
34 >        except KeyError:
35 >            self.proxyServer = 'myproxy.cern.ch'
36 >        common.logger.debug(5,'Setting myproxy server to '+self.proxyServer)
37  
38 +        try:
39 +            self.group = cfg_params["EDG.group"]
40 +        except KeyError:
41 +            self.group = None
42 +            
43 +        try:
44 +            self.role = cfg_params["EDG.role"]
45 +        except KeyError:
46 +            self.role = None
47 +            
48          try: self.LCG_version = cfg_params["EDG.lcg_version"]
49          except KeyError: self.LCG_version = '2'
50  
51 <        try: self.EDG_requirements = cfg_params['EDG.requirements']
52 <        except KeyError: self.EDG_requirements = ''
51 >        try:
52 >            self.EDG_ce_black_list = cfg_params['EDG.ce_black_list']
53 >        except KeyError:
54 >            self.EDG_ce_black_list  = ''
55  
56 <        try: self.EDG_retry_count = cfg_params['EDG.retry_count']
57 <        except KeyError: self.EDG_retry_count = ''
56 >        try:
57 >            self.EDG_ce_white_list = cfg_params['EDG.ce_white_list']
58 >        except KeyError: self.EDG_ce_white_list = ''
59  
60          try: self.VO = cfg_params['EDG.virtual_organization']
61          except KeyError: self.VO = 'cms'
62  
63 +        try: self.copy_input_data = cfg_params["USER.copy_input_data"]
64 +        except KeyError: self.copy_input_data = 0
65 +
66          try: self.return_data = cfg_params['USER.return_data']
67 <        except KeyError: self.return_data = ''
67 >        except KeyError: self.return_data = 0
68  
69          try:
70              self.copy_data = cfg_params["USER.copy_data"]
71 <            try:
72 <                self.SE = cfg_params['USER.storage_element']
73 <                self.SE_PATH = cfg_params['USER.storage_path']
74 <            except KeyError:
75 <                msg = "Error. The [USER] section does not have 'storage_element'"
76 <                msg = msg + " and/or 'storage_path' entries, necessary to copy the output"
77 <                common.logger.message(msg)
78 <                raise CrabException(msg)
79 <        except KeyError: self.copy_data = ''
71 >            if int(self.copy_data) == 1:
72 >                try:
73 >                    self.SE = cfg_params['USER.storage_element']
74 >                    self.SE_PATH = cfg_params['USER.storage_path']
75 >                except KeyError:
76 >                    msg = "Error. The [USER] section does not have 'storage_element'"
77 >                    msg = msg + " and/or 'storage_path' entries, necessary to copy the output"
78 >                    common.logger.message(msg)
79 >                    raise CrabException(msg)
80 >        except KeyError: self.copy_data = 0
81 >
82 >        if ( int(self.return_data) == 0 and int(self.copy_data) == 0 ):
83 >           msg = 'Warning: return_data = 0 and copy_data = 0 ==> your exe output will be lost\n'
84 >           msg = msg + 'Please modify return_data and copy_data value in your crab.cfg file\n'
85 >           raise CrabException(msg)
86  
87 +        try:
88 +            self.lfc_host = cfg_params['EDG.lfc_host']
89 +        except KeyError:
90 +            msg = "Error. The [EDG] section does not have 'lfc_host' value"
91 +            msg = msg + " it's necessary to know the LFC host name"
92 +            common.logger.message(msg)
93 +            raise CrabException(msg)
94 +        try:
95 +            self.lcg_catalog_type = cfg_params['EDG.lcg_catalog_type']
96 +        except KeyError:
97 +            msg = "Error. The [EDG] section does not have 'lcg_catalog_type' value"
98 +            msg = msg + " it's necessary to know the catalog type"
99 +            common.logger.message(msg)
100 +            raise CrabException(msg)
101 +        try:
102 +            self.lfc_home = cfg_params['EDG.lfc_home']
103 +        except KeyError:
104 +            msg = "Error. The [EDG] section does not have 'lfc_home' value"
105 +            msg = msg + " it's necessary to know the home catalog dir"
106 +            common.logger.message(msg)
107 +            raise CrabException(msg)
108 +      
109          try:
110              self.register_data = cfg_params["USER.register_data"]
111 <            try:
112 <                 self.LFN = cfg_params['USER.lfn_dir']
113 <            except KeyError:
114 <                msg = "Error. The [USER] section does not have 'lfn_dir' value"
115 <                msg = msg + " it's necessary for RLS registration"
116 <                common.logger.message(msg)
117 <                raise CrabException(msg)
118 <        except KeyError: self.register_data= ''
111 >            if int(self.register_data) == 1:
112 >                try:
113 >                    self.LFN = cfg_params['USER.lfn_dir']
114 >                except KeyError:
115 >                    msg = "Error. The [USER] section does not have 'lfn_dir' value"
116 >                    msg = msg + " it's necessary for LCF registration"
117 >                    common.logger.message(msg)
118 >                    raise CrabException(msg)
119 >        except KeyError: self.register_data = 0
120 >
121 >        if ( int(self.copy_data) == 0 and int(self.register_data) == 1 ):
122 >           msg = 'Warning: register_data = 1 must be used with copy_data = 1\n'
123 >           msg = msg + 'Please modify copy_data value in your crab.cfg file\n'
124 >           common.logger.message(msg)
125 >           raise CrabException(msg)
126  
127          try: self.EDG_requirements = cfg_params['EDG.requirements']
128          except KeyError: self.EDG_requirements = ''
129 <                                                                                                                                                            
129 >
130 >        try: self.EDG_addJdlParam = string.split(cfg_params['EDG.additional_jdl_parameters'],',')
131 >        except KeyError: self.EDG_addJdlParam = []
132 >
133          try: self.EDG_retry_count = cfg_params['EDG.retry_count']
134          except KeyError: self.EDG_retry_count = ''
135 <                                                                                                                                                            
135 >
136 >        try: self.EDG_shallow_retry_count= cfg_params['EDG.shallow_retry_count']
137 >        except KeyError: self.EDG_shallow_retry_count = ''
138 >
139          try: self.EDG_clock_time = cfg_params['EDG.max_wall_clock_time']
140          except KeyError: self.EDG_clock_time= ''
141 <                                                                                                                                                            
141 >
142          try: self.EDG_cpu_time = cfg_params['EDG.max_cpu_time']
143          except KeyError: self.EDG_cpu_time = ''
144  
# Line 91 | Line 156 | class SchedulerEdg(Scheduler):
156          sys.path.append(libPath)
157  
158          self.proxyValid=0
159 +
160 +        try:
161 +            self._taskId = cfg_params['taskId']
162 +        except:
163 +            self._taskId = ''
164 +
165 +        try: self.jobtypeName = cfg_params['CRAB.jobtype']
166 +        except KeyError: self.jobtypeName = ''
167 +
168 +        try: self.schedulerName = cfg_params['CRAB.scheduler']
169 +        except KeyError: self.scheduler = ''
170 +
171 +        try: self.dontCheckProxy=cfg_params["EDG.dont_check_proxy"]
172 +        except KeyError: self.dontCheckProxy = 0
173 +
174          return
175      
176  
177 +    def rb_configure(self, RB):
178 +        self.edg_config = ''
179 +        self.edg_config_vo = ''
180 +        self.rb_param_file = ''
181 +
182 +        edgConfig = EdgConfig(RB)
183 +        self.edg_config = edgConfig.config()
184 +        self.edg_config_vo = edgConfig.configVO()
185 +
186 +        if (self.edg_config and self.edg_config_vo != ''):
187 +            self.rb_param_file = 'RBconfig = "'+self.edg_config+'";\nRBconfigVO = "'+self.edg_config_vo+'";'
188 +            #print "rb_param_file = ", self.rb_param_file
189 +        return self.rb_param_file
190 +      
191 +
192      def sched_parameter(self):
193          """
194 <        Returns file with scheduler-specific parameters
194 >        Returns file with requirements and scheduler-specific parameters
195          """
196 <      
197 <        if (self.edg_config and self.edg_config_vo != ''):
198 <            self.param='sched_param.clad'
196 >        index = int(common.jobDB.nJobs()) - 1
197 >        job = common.job_list[index]
198 >        jbt = job.type()
199 >        
200 >        lastBlock=-1
201 >        first = []
202 >        for n in range(common.jobDB.nJobs()):
203 >            currBlock=common.jobDB.block(n)
204 >            if (currBlock!=lastBlock):
205 >                lastBlock = currBlock
206 >                first.append(n)
207 >  
208 >        req = ''
209 >        req = req + jbt.getRequirements()
210 >    
211 >        if self.EDG_requirements:
212 >            if (req == ' '):
213 >                req = req + self.EDG_requirements
214 >            else:
215 >                req = req +  ' && ' + self.EDG_requirements
216 >
217 >        if self.EDG_ce_white_list:
218 >            ce_white_list = string.split(self.EDG_ce_white_list,',')
219 >            for i in range(len(ce_white_list)):
220 >                if i == 0:
221 >                    if (req == ' '):
222 >                        req = req + '((RegExp("' + string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
223 >                    else:
224 >                        req = req +  ' && ((RegExp("' +  string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
225 >                    pass
226 >                else:
227 >                    req = req +  ' || (RegExp("' +  string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
228 >            req = req + ')'
229 >        
230 >        if self.EDG_ce_black_list:
231 >            ce_black_list = string.split(self.EDG_ce_black_list,',')
232 >            for ce in ce_black_list:
233 >                if (req == ' '):
234 >                    req = req + '(!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))'
235 >                else:
236 >                    req = req +  ' && (!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))'
237 >                pass
238 >        if self.EDG_clock_time:
239 >            if (req == ' '):
240 >                req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
241 >            else:
242 >                req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
243 >
244 >        if self.EDG_cpu_time:
245 >            if (req == ' '):
246 >                req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
247 >            else:
248 >                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
249 >                
250 >        for i in range(len(first)): # Add loop DS
251 >            self.param='sched_param_'+str(i)+'.clad'
252              param_file = open(common.work_space.shareDir()+'/'+self.param, 'w')
253 <            param_file.write('RBconfig = "'+self.edg_config+'";\n')  
254 <            param_file.write('RBconfigVO = "'+self.edg_config_vo+'";')
253 >
254 >            itr4=self.findSites_(first[i])
255 >            for arg in itr4:
256 >                req = req + ' && anyMatch(other.storage.CloseSEs, ('+str(arg)+'))'
257 >            param_file.write('Requirements = '+req +';\n')  
258 >  
259 >            if (self.rb_param_file != ''):
260 >                param_file.write(self.rb_param_file)  
261 >
262 >            if len(self.EDG_addJdlParam):
263 >                for p in self.EDG_addJdlParam:
264 >                    param_file.write(p)
265 >
266              param_file.close()  
267 <            return 1
109 <        else:
110 <            return 0
267 >
268  
269      def wsSetupEnvironment(self):
270          """
271          Returns part of a job script which does scheduler-specific work.
272          """
116
273          txt = ''
274 <        if self.copy_data:
274 >        txt += '# strip arguments\n'
275 >        txt += 'echo "strip arguments"\n'
276 >        txt += 'args=("$@")\n'
277 >        txt += 'nargs=$#\n'
278 >        txt += 'shift $nargs\n'
279 >        txt += "# job number (first parameter for job wrapper)\n"
280 >        #txt += "NJob=$1\n"
281 >        txt += "NJob=${args[0]}\n"
282 >
283 >        txt += '# job identification to DashBoard \n'
284 >        txt += 'MonitorJobID=`echo ${NJob}_$EDG_WL_JOBID`\n'
285 >        txt += 'SyncGridJobId=`echo $EDG_WL_JOBID`\n'
286 >        txt += 'MonitorID=`echo ' + self._taskId + '`\n'
287 >        txt += 'echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
288 >        txt += 'echo "SyncGridJobId=`echo $SyncGridJobId`" | tee -a $RUNTIME_AREA/$repo \n'
289 >        txt += 'echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
290 >
291 >        txt += 'echo "middleware discovery " \n'
292 >        txt += 'if [ $GRID3_APP_DIR ]; then\n'
293 >        txt += '    middleware=OSG \n'
294 >        txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
295 >        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
296 >        txt += '    echo "middleware =$middleware" \n'
297 >        txt += 'elif [ $OSG_APP ]; then \n'
298 >        txt += '    middleware=OSG \n'
299 >        txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
300 >        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
301 >        txt += '    echo "middleware =$middleware" \n'
302 >        txt += 'elif [ $VO_CMS_SW_DIR ]; then \n'
303 >        txt += '    middleware=LCG \n'
304 >        txt += '    echo "SyncCE=`edg-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
305 >        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
306 >        txt += '    echo "middleware =$middleware" \n'
307 >        txt += 'else \n'
308 >        txt += '    echo "SET_CMS_ENV 10030 ==> middleware not identified" \n'
309 >        txt += '    echo "JOB_EXIT_STATUS = 10030" \n'
310 >        txt += '    echo "JobExitCode=10030" | tee -a $RUNTIME_AREA/$repo \n'
311 >        txt += '    dumpStatus $RUNTIME_AREA/$repo \n'
312 >        txt += '    rm -f $RUNTIME_AREA/$repo \n'
313 >        txt += '    echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
314 >        txt += '    echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
315 >        txt += '    exit 1 \n'
316 >        txt += 'fi \n'
317 >
318 >        txt += '# report first time to DashBoard \n'
319 >        txt += 'dumpStatus $RUNTIME_AREA/$repo \n'
320 >        txt += 'rm -f $RUNTIME_AREA/$repo \n'
321 >        txt += 'echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
322 >        txt += 'echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
323 >        
324 >        txt += '\n\n'
325 >
326 >        if int(self.copy_data) == 1:
327             if self.SE:
328                txt += 'export SE='+self.SE+'\n'
329                txt += 'echo "SE = $SE"\n'
# Line 123 | Line 331 | class SchedulerEdg(Scheduler):
331                if ( self.SE_PATH[-1] != '/' ) : self.SE_PATH = self.SE_PATH + '/'
332                txt += 'export SE_PATH='+self.SE_PATH+'\n'
333                txt += 'echo "SE_PATH = $SE_PATH"\n'
334 <                                                                                                                                                            
335 <        if self.register_data:
334 >
335 >        txt += 'export VO='+self.VO+'\n'
336 >        ### add some line for LFC catalog setting
337 >        txt += 'if [ $middleware == LCG ]; then \n'
338 >        txt += '    if [[ $LCG_CATALOG_TYPE != \''+self.lcg_catalog_type+'\' ]]; then\n'
339 >        txt += '        export LCG_CATALOG_TYPE='+self.lcg_catalog_type+'\n'
340 >        txt += '    fi\n'
341 >        txt += '    if [[ $LFC_HOST != \''+self.lfc_host+'\' ]]; then\n'
342 >        txt += '        export LFC_HOST='+self.lfc_host+'\n'
343 >        txt += '    fi\n'
344 >        txt += '    if [[ $LFC_HOME != \''+self.lfc_home+'\' ]]; then\n'
345 >        txt += '        export LFC_HOME='+self.lfc_home+'\n'
346 >        txt += '    fi\n'
347 >        txt += 'elif [ $middleware == OSG ]; then\n'
348 >        txt += '    echo "LFC catalog setting to be implemented for OSG"\n'
349 >        txt += 'fi\n'
350 >        #####
351 >        if int(self.register_data) == 1:
352 >           txt += 'if [ $middleware == LCG ]; then \n'
353 >           txt += '    export LFN='+self.LFN+'\n'
354 >           txt += '    lfc-ls $LFN\n'
355 >           txt += '    result=$?\n'
356 >           txt += '    echo $result\n'
357 >           ### creation of LFN dir in LFC catalog, under /grid/cms dir  
358 >           txt += '    if [ $result != 0 ]; then\n'
359 >           txt += '       lfc-mkdir $LFN\n'
360 >           txt += '       result=$?\n'
361 >           txt += '       echo $result\n'
362 >           txt += '    fi\n'
363 >           txt += 'elif [ $middleware == OSG ]; then\n'
364 >           txt += '    echo " Files registration to be implemented for OSG"\n'
365 >           txt += 'fi\n'
366 >           txt += '\n'
367 >
368             if self.VO:
369                txt += 'export VO='+self.VO+'\n'
370             if self.LFN:
371 <              txt += 'export LFN='+self.LFN+'\n'
371 >              txt += 'if [ $middleware == LCG ]; then \n'
372 >              txt += '    export LFN='+self.LFN+'\n'
373 >              txt += 'fi\n'
374                txt += '\n'
375 <        txt += 'CloseCEs=`edg-brokerinfo getCE`\n'
376 <        txt += 'echo "CloseCEs = $CloseCEs"\n'
377 <        txt += 'CE=`echo $CloseCEs | sed -e "s/:.*//"`\n'
378 <        txt += 'echo "CE = $CE"\n'
375 >
376 >        txt += 'if [ $middleware == LCG ]; then\n'
377 >        txt += '    CloseCEs=`edg-brokerinfo getCE`\n'
378 >        txt += '    echo "CloseCEs = $CloseCEs"\n'
379 >        txt += '    CE=`echo $CloseCEs | sed -e "s/:.*//"`\n'
380 >        txt += '    echo "CE = $CE"\n'
381 >        txt += 'elif [ $middleware == OSG ]; then \n'
382 >        txt += '    if [ $OSG_JOB_CONTACT ]; then \n'
383 >        txt += '        CE=`echo $OSG_JOB_CONTACT | /usr/bin/awk -F\/ \'{print $1}\'` \n'
384 >        txt += '    else \n'
385 >        txt += '        echo "SET_CMS_ENV 10099 ==> OSG mode: ERROR in setting CE name from OSG_JOB_CONTACT" \n'
386 >        txt += '        echo "JOB_EXIT_STATUS = 10099" \n'
387 >        txt += '        echo "JobExitCode=10099" | tee -a $RUNTIME_AREA/$repo \n'
388 >        txt += '        dumpStatus $RUNTIME_AREA/$repo \n'
389 >        txt += '        rm -f $RUNTIME_AREA/$repo \n'
390 >        txt += '        echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
391 >        txt += '        echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
392 >        txt += '        exit 1 \n'
393 >        txt += '    fi \n'
394 >        txt += 'fi \n'
395 >
396 >        return txt
397 >
398 >    def wsCopyInput(self):
399 >        """
400 >        Copy input data from SE to WN    
401 >        """
402 >        txt = ''
403 >        if not self.copy_input_data: return txt
404 >
405 >        ## OLI_Daniele deactivate for OSG (wait for LCG UI installed on OSG)
406 >        txt += 'if [ $middleware == OSG ]; then\n'
407 >        txt += '   #\n'
408 >        txt += '   #   Copy Input Data from SE to this WN deactivated in OSG mode\n'
409 >        txt += '   #\n'
410 >        txt += '   echo "Copy Input Data from SE to this WN deactivated in OSG mode"\n'
411 >        txt += 'elif [ $middleware == LCG ]; then \n'
412 >        txt += '   #\n'
413 >        txt += '   #   Copy Input Data from SE to this WN\n'
414 >        txt += '   #\n'
415 >        ### changed by georgia (put a loop copying more than one input files per jobs)          
416 >        txt += '   for input_file in $cur_file_list \n'
417 >        txt += '   do \n'
418 >        txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$input_lfn/$input_file file:`pwd`/$input_file 2>&1\n'
419 >        txt += '      copy_input_exit_status=$?\n'
420 >        txt += '      echo "COPY_INPUT_EXIT_STATUS = $copy_input_exit_status"\n'
421 >        txt += '      if [ $copy_input_exit_status -ne 0 ]; then \n'
422 >        txt += '         echo "Problems with copying to WN" \n'
423 >        txt += '      else \n'
424 >        txt += '         echo "input copied into WN" \n'
425 >        txt += '      fi \n'
426 >        txt += '   done \n'
427 >        ### copy a set of PU ntuples (same for each jobs -- but accessed randomly)
428 >        txt += '   for file in $cur_pu_list \n'
429 >        txt += '   do \n'
430 >        txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$pu_lfn/$file file:`pwd`/$file 2>&1\n'
431 >        txt += '      copy_input_pu_exit_status=$?\n'
432 >        txt += '      echo "COPY_INPUT_PU_EXIT_STATUS = $copy_input_pu_exit_status"\n'
433 >        txt += '      if [ $copy_input_pu_exit_status -ne 0 ]; then \n'
434 >        txt += '         echo "Problems with copying pu to WN" \n'
435 >        txt += '      else \n'
436 >        txt += '         echo "input pu files copied into WN" \n'
437 >        txt += '      fi \n'
438 >        txt += '   done \n'
439 >        txt += '   \n'
440 >        txt += '   ### Check SCRATCH space available on WN : \n'
441 >        txt += '   df -h \n'
442 >        txt += 'fi \n'
443 >          
444          return txt
445  
446      def wsCopyOutput(self):
# Line 142 | Line 449 | class SchedulerEdg(Scheduler):
449          to copy produced output into a storage element.
450          """
451          txt = ''
452 <        if self.copy_data:
146 <           copy = 'globus-url-copy file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file'
452 >        if int(self.copy_data) == 1:
453             txt += '#\n'
454             txt += '#   Copy output to SE = $SE\n'
455             txt += '#\n'
456 <           #### per orca l'exit_status non e' affidabile.....
457 <           #txt += 'if [ $executable_exit_status -eq 0 ]; then\n'
458 <           txt += 'if [ $exe_result -eq 0 ]; then\n'
459 <           txt += '  for out_file in $file_list ; do\n'
460 <           txt += '    echo "Trying to copy output file to $SE "\n'
461 <           txt += '    echo "'+copy+'"\n'
156 <           txt += '    '+copy+' 2>&1\n'
157 <           txt += '    copy_exit_status=$?\n'
158 <           txt += '    echo "COPY_EXIT_STATUS = $copy_exit_status"\n'
159 <           txt += '    echo "STAGE_OUT = $copy_exit_status"\n'
160 <           txt += '    if [ $copy_exit_status -ne 0 ]; then \n'
161 <           txt += '       echo "Problems with SE= $SE" \n'
162 <           txt += '    else \n'
163 <           txt += '       echo "output copied into $SE/$SE_PATH directory"\n'
456 >           txt += '    if [ $middleware == OSG ]; then\n'
457 >           txt += '        echo "X509_USER_PROXY = $X509_USER_PROXY"\n'
458 >           txt += '        echo "source $OSG_APP/glite/setup_glite_ui.sh"\n'
459 >           txt += '        source $OSG_APP/glite/setup_glite_ui.sh\n'
460 >           txt += '        export X509_CERT_DIR=$OSG_APP/glite/etc/grid-security/certificates\n'
461 >           txt += '        echo "export X509_CERT_DIR=$X509_CERT_DIR"\n'
462             txt += '    fi \n'
463 <           txt += '  done\n'
464 <           txt += 'fi \n'
463 >
464 >           txt += '    for out_file in $file_list ; do\n'
465 >           txt += '        echo "Trying to copy output file to $SE using srmcp"\n'
466 >           txt += '        echo "mkdir -p $HOME/.srmconfig"\n'
467 >           txt += '        mkdir -p $HOME/.srmconfig\n'
468 >           txt += '        if [ $middleware == LCG ]; then\n'
469 >           txt += '           echo "srmcp -retry_num 3 -retry_timeout 480000 file:////`pwd`/$out_file srm://${SE}:8443${SE_PATH}$out_file"\n'
470 >           txt += '           exitstring=`srmcp -retry_num 3 -retry_timeout 480000 file:////\`pwd\`/$out_file srm://${SE}:8443${SE_PATH}$out_file 2>&1`\n'
471 >           txt += '        elif [ $middleware == OSG ]; then\n'
472 >           txt += '           echo "srmcp -retry_num 3 -retry_timeout 240000 -x509_user_trusted_certificates $X509_CERT_DIR file:////`pwd`/$out_file srm://${SE}:8443${SE_PATH}$out_file"\n'
473 >           txt += '           exitstring=`srmcp -retry_num 3 -retry_timeout 240000 -x509_user_trusted_certificates $X509_CERT_DIR file:////\`pwd\`/$out_file srm://${SE}:8443${SE_PATH}$out_file 2>&1`\n'
474 >           txt += '        fi \n'
475 >           txt += '        copy_exit_status=$?\n'
476 >           txt += '        echo "COPY_EXIT_STATUS for srmcp = $copy_exit_status"\n'
477 >           txt += '        echo "STAGE_OUT = $copy_exit_status"\n'
478 >
479 >           txt += '        if [ $copy_exit_status -ne 0 ]; then\n'
480 >           txt += '            echo "Possible problem with SE = $SE"\n'
481 >           txt += '            echo "StageOutExitStatus = 198" | tee -a $RUNTIME_AREA/$repo\n'
482 >           txt += '            echo "StageOutExitStatusReason = $exitstring" | tee -a $RUNTIME_AREA/$repo\n'
483 >           txt += '            echo "srmcp failed, attempting lcg-cp."\n'
484 >           if common.logger.debugLevel() >= 5:
485 >               txt += '            echo "lcg-cp --vo $VO -t 2400 --verbose file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
486 >               txt += '            exitstring=`lcg-cp --vo $VO -t 2400 --verbose file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
487 >           else:              
488 >               txt += '            echo "lcg-cp --vo $VO -t 2400 file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
489 >               txt += '            exitstring=`lcg-cp --vo $VO -t 2400 file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
490 >           txt += '            copy_exit_status=$?\n'
491 >           txt += '            echo "COPY_EXIT_STATUS for lcg-cp = $copy_exit_status"\n'
492 >           txt += '            echo "STAGE_OUT = $copy_exit_status"\n'
493 >
494 >           txt += '            if [ $copy_exit_status -ne 0 ]; then\n'
495 >           txt += '               echo "Problems with SE = $SE"\n'
496 >           txt += '               echo "StageOutExitStatus = 198" | tee -a $RUNTIME_AREA/$repo\n'
497 >           txt += '               echo "StageOutExitStatusReason = $exitstring" | tee -a $RUNTIME_AREA/$repo\n'
498 >           txt += '               echo "srmcp and lcg-cp and failed!"\n'
499 >           txt += '            else\n'
500 >           txt += '               echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
501 >           txt += '               echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
502 >           txt += '               echo "output copied into $SE/$SE_PATH directory"\n'
503 >           txt += '               echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
504 >           txt += '               echo "lcg-cp succeeded"\n'
505 >           txt += '            fi\n'
506 >           txt += '        else\n'
507 >           txt += '            echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
508 >           txt += '            echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
509 >           txt += '            echo "output copied into $SE/$SE_PATH directory"\n'
510 >           txt += '            echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
511 >           txt += '            echo "srmcp succeeded"\n'
512 >           txt += '         fi\n'
513 >           txt += '     done\n'
514          return txt
515  
516      def wsRegisterOutput(self):
# Line 172 | Line 519 | class SchedulerEdg(Scheduler):
519          """
520  
521          txt = ''
522 <        if self.register_data:
522 >        if int(self.register_data) == 1:
523 >        ## OLI_Daniele deactivate for OSG (wait for LCG UI installed on OSG)
524 >           txt += 'if [ $middleware == OSG ]; then\n'
525 >           txt += '   #\n'
526 >           txt += '   #   Register output to LFC deactivated in OSG mode\n'
527 >           txt += '   #\n'
528 >           txt += '   echo "Register output to LFC deactivated in OSG mode"\n'
529 >           txt += 'elif [ $middleware == LCG ]; then \n'
530             txt += '#\n'
531 <           txt += '#  Register output to RLS\n'
531 >           txt += '#  Register output to LFC\n'
532             txt += '#\n'
533 <           ### analogo
534 <           #txt += 'if [[ $executable_exit_status -eq 0 && $copy_exit_status -eq 0 ]]; then\n'
535 <           txt += 'if [[ $exe_result -eq 0 && $copy_exit_status -eq 0 ]]; then\n'
536 <           txt += '   for out_file in $file_list ; do\n'
537 <           txt += '      echo "Trying to register the output file into RLS"\n'
184 <           txt += '      echo "lcg-rf -l $LFN/$out_file --vo $VO sfn://$SE$SE_PATH/$out_file"\n'
185 <           txt += '      lcg-rf -l $LFN/$out_file --vo $VO sfn://$SE$SE_PATH/$out_file 2>&1 \n'
186 <           txt += '      register_exit_status=$?\n'
187 <           txt += '      echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
188 <           txt += '      echo "STAGE_OUT = $register_exit_status"\n'
189 <           txt += '      if [ $register_exit_status -ne 0 ]; then \n'
190 <           txt += '         echo "Problems with the registration to RLS" \n'
191 <           txt += '         echo "Try with srm protocol" \n'
192 <           txt += '         echo "lcg-rf -l $LFN/$out_file --vo $VO srm://$SE$SE_PATH/$out_file"\n'
193 <           txt += '         lcg-rf -l $LFN/$out_file --vo $VO srm://$SE$SE_PATH/$out_file 2>&1 \n'
533 >           txt += '   if [ $copy_exit_status -eq 0 ]; then\n'
534 >           txt += '      for out_file in $file_list ; do\n'
535 >           txt += '         echo "Trying to register the output file into LFC"\n'
536 >           txt += '         echo "lcg-rf -l $LFN/$out_file --vo $VO -t 1200 sfn://$SE$SE_PATH/$out_file 2>&1"\n'
537 >           txt += '         lcg-rf -l $LFN/$out_file --vo $VO -t 1200 sfn://$SE$SE_PATH/$out_file 2>&1 \n'
538             txt += '         register_exit_status=$?\n'
539             txt += '         echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
540             txt += '         echo "STAGE_OUT = $register_exit_status"\n'
541             txt += '         if [ $register_exit_status -ne 0 ]; then \n'
542 <           txt += '            echo "Problems with the registration into RLS" \n'
542 >           txt += '            echo "Problems with the registration to LFC" \n'
543 >           txt += '            echo "Try with srm protocol" \n'
544 >           txt += '            echo "lcg-rf -l $LFN/$out_file --vo $VO -t 1200 srm://$SE$SE_PATH/$out_file 2>&1"\n'
545 >           txt += '            lcg-rf -l $LFN/$out_file --vo $VO -t 1200 srm://$SE$SE_PATH/$out_file 2>&1 \n'
546 >           txt += '            register_exit_status=$?\n'
547 >           txt += '            echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
548 >           txt += '            echo "STAGE_OUT = $register_exit_status"\n'
549 >           txt += '            if [ $register_exit_status -ne 0 ]; then \n'
550 >           txt += '               echo "Problems with the registration into LFC" \n'
551 >           txt += '            fi \n'
552 >           txt += '         else \n'
553 >           txt += '            echo "output registered to LFC"\n'
554             txt += '         fi \n'
555 <           txt += '      else \n'
556 <           txt += '         echo "output registered to RLS"\n'
557 <           txt += '      fi \n'
558 <           txt += '   done\n'
559 <           txt += 'elif [[ $exe_result -eq 0 && $copy_exit_status -ne 0 ]]; then \n'
560 <           txt += '   echo "Trying to copy output file to CloseSE"\n'
561 <           txt += '   CLOSE_SE=`edg-brokerinfo getCloseSEs | head -1`\n'
562 <           txt += '   for out_file in $file_list ; do\n'
563 <           txt += '      echo "lcg-cr -v -l lfn:${LFN}/$out_file -d $SE -P $LFN/$out_file --vo $VO file://`pwd`/$out_file" \n'
564 <           txt += '      lcg-cr -v -l lfn:${LFN}/$out_file -d $SE -P $LFN/$out_file --vo $VO file://`pwd`/$out_file 2>&1 \n'
565 <           txt += '      register_exit_status=$?\n'
566 <           txt += '      echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
567 <           txt += '      echo "STAGE_OUT = $register_exit_status"\n'
568 <           txt += '      if [ $register_exit_status -ne 0 ]; then \n'
569 <           txt += '         echo "Problems with CloseSE" \n'
570 <           txt += '      else \n'
571 <           txt += '         echo "The program was successfully executed"\n'
572 <           txt += '         echo "SE = $CLOSE_SE"\n'
573 <           txt += '         echo "LFN for the file is LFN=${LFN}/$out_file"\n'
574 <           txt += '      fi \n'
575 <           txt += '   done\n'
576 <           txt += 'else\n'
222 <           txt += '   echo "Problem with the executable"\n'
555 >           txt += '         echo "StageOutExitStatus = $register_exit_status" | tee -a $RUNTIME_AREA/$repo\n'
556 >           txt += '      done\n'
557 >           txt += '   else \n'
558 >           txt += '      echo "Trying to copy output file to CloseSE"\n'
559 >           txt += '      CLOSE_SE=`edg-brokerinfo getCloseSEs | head -1`\n'
560 >           txt += '      for out_file in $file_list ; do\n'
561 >           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'
562 >           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'
563 >           txt += '         register_exit_status=$?\n'
564 >           txt += '         echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
565 >           txt += '         echo "STAGE_OUT = $register_exit_status"\n'
566 >           txt += '         if [ $register_exit_status -ne 0 ]; then \n'
567 >           txt += '            echo "Problems with CloseSE or Catalog" \n'
568 >           txt += '         else \n'
569 >           txt += '            echo "The program was successfully executed"\n'
570 >           txt += '            echo "SE = $CLOSE_SE"\n'
571 >           txt += '            echo "LFN for the file is LFN=${LFN}/$out_file"\n'
572 >           txt += '         fi \n'
573 >           txt += '         echo "StageOutExitStatus = $register_exit_status" | tee -a $RUNTIME_AREA/$repo\n'
574 >           txt += '      done\n'
575 >           txt += '   fi \n'
576 >           txt += '   exit_status=$register_exit_status\n'
577             txt += 'fi \n'
578          return txt
225        #####################
579  
580 <    def loggingInfo(self, nj):
580 >    def loggingInfo(self, id):
581          """
582          retrieve the logging info from logging and bookkeeping and return it
583          """
584          self.checkProxy()
585 <        id = common.jobDB.jobId(nj)
233 <        cmd = 'edg-job-get-logging-info -v 2 ' + self.configOpt_() + id
234 <        myCmd = os.popen(cmd)
235 <        cmd_out = myCmd.readlines()
236 <        myCmd.close()
237 <        return cmd_out
238 <
239 <    def listMatch(self, nj):
240 <        """
241 <        Check the compatibility of available resources
242 <        """
243 <        self.checkProxy()
244 <        jdl = common.job_list[nj].jdlFilename()
245 <        cmd = 'edg-job-list-match ' + self.configOpt_() + jdl
246 <        myCmd = os.popen(cmd)
247 <        cmd_out = myCmd.readlines()
248 <        myCmd.close()
249 <        return self.parseListMatch_(cmd_out, jdl)
250 <
251 <    def parseListMatch_(self, out, jdl):
252 <        reComment = re.compile( r'^\**$' )
253 <        reEmptyLine = re.compile( r'^$' )
254 <        reVO = re.compile( r'Selected Virtual Organisation name.*' )
255 <        reCE = re.compile( r'CEId' )
256 <        reNO = re.compile( r'No Computing Element matching' )
257 <        reRB = re.compile( r'Connecting to host' )
258 <        next = 0
259 <        CEs=[]
260 <        Match=0
261 <        for line in out:
262 <            line = line.strip()
263 <            if reComment.match( line ):
264 <                next = 0
265 <                continue
266 <            if reEmptyLine.match(line):
267 <                continue
268 <            if reVO.match( line ):
269 <                VO =line.split()[-1]
270 <                common.logger.debug(5, 'VO           :'+VO)
271 <                pass
272 <            if reRB.match( line ):
273 <                RB =line.split()[3]
274 <                common.logger.debug(5, 'Using RB     :'+RB)
275 <                pass
276 <            if reCE.search( line ):
277 <                next = 1
278 <                continue
279 <            if next:
280 <                CE=line.split(':')[0]
281 <                CEs.append(CE)
282 <                common.logger.debug(5, 'Matched CE   :'+CE)
283 <                Match=Match+1
284 <                pass
285 <            if reNO.match( line ):
286 <                common.logger.debug(5,line)
287 <                self.noMatchFound_(jdl)
288 <                Match=0
289 <                pass
290 <        return Match
291 <
292 <    def noMatchFound_(self, jdl):
293 <        reReq = re.compile( r'Requirements' )
294 <        reString = re.compile( r'"\S*"' )
295 <        f = file(jdl,'r')
296 <        for line in f.readlines():
297 <            line= line.strip()
298 <            if reReq.match(line):
299 <                for req in reString.findall(line):
300 <                    if re.search("VO",req):
301 <                        common.logger.message( "SW required: "+req)
302 <                        continue
303 <                    if re.search('"\d+',req):
304 <                        common.logger.message("Other req  : "+req)
305 <                        continue
306 <                    common.logger.message( "CE required: "+req)
307 <                break
308 <            pass
309 <        raise CrabException("No compatible resources found!")
310 <
311 <    def submit(self, nj):
312 <        """
313 <        Submit one EDG job.
314 <        """
315 <
316 <        self.checkProxy()
317 <        jid = None
318 <        jdl = common.job_list[nj].jdlFilename()
319 <
320 <        cmd = 'edg-job-submit ' + self.configOpt_() + jdl
585 >        cmd = 'edg-job-get-logging-info -v 2 ' + id
586          cmd_out = runCommand(cmd)
587 <        if cmd_out != None:
323 <            reSid = re.compile( r'https.+' )
324 <            jid = reSid.search(cmd).group()
325 <            pass
326 <        return jid
327 <
328 <    def getExitStatus(self, id):
329 <        return self.getStatusAttribute_(id, 'exit_code')
330 <
331 <    def queryStatus(self, id):
332 <        return self.getStatusAttribute_(id, 'status')
333 <
334 <    def queryDest(self, id):  
335 <        return self.getStatusAttribute_(id, 'destination')
336 <
337 <
338 <    def getStatusAttribute_(self, id, attr):
339 <        """ Query a status of the job with id """
340 <
341 <        self.checkProxy()
342 <        hstates = {}
343 <        Status = importName('edg_wl_userinterface_common_LbWrapper', 'Status')
344 <        # Bypass edg-job-status interfacing directly to C++ API
345 <        # Job attribute vector to retrieve status without edg-job-status
346 <        level = 0
347 <        # Instance of the Status class provided by LB API
348 <        jobStat = Status()
349 <        st = 0
350 <        jobStat.getStatus(id, level)
351 <        err, apiMsg = jobStat.get_error()
352 <        if err:
353 <            print 'Error caught', apiMsg
354 <            common.log.message(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
587 >        return cmd_out
588  
589      def queryDetailedStatus(self, id):
590          """ Query a detailed status of the job with id """
# Line 366 | Line 592 | class SchedulerEdg(Scheduler):
592          cmd_out = runCommand(cmd)
593          return cmd_out
594  
595 <    def getOutput(self, id):
595 >    ##### FEDE ######        
596 >    def findSites_(self, n):
597 >        itr4 =[]
598 >        sites = common.jobDB.destination(n)
599 >        if len(sites)>0 and sites[0]=="Any":
600 >            return itr4
601 >        itr = ''
602 >        if sites != [""]:#CarlosDaniele
603 >            for site in sites:
604 >                #itr = itr + 'target.GlueSEUniqueID==&quot;'+site+'&quot; || '
605 >                itr = itr + 'target.GlueSEUniqueID=="'+site+'" || '
606 >            itr = itr[0:-4]
607 >            itr4.append( itr )
608 >        return itr4
609 >
610 >    def createXMLSchScript(self, nj, argsList):
611 >      
612          """
613 <        Get output for a finished job with id.
372 <        Returns the name of directory with results.
613 >        Create a XML-file for BOSS4.
614          """
615 <
375 <        self.checkProxy()
376 <        cmd = 'edg-job-get-output --dir ' + common.work_space.resDir() + ' ' + id
377 <        cmd_out = runCommand(cmd)
378 <
379 <        # Determine the output directory name
380 <        dir = common.work_space.resDir()
381 <        dir += os.getlogin()
382 <        dir += '_' + os.path.basename(id)
383 <        return dir
384 <
385 <    def cancel(self, id):
386 <        """ Cancel the EDG job with id """
387 <        self.checkProxy()
388 <        cmd = 'edg-job-cancel --noint ' + id
389 <        cmd_out = runCommand(cmd)
390 <        return cmd_out
391 <
392 <    def createSchScript(self, nj):
615 >  #      job = common.job_list[nj]
616          """
617 <        Create a JDL-file for EDG.
617 >        INDY
618 >        [begin] FIX-ME:
619 >        I would pass jobType instead of job
620          """
621 <
622 <        job = common.job_list[nj]
621 >        index = nj - 1
622 >        job = common.job_list[index]
623          jbt = job.type()
399        inp_sandbox = jbt.inputSandbox(nj)
400        out_sandbox = jbt.outputSandbox(nj)
401        inp_storage_subdir = ''
624          
625 <        title = '# This JDL was generated by '+\
626 <                common.prog_name+' (version '+common.prog_version_str+')\n'
625 >        inp_sandbox = jbt.inputSandbox(index)
626 >        out_sandbox = jbt.outputSandbox(index)
627 >        """
628 >        [end] FIX-ME
629 >        """
630 >
631 >        
632 >        title = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'
633          jt_string = ''
634 +        
635 +        xml_fname = str(self.jobtypeName)+'.xml'
636 +        xml = open(common.work_space.shareDir()+'/'+xml_fname, 'a')
637 +
638 +        #TaskName  
639 +        dir = string.split(common.work_space.topDir(), '/')
640 +        taskName = dir[len(dir)-2]
641 +  
642 +        to_writeReq = ''
643 +        to_write = ''
644 +
645 +        req=' '
646 +        req = req + jbt.getRequirements()
647 +
648 +        if self.EDG_requirements:
649 +            if (req == ' '):
650 +                req = req + self.EDG_requirements
651 +            else:
652 +                req = req +  ' && ' + self.EDG_requirements
653 +        if self.EDG_ce_white_list:
654 +            ce_white_list = string.split(self.EDG_ce_white_list,',')
655 +            for i in range(len(ce_white_list)):
656 +                if i == 0:
657 +                    if (req == ' '):
658 +                        req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
659 +                    else:
660 +                        req = req +  ' && ((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
661 +                    pass
662 +                else:
663 +                    req = req +  ' || (RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
664 +            req = req + ')'
665 +        
666 +        if self.EDG_ce_black_list:
667 +            ce_black_list = string.split(self.EDG_ce_black_list,',')
668 +            for ce in ce_black_list:
669 +                if (req == ' '):
670 +                    req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
671 +                else:
672 +                    req = req +  ' && (!RegExp("' + ce + '", other.GlueCEUniqueId))'
673 +                pass
674 +        if self.EDG_clock_time:
675 +            if (req == ' '):
676 +                req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
677 +            else:
678 +                req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
679  
680 +        if self.EDG_cpu_time:
681 +            if (req == ' '):
682 +                req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
683 +            else:
684 +                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
685 +                                                                                          
686 +        if ( self.EDG_retry_count ):              
687 +            to_write = to_write + 'RetryCount = "'+self.EDG_retry_count+'"\n'
688 +            pass
689  
690 +        if ( self.EDG_shallow_retry_count ):              
691 +            to_write = to_write + 'ShallowRetryCount = "'+self.EDG_shallow_retry_count+'"\n'
692 +            pass
693 +
694 +        to_write = to_write + 'MyProxyServer = "&quot;' + self.proxyServer + '&quot;"\n'
695 +        to_write = to_write + 'VirtualOrganisation = "&quot;' + self.VO + '&quot;"\n'
696 +
697 +        #TaskName  
698 +        dir = string.split(common.work_space.topDir(), '/')
699 +        taskName = dir[len(dir)-2]
700 +
701 +        xml.write(str(title))
702 +        xml.write('<task name="' +str(taskName)+'" sub_path="' + common.work_space.bossCache() + '">\n')
703 +        xml.write(jt_string)
704          
705 <        SPL = inp_storage_subdir
706 <        if ( SPL and SPL[-1] != '/' ) : SPL = SPL + '/'
705 >        if (to_write != ''):
706 >            xml.write('<extraTags\n')
707 >            xml.write(to_write)
708 >            xml.write('/>\n')
709 >            pass
710  
711 <        jdl_fname = job.jdlFilename()
712 <        jdl = open(jdl_fname, 'w')
713 <        jdl.write(title)
711 >        xml.write('<iterator>\n')
712 >        xml.write('\t<iteratorRule name="ITR1">\n')
713 >        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ' </ruleElement>\n')
714 >        xml.write('\t</iteratorRule>\n')
715 >        xml.write('\t<iteratorRule name="ITR2">\n')
716 >        for arg in argsList:
717 >            xml.write('\t\t<ruleElement> <![CDATA[\n'+ arg + '\n\t\t]]> </ruleElement>\n')
718 >            pass
719 >        xml.write('\t</iteratorRule>\n')
720 >        #print jobList
721 >        xml.write('\t<iteratorRule name="ITR3">\n')
722 >        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ':1:6 </ruleElement>\n')
723 >        xml.write('\t</iteratorRule>\n')
724 >
725 >        '''
726 >        indy: here itr4
727 >        '''
728 >        
729  
730 <        script = job.scriptFilename()
731 <        jdl.write('Executable = "' + os.path.basename(script) +'";\n')
418 <        jdl.write(jt_string)
730 >        xml.write('<chain scheduler="'+str(self.schedulerName)+'">\n')
731 >        xml.write(jt_string)
732  
733 <        ### only one .sh  JDL has arguments:
421 <        firstEvent = common.jobDB.firstEvent(nj)
422 <        maxEvents = common.jobDB.maxEvents(nj)
423 <        jdl.write('Arguments = "' + str(nj+1)+' '+str(firstEvent)+' '+str(maxEvents)+'";\n')
733 >        #executable
734  
735 <        inp_box = 'InputSandbox = { '
736 <        inp_box = inp_box + '"' + script + '",'
735 >        """
736 >        INDY
737 >        script depends on jobType: it should be probably get in a different way
738 >        """        
739 >        script = job.scriptFilename()
740 >        xml.write('<program>\n')
741 >        xml.write('<exec> ' + os.path.basename(script) +' </exec>\n')
742 >        xml.write(jt_string)
743 >
744 >        xml.write('<args> <![CDATA[\n _ITR2_ \n]]> </args>\n')
745 >        xml.write('<program_types> crabjob </program_types>\n')
746 >        inp_box = common.work_space.pathForTgz() + 'job/' + jbt.scriptName + ','
747  
748          if inp_sandbox != None:
749              for fl in inp_sandbox:
750 <                inp_box = inp_box + ' "' + fl + '",'
750 >                inp_box = inp_box + '' + fl + ','
751                  pass
752              pass
753  
754 <        #if common.use_jam:
755 <        #   inp_box = inp_box+' "'+common.bin_dir+'/'+common.run_jam+'",'
756 <
757 <        for addFile in jbt.additional_inbox_files:
758 <            addFile = os.path.abspath(addFile)
759 <            inp_box = inp_box+' "'+addFile+'",'
440 <            pass
754 >        if (not jbt.additional_inbox_files == []):
755 >            inp_box = inp_box + ','
756 >            for addFile in jbt.additional_inbox_files:
757 >                addFile = os.path.abspath(addFile)
758 >                inp_box = inp_box+''+addFile+','
759 >                pass
760  
761          if inp_box[-1] == ',' : inp_box = inp_box[:-1]
762 <        inp_box = inp_box + ' };\n'
763 <        jdl.write(inp_box)
445 <
446 <        jdl.write('StdOutput     = "' + job.stdout() + '";\n')
447 <        jdl.write('StdError      = "' + job.stderr() + '";\n')
762 >        inp_box = '<infiles> <![CDATA[\n' + inp_box + '\n]]> </infiles>\n'
763 >        xml.write(inp_box)
764          
765 +        base = jbt.name()
766 +        stdout = base + '__ITR3_.stdout'
767 +        stderr = base + '__ITR3_.stderr'
768          
769 <        if job.stdout() == job.stderr():
770 <          out_box = 'OutputSandbox = { "' + \
771 <                    job.stdout() + '", ".BrokerInfo",'
772 <        else:
773 <          out_box = 'OutputSandbox = { "' + \
774 <                    job.stdout() + '", "' + \
456 <                    job.stderr() + '", ".BrokerInfo",'
769 >        xml.write('<stderr> ' + stderr + '</stderr>\n')
770 >        xml.write('<stdout> ' + stdout + '</stdout>\n')
771 >        
772 >
773 >        out_box = stdout + ',' + \
774 >                  stderr + ',.BrokerInfo,'
775  
776 <        if self.return_data :
776 >        """
777 >        if int(self.return_data) == 1:
778              if out_sandbox != None:
779                  for fl in out_sandbox:
780 <                    out_box = out_box + ' "' + fl + '",'
780 >                    out_box = out_box + '' + fl + ','
781                      pass
782                  pass
783              pass
784 <                                                                                                                                                            
784 >        """
785 >
786 >        """
787 >        INDY
788 >        something similar should be also done for infiles (if it makes sense!)
789 >        """
790 >        # Stuff to be returned _always_ via sandbox
791 >        for fl in jbt.output_file_sandbox:
792 >            out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
793 >            pass
794 >        pass
795 >
796 >        # via sandbox iif required return_data
797 >        if int(self.return_data) == 1:
798 >            for fl in jbt.output_file:
799 >                out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
800 >                pass
801 >            pass
802 >
803          if out_box[-1] == ',' : out_box = out_box[:-1]
804 <        out_box = out_box + ' };'
805 <        jdl.write(out_box+'\n')
804 >        out_box = '<outfiles> <![CDATA[\n' + out_box + '\n]]></outfiles>\n'
805 >        xml.write(out_box)
806 >
807 >        xml.write('<BossAttr> crabjob.INTERNAL_ID=_ITR1_ </BossAttr>\n')
808  
809 <        ### if at least a CE exists ...
810 <        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 + ')'
809 >        xml.write('</program>\n')
810 >        xml.write('</chain>\n')
811  
812 <            #### and USER REQUIREMENT
813 <            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')
812 >        xml.write('</iterator>\n')
813 >        xml.write('</task>\n')
814  
815 <        if ( self.EDG_retry_count ):              
816 <            jdl.write('RetryCount = '+self.EDG_retry_count+';\n')
500 <            pass
815 >        xml.close()
816 >      
817  
502        jdl.close()
818          return
819  
820      def checkProxy(self):
# Line 507 | Line 822 | class SchedulerEdg(Scheduler):
822          Function to check the Globus proxy.
823          """
824          if (self.proxyValid): return
825 +
826 +        ### Just return if asked to do so
827 +        if (self.dontCheckProxy):
828 +            self.proxyValid=1
829 +            return
830 +
831          timeleft = -999
832 <        minTimeLeft=10 # in hours
833 <        cmd = 'grid-proxy-info -e -v '+str(minTimeLeft)+':00'
834 <        try: cmd_out = runCommand(cmd,0)
835 <        except: print cmd_out
836 <        if (cmd_out == None or cmd_out=='1'):
837 <            common.logger.message( "No valid proxy found or timeleft too short!\n Creating a user proxy with default length of 100h\n")
838 <            cmd = 'grid-proxy-init -valid 100:00'
832 >        minTimeLeft=10*3600 # in seconds
833 >
834 >        minTimeLeftServer = 100 # in hours
835 >
836 >        mustRenew = 0
837 >        timeLeftLocal = runCommand('voms-proxy-info -timeleft 2>/dev/null')
838 >        timeLeftServer = -999
839 >        if not timeLeftLocal or int(timeLeftLocal) <= 0 or not isInt(timeLeftLocal):
840 >            mustRenew = 1
841 >        else:
842 >            timeLeftServer = runCommand('voms-proxy-info -actimeleft 2>/dev/null | head -1')
843 >            if not timeLeftServer or not isInt(timeLeftServer):
844 >                mustRenew = 1
845 >            elif timeLeftLocal<minTimeLeft or timeLeftServer<minTimeLeft:
846 >                mustRenew = 1
847 >            pass
848 >        pass
849 >
850 >        if mustRenew:
851 >            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")
852 >            cmd = 'voms-proxy-init -voms '+self.VO
853 >            if self.group:
854 >                cmd += ':/'+self.VO+'/'+self.group
855 >            if self.role:
856 >                cmd += '/role='+self.role
857 >            cmd += ' -valid 192:00'
858              try:
859 +                # SL as above: damn it!
860 +                common.logger.debug(10,cmd)
861                  out = os.system(cmd)
862                  if (out>0): raise CrabException("Unable to create a valid proxy!\n")
863              except:
864                  msg = "Unable to create a valid proxy!\n"
865                  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)
866              pass
867 +
868 +        ## now I do have a voms proxy valid, and I check the myproxy server
869 +        renewProxy = 0
870 +        cmd = 'myproxy-info -d -s '+self.proxyServer
871 +        cmd_out = runCommand(cmd,0,20)
872 +        if not cmd_out:
873 +            common.logger.message('No credential delegated to myproxy server '+self.proxyServer+' will do now')
874 +            renewProxy = 1
875 +        else:
876 +            # if myproxy exist but not long enough, renew
877 +            reTime = re.compile( r'timeleft: (\d+)' )
878 +            #print "<"+str(reTime.search( cmd_out ).group(1))+">"
879 +            if reTime.match( cmd_out ):
880 +                time = reTime.search( line ).group(1)
881 +                if time < minTimeLeftServer:
882 +                    renewProxy = 1
883 +                    common.logger.message('No credential delegation will expire in '+time+' hours: renew it')
884 +                pass
885 +            pass
886 +        
887 +        # if not, create one.
888 +        if renewProxy:
889 +            cmd = 'myproxy-init -d -n -s '+self.proxyServer
890 +            out = os.system(cmd)
891 +            if (out>0):
892 +                raise CrabException("Unable to delegate the proxy to myproxyserver "+self.proxyServer+" !\n")
893 +            pass
894 +
895 +        # cache proxy validity
896          self.proxyValid=1
897          return
898 <    
898 >
899      def configOpt_(self):
900          edg_ui_cfg_opt = ' '
901          if self.edg_config:
902 <          edg_ui_cfg_opt = ' -c ' + self.edg_config + ' '
902 >            edg_ui_cfg_opt = ' -c ' + self.edg_config + ' '
903          if self.edg_config_vo:
904 <          edg_ui_cfg_opt += ' --config-vo ' + self.edg_config_vo + ' '
904 >            edg_ui_cfg_opt += ' --config-vo ' + self.edg_config_vo + ' '
905          return edg_ui_cfg_opt

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines