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.5 by nsmirnov, Thu Jun 23 16:53:25 2005 UTC vs.
Revision 1.133.2.4 by fanzago, Fri Oct 12 12:56:30 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, tempfile
9 > import os, sys, time
10  
11   class SchedulerEdg(Scheduler):
12      def __init__(self):
13          Scheduler.__init__(self,"EDG")
14 +        self.states = [ "Acl", "cancelReason", "cancelling","ce_node","children", \
15 +                      "children_hist","children_num","children_states","condorId","condor_jdl", \
16 +                      "cpuTime","destination", "done_code","exit_code","expectFrom", \
17 +                      "expectUpdate","globusId","jdl","jobId","jobtype", \
18 +                      "lastUpdateTime","localId","location", "matched_jdl","network_server", \
19 +                      "owner","parent_job", "reason","resubmitted","rsl","seed",\
20 +                      "stateEnterTime","stateEnterTimes","subjob_failed", \
21 +                      "user tags" , "status" , "status_code","hierarchy"]
22          return
23  
24      def configure(self, cfg_params):
25  
26 <        try: self.edg_ui_cfg = cfg_params["EDG.rb_config"]
27 <        except KeyError: self.edg_ui_cfg = ''
26 >        # init BlackWhiteListParser
27 >        self.blackWhiteListParser = BlackWhiteListParser(cfg_params)
28  
29 <        try: self.edg_config = cfg_params["EDG.config"]
30 <        except KeyError: self.edg_config = ''
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.edg_config_vo = cfg_params["EDG.config_vo"]
34 <        except KeyError: self.edg_config_vo = ''
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.LCG_version = cfg_params["EDG.lcg_version"]
46 <        except KeyError: self.LCG_version = '2'
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:
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 = 0
75 >
76 >        try:
77 >            self.copy_data = cfg_params["USER.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 = 'Error: 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 >        if ( int(self.return_data) == 1 and int(self.copy_data) == 1 ):
95 >           msg = 'Error: return_data and copy_data cannot be set both to 1\n'
96 >           msg = msg + 'Please modify return_data or copy_data value in your crab.cfg file\n'
97 >           raise CrabException(msg)
98 >
99 >        ########### FEDE FOR DBS2 ##############################
100 >        try:
101 >            self.publish_data = cfg_params["USER.publish_data"]
102 >            self.checkProxy()
103 >            if int(self.publish_data) == 1:
104 >                try:
105 >                    self.publish_data_name = cfg_params['USER.publish_data_name']
106 >                except KeyError:
107 >                    msg = "Error. The [USER] section does not have 'publish_data_name'"
108 >                    raise CrabException(msg)
109 >                try:
110 >                    tmp = runCommand("voms-proxy-info -identity")
111 >                    tmp = string.split(tmp,'/')
112 >                    reCN=re.compile(r'CN=')
113 >                    for t in tmp:
114 >                        if reCN.match(t):
115 >                            self.UserGridName=string.strip((t.replace('CN=','')).replace(' ',''))
116 >                        
117 >                    #self.UserGridName = string.strip(runCommand("voms-proxy-info -identity | awk -F\'CN\' \'{print $2$3$4}\' | tr -d \'=/ \'"))
118 >                except:
119 >                    msg = "Error. Problem with voms-proxy-info -identity command"
120 >                    raise CrabException(msg)
121 >        except KeyError: self.publish_data = 0
122 >
123 >        if ( int(self.copy_data) == 0 and int(self.publish_data) == 1 ):
124 >           msg = 'Warning: publish_data = 1 must be used with copy_data = 1\n'
125 >           msg = msg + 'Please modify copy_data value in your crab.cfg file\n'
126 >           common.logger.message(msg)
127 >           raise CrabException(msg)
128 >        #################################################
129 >
130 >        #try:
131 >        #    self.lfc_host = cfg_params['EDG.lfc_host']
132 >        #except KeyError:
133 >        #    msg = "Error. The [EDG] section does not have 'lfc_host' value"
134 >        #    msg = msg + " it's necessary to know the LFC host name"
135 >        #    common.logger.message(msg)
136 >        #    raise CrabException(msg)
137 >        #try:
138 >        #    self.lcg_catalog_type = cfg_params['EDG.lcg_catalog_type']
139 >        #except KeyError:
140 >        #    msg = "Error. The [EDG] section does not have 'lcg_catalog_type' value"
141 >        #    msg = msg + " it's necessary to know the catalog type"
142 >        #    common.logger.message(msg)
143 >        #    raise CrabException(msg)
144 >        #try:
145 >        #    self.lfc_home = cfg_params['EDG.lfc_home']
146 >        #except KeyError:
147 >        #    msg = "Error. The [EDG] section does not have 'lfc_home' value"
148 >        #    msg = msg + " it's necessary to know the home catalog dir"
149 >        #    common.logger.message(msg)
150 >        #    raise CrabException(msg)
151 >      
152 >        #try:
153 >        #    self.register_data = cfg_params["USER.register_data"]
154 >        #    if int(self.register_data) == 1:
155 >        #        try:
156 >        #            self.LFN = cfg_params['USER.lfn_dir']
157 >        #        except KeyError:
158 >        #            msg = "Error. The [USER] section does not have 'lfn_dir' value"
159 >        #            msg = msg + " it's necessary for LCF registration"
160 >        #            common.logger.message(msg)
161 >        #            raise CrabException(msg)
162 >        #except KeyError: self.register_data = 0
163 >
164 >        #if ( int(self.copy_data) == 0 and int(self.register_data) == 1 ):
165 >        #   msg = 'Warning: register_data = 1 must be used with copy_data = 1\n'
166 >        #   msg = msg + 'Please modify copy_data value in your crab.cfg file\n'
167 >        #   common.logger.message(msg)
168 >        #   raise CrabException(msg)
169  
170          try: self.EDG_requirements = cfg_params['EDG.requirements']
171          except KeyError: self.EDG_requirements = ''
172  
173 +        try: self.EDG_addJdlParam = string.split(cfg_params['EDG.additional_jdl_parameters'],',')
174 +        except KeyError: self.EDG_addJdlParam = []
175 +
176          try: self.EDG_retry_count = cfg_params['EDG.retry_count']
177          except KeyError: self.EDG_retry_count = ''
178  
179 <        try:
180 <            self.VO = cfg_params['EDG.virtual_organization']
36 <        except KeyError:
37 <            msg = 'EDG.virtual_organization is mandatory.'
38 <            raise CrabException(msg)
179 >        try: self.EDG_shallow_retry_count= cfg_params['EDG.shallow_retry_count']
180 >        except KeyError: self.EDG_shallow_retry_count = ''
181  
182 <        
183 <        #self.scripts_dir = common.bin_dir + '/scripts'
184 <        #self.cmd_prefix = 'edg'
185 <        #if common.LCG_version == '0' : self.cmd_prefix = 'dg'
182 >        try: self.EDG_clock_time = cfg_params['EDG.max_wall_clock_time']
183 >        except KeyError: self.EDG_clock_time= ''
184 >
185 >        try: self.EDG_cpu_time = cfg_params['EDG.max_cpu_time']
186 >        except KeyError: self.EDG_cpu_time = ''
187  
188          # Add EDG_WL_LOCATION to the python path
189  
# Line 55 | Line 198 | class SchedulerEdg(Scheduler):
198          libPath=os.path.join(path, "lib", "python")
199          sys.path.append(libPath)
200  
201 <        self.checkProxy_()
201 >        try:
202 >            self._taskId = cfg_params['taskId']
203 >        except:
204 >            self._taskId = ''
205 >
206 >        try: self.jobtypeName = cfg_params['CRAB.jobtype']
207 >        except KeyError: self.jobtypeName = ''
208 >
209 >        try: self.schedulerName = cfg_params['CRAB.scheduler']
210 >        except KeyError: self.scheduler = ''
211 >
212          return
213      
214 +
215 +    def rb_configure(self, RB):
216 +        self.edg_config = ''
217 +        self.edg_config_vo = ''
218 +        self.rb_param_file = ''
219 +
220 +        edgConfig = EdgConfig(RB)
221 +        self.edg_config = edgConfig.config()
222 +        self.edg_config_vo = edgConfig.configVO()
223 +
224 +        if (self.edg_config and self.edg_config_vo != ''):
225 +            self.rb_param_file = 'RBconfig = "'+self.edg_config+'";\nRBconfigVO = "'+self.edg_config_vo+'";\n'
226 +            #print "rb_param_file = ", self.rb_param_file
227 +        return self.rb_param_file
228 +      
229 +
230 +    def sched_parameter(self):
231 +        """
232 +        Returns file with requirements and scheduler-specific parameters
233 +        """
234 +        index = int(common.jobDB.nJobs()) - 1
235 +        job = common.job_list[index]
236 +        jbt = job.type()
237 +        
238 +        lastBlock=-1
239 +        first = []
240 +        for n in range(common.jobDB.nJobs()):
241 +            currBlock=common.jobDB.block(n)
242 +            if (currBlock!=lastBlock):
243 +                lastBlock = currBlock
244 +                first.append(n)
245 +  
246 +        req = ''
247 +        req = req + jbt.getRequirements()
248 +    
249 +        if self.EDG_requirements:
250 +            if (req == ' '):
251 +                req = req + self.EDG_requirements
252 +            else:
253 +                req = req +  ' && ' + self.EDG_requirements
254 +
255 +        if self.EDG_ce_white_list:
256 +            ce_white_list = string.split(self.EDG_ce_white_list,',')
257 +            for i in range(len(ce_white_list)):
258 +                if i == 0:
259 +                    if (req == ' '):
260 +                        req = req + '((RegExp("' + string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
261 +                    else:
262 +                        req = req +  ' && ((RegExp("' +  string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
263 +                    pass
264 +                else:
265 +                    req = req +  ' || (RegExp("' +  string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
266 +            req = req + ')'
267 +        
268 +        if self.EDG_ce_black_list:
269 +            ce_black_list = string.split(self.EDG_ce_black_list,',')
270 +            for ce in ce_black_list:
271 +                if (req == ' '):
272 +                    req = req + '(!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))'
273 +                else:
274 +                    req = req +  ' && (!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))'
275 +                pass
276 +        if self.EDG_clock_time:
277 +            if (req == ' '):
278 +                req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
279 +            else:
280 +                req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
281 +
282 +        if self.EDG_cpu_time:
283 +            if (req == ' '):
284 +                req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
285 +            else:
286 +                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
287 +                
288 +        for i in range(len(first)): # Add loop DS
289 +            groupReq = req
290 +            self.param='sched_param_'+str(i)+'.clad'
291 +            param_file = open(common.work_space.shareDir()+'/'+self.param, 'w')
292 +
293 +            itr4=self.findSites_(first[i])
294 +            for arg in itr4:
295 +                groupReq = groupReq + ' && anyMatch(other.storage.CloseSEs, ('+str(arg)+'))'
296 +            param_file.write('Requirements = '+groupReq +';\n')  
297 +  
298 +            if (self.rb_param_file != ''):
299 +                param_file.write(self.rb_param_file)  
300 +
301 +            if len(self.EDG_addJdlParam):
302 +                for p in self.EDG_addJdlParam:
303 +                    param_file.write(p)
304 +
305 +            param_file.close()  
306 +
307 +
308      def wsSetupEnvironment(self):
309          """
310          Returns part of a job script which does scheduler-specific work.
311          """
312 <        txt = '\n'
313 <        txt += 'CloseCEs=`edg-brokerinfo getCE`\n'
314 <        txt += 'echo "CloseCEs = $CloseCEs"\n'
315 <        txt += 'CE=`echo $CloseCEs | sed -e "s/:.*//"`\n'
316 <        txt += 'echo "CE = $CE"\n'
312 >        txt = ''
313 >        txt += '# strip arguments\n'
314 >        txt += 'echo "strip arguments"\n'
315 >        txt += 'args=("$@")\n'
316 >        txt += 'nargs=$#\n'
317 >        txt += 'shift $nargs\n'
318 >        txt += "# job number (first parameter for job wrapper)\n"
319 >        #txt += "NJob=$1\n"
320 >        txt += "NJob=${args[0]}\n"
321 >
322 >        txt += '# job identification to DashBoard \n'
323 >        txt += 'MonitorJobID=`echo ${NJob}_$EDG_WL_JOBID`\n'
324 >        txt += 'SyncGridJobId=`echo $EDG_WL_JOBID`\n'
325 >        txt += 'MonitorID=`echo ' + self._taskId + '`\n'
326 >        txt += 'echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
327 >        txt += 'echo "SyncGridJobId=`echo $SyncGridJobId`" | tee -a $RUNTIME_AREA/$repo \n'
328 >        txt += 'echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
329 >
330 >        txt += 'echo "middleware discovery " \n'
331 >        txt += 'if [ $GRID3_APP_DIR ]; then\n'
332 >        txt += '    middleware=OSG \n'
333 >        txt += '    if [ $GLOBUS_GRAM_JOB_CONTACT ]; then \n'
334 >        txt += '        SyncCE=`echo "echo $GLOBUS_GRAM_JOB_CONTACT" | cut -d: -f2 | sed \'s/\/\///\'`;\n'
335 >        txt += '        echo "SyncCE=$SyncCE"  | tee -a $RUNTIME_AREA/$repo ;\n'
336 >        txt += '    else\n'
337 >        txt += '        echo "not reporting SyncCE";\n'
338 >        txt += '    fi\n';
339 >        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
340 >        txt += '    echo "middleware =$middleware" \n'
341 >        txt += 'elif [ $OSG_APP ]; then \n'
342 >        txt += '    middleware=OSG \n'
343 >        txt += '    if [ $GLOBUS_GRAM_JOB_CONTACT ]; then \n'
344 >        txt += '        SyncCE=`echo "echo $GLOBUS_GRAM_JOB_CONTACT" | cut -d: -f2 | sed \'s/\/\///\'`;\n'
345 >        txt += '        echo "SyncCE=$SyncCE"  | tee -a $RUNTIME_AREA/$repo ;\n'
346 >        txt += '    else\n'
347 >        txt += '        echo "not reporting SyncCE";\n'
348 >        txt += '    fi\n';
349 >        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
350 >        txt += '    echo "middleware =$middleware" \n'
351 >        txt += 'elif [ $VO_CMS_SW_DIR ]; then \n'
352 >        txt += '    middleware=LCG \n'
353 >   #     txt += '    echo "SyncCE=`edg-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
354 >        txt += '    echo "SyncCE=`glite-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
355 >        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
356 >        txt += '    echo "middleware =$middleware" \n'
357 >        txt += 'else \n'
358 >        txt += '    echo "SET_CMS_ENV 10030 ==> middleware not identified" \n'
359 >        txt += '    echo "JOB_EXIT_STATUS = 10030" \n'
360 >        txt += '    echo "JobExitCode=10030" | tee -a $RUNTIME_AREA/$repo \n'
361 >        txt += '    dumpStatus $RUNTIME_AREA/$repo \n'
362 >        txt += '    rm -f $RUNTIME_AREA/$repo \n'
363 >        txt += '    echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
364 >        txt += '    echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
365 >        txt += '    exit 1 \n'
366 >        txt += 'fi \n'
367 >
368 >        txt += '# report first time to DashBoard \n'
369 >        txt += 'dumpStatus $RUNTIME_AREA/$repo \n'
370 >        txt += 'rm -f $RUNTIME_AREA/$repo \n'
371 >        txt += 'echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
372 >        txt += 'echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
373 >        
374 >        txt += '\n\n'
375 >
376 > #        if int(self.copy_data) == 1:
377 > #           if self.SE:
378 > #              txt += 'export SE='+self.SE+'\n'
379 > #              txt += 'echo "SE = $SE"\n'
380 > #           if self.SE_PATH:
381 > #              if ( self.SE_PATH[-1] != '/' ) : self.SE_PATH = self.SE_PATH + '/'
382 > #              txt += 'export SE_PATH='+self.SE_PATH+'\n'
383 > #              txt += 'echo "SE_PATH = $SE_PATH"\n'
384 >
385 >        txt += 'export VO='+self.VO+'\n'
386 >        ### add some line for LFC catalog setting
387 >        #txt += 'if [ $middleware == LCG ]; then \n'
388 >        #txt += '    if [[ $LCG_CATALOG_TYPE != \''+self.lcg_catalog_type+'\' ]]; then\n'
389 >        #txt += '        export LCG_CATALOG_TYPE='+self.lcg_catalog_type+'\n'
390 >        #txt += '    fi\n'
391 >        #txt += '    if [[ $LFC_HOST != \''+self.lfc_host+'\' ]]; then\n'
392 >        #txt += '        export LFC_HOST='+self.lfc_host+'\n'
393 >        #txt += '    fi\n'
394 >        #txt += '    if [[ $LFC_HOME != \''+self.lfc_home+'\' ]]; then\n'
395 >        #txt += '        export LFC_HOME='+self.lfc_home+'\n'
396 >        #txt += '    fi\n'
397 >        #txt += 'elif [ $middleware == OSG ]; then\n'
398 >        #txt += '    echo "LFC catalog setting to be implemented for OSG"\n'
399 >        #txt += 'fi\n'
400 >        #####
401 >        #if int(self.register_data) == 1:
402 >        #   txt += 'if [ $middleware == LCG ]; then \n'
403 >        #   txt += '    export LFN='+self.LFN+'\n'
404 >        #   txt += '    lfc-ls $LFN\n'
405 >        #   txt += '    result=$?\n'
406 >        #   txt += '    echo $result\n'
407 >        #   ### creation of LFN dir in LFC catalog, under /grid/cms dir  
408 >        #   txt += '    if [ $result != 0 ]; then\n'
409 >        #   txt += '       lfc-mkdir $LFN\n'
410 >        #   txt += '       result=$?\n'
411 >        #   txt += '       echo $result\n'
412 >        #   txt += '    fi\n'
413 >        #   txt += 'elif [ $middleware == OSG ]; then\n'
414 >        #   txt += '    echo " Files registration to be implemented for OSG"\n'
415 >        #   txt += 'fi\n'
416 >        #   txt += '\n'
417 >        #   if self.VO:
418 >        #      txt += 'export VO='+self.VO+'\n'
419 >        #   if self.LFN:
420 >        #      txt += 'if [ $middleware == LCG ]; then \n'
421 >        #      txt += '    export LFN='+self.LFN+'\n'
422 >        #      txt += 'fi\n'
423 >        #      txt += '\n'
424 >
425 >        txt += 'if [ $middleware == LCG ]; then\n'
426 >    #    txt += '    CloseCEs=`edg-brokerinfo getCE`\n'
427 >        txt += '    CloseCEs=`glite-brokerinfo getCE`\n'
428 >        txt += '    echo "CloseCEs = $CloseCEs"\n'
429 >        txt += '    CE=`echo $CloseCEs | sed -e "s/:.*//"`\n'
430 >        txt += '    echo "CE = $CE"\n'
431 >        txt += 'elif [ $middleware == OSG ]; then \n'
432 >        txt += '    if [ $OSG_JOB_CONTACT ]; then \n'
433 >        txt += '        CE=`echo $OSG_JOB_CONTACT | /usr/bin/awk -F\/ \'{print $1}\'` \n'
434 >        txt += '    else \n'
435 >        txt += '        echo "SET_CMS_ENV 10099 ==> OSG mode: ERROR in setting CE name from OSG_JOB_CONTACT" \n'
436 >        txt += '        echo "JOB_EXIT_STATUS = 10099" \n'
437 >        txt += '        echo "JobExitCode=10099" | tee -a $RUNTIME_AREA/$repo \n'
438 >        txt += '        dumpStatus $RUNTIME_AREA/$repo \n'
439 >        txt += '        rm -f $RUNTIME_AREA/$repo \n'
440 >        txt += '        echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
441 >        txt += '        echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
442 >        txt += '        exit 1 \n'
443 >        txt += '    fi \n'
444 >        txt += 'fi \n'
445 >
446          return txt
447  
448 <    def submit(self, nj):
448 >    def wsCopyInput(self):
449          """
450 <        Submit one EDG job.
450 >        Copy input data from SE to WN    
451          """
452 +        txt = ''
453 +        if not self.copy_input_data: return txt
454  
455 <        jid = None
456 <        jdl = common.job_list[nj].jdlFilename()
457 <        id_tmp = tempfile.mktemp()
458 <        edg_ui_cfg_opt = ' '
459 <        if self.edg_config:
460 <          edg_ui_cfg_opt = ' -c ' + self.edg_config + ' '
461 <        if self.edg_config_vo:
462 <          edg_ui_cfg_opt += ' --config-vo ' + self.edg_config_vo + ' '
463 <        cmd = 'edg-job-submit -o ' + id_tmp + edg_ui_cfg_opt + jdl
464 <        cmd_out = runCommand(cmd)
465 <        if cmd_out != None:
466 <            idfile = open(id_tmp)
467 <            jid_line = idfile.readline()
468 <            while jid_line[0] == '#':
469 <                jid_line = idfile.readline()
470 <                pass
471 <            jid = string.strip(jid_line)
472 <            os.unlink(id_tmp)
455 >        ## OLI_Daniele deactivate for OSG (wait for LCG UI installed on OSG)
456 >        txt += 'if [ $middleware == OSG ]; then\n'
457 >        txt += '   #\n'
458 >        txt += '   #   Copy Input Data from SE to this WN deactivated in OSG mode\n'
459 >        txt += '   #\n'
460 >        txt += '   echo "Copy Input Data from SE to this WN deactivated in OSG mode"\n'
461 >        txt += 'elif [ $middleware == LCG ]; then \n'
462 >        txt += '   #\n'
463 >        txt += '   #   Copy Input Data from SE to this WN\n'
464 >        txt += '   #\n'
465 >        ### changed by georgia (put a loop copying more than one input files per jobs)          
466 >        txt += '   for input_file in $cur_file_list \n'
467 >        txt += '   do \n'
468 >        txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$input_lfn/$input_file file:`pwd`/$input_file 2>&1\n'
469 >        txt += '      copy_input_exit_status=$?\n'
470 >        txt += '      echo "COPY_INPUT_EXIT_STATUS = $copy_input_exit_status"\n'
471 >        txt += '      if [ $copy_input_exit_status -ne 0 ]; then \n'
472 >        txt += '         echo "Problems with copying to WN" \n'
473 >        txt += '      else \n'
474 >        txt += '         echo "input copied into WN" \n'
475 >        txt += '      fi \n'
476 >        txt += '   done \n'
477 >        ### copy a set of PU ntuples (same for each jobs -- but accessed randomly)
478 >        txt += '   for file in $cur_pu_list \n'
479 >        txt += '   do \n'
480 >        txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$pu_lfn/$file file:`pwd`/$file 2>&1\n'
481 >        txt += '      copy_input_pu_exit_status=$?\n'
482 >        txt += '      echo "COPY_INPUT_PU_EXIT_STATUS = $copy_input_pu_exit_status"\n'
483 >        txt += '      if [ $copy_input_pu_exit_status -ne 0 ]; then \n'
484 >        txt += '         echo "Problems with copying pu to WN" \n'
485 >        txt += '      else \n'
486 >        txt += '         echo "input pu files copied into WN" \n'
487 >        txt += '      fi \n'
488 >        txt += '   done \n'
489 >        txt += '   \n'
490 >        txt += '   ### Check SCRATCH space available on WN : \n'
491 >        txt += '   df -h \n'
492 >        txt += 'fi \n'
493 >          
494 >        return txt
495 >
496 >    def wsCopyOutput(self):
497 >        """
498 >        Write a CopyResults part of a job script, e.g.
499 >        to copy produced output into a storage element.
500 >        """
501 >        txt = '\n'
502 >
503 >        txt += '#\n'
504 >        txt += '# COPY OUTPUT FILE TO SE\n'
505 >        txt += '#\n\n'
506 >
507 >        SE_PATH=''
508 >        if int(self.copy_data) == 1:
509 >            if self.SE:
510 >                txt += 'export SE='+self.SE+'\n'
511 >                txt += 'echo "SE = $SE"\n'
512 >            if self.SE_PATH:
513 >                if ( self.SE_PATH[-1] != '/' ) : self.SE_PATH = self.SE_PATH + '/'
514 >                SE_PATH=self.SE_PATH
515 >            if int(self.publish_data) == 1:
516 >                txt += '### publish_data = 1 so the SE path where to copy the output is: \n'
517 >                path_add = self.UserGridName + '/' + self.publish_data_name +'_${PSETHASH}/'
518 >                SE_PATH = SE_PATH + path_add
519 >            txt += 'export SE_PATH='+SE_PATH+'\n'
520 >            txt += 'echo "SE_PATH = $SE_PATH"\n'
521 >            
522 >            txt += 'echo "####################################################"\n'
523 >            txt += 'echo "# Copy output files from WN = `hostname` to SE = $SE"\n'
524 >            txt += 'echo "####################################################"\n'
525 >            
526 >            txt += 'if [ $output_exit_status -eq 60302 ]; then\n'
527 >            txt += '    echo "--> No output file to copy to $SE"\n'
528 >            txt += '    copy_exit_status=$output_exit_status\n'
529 >            txt += '    echo "COPY_EXIT_STATUS = $copy_exit_status"\n'
530 >            txt += 'else\n'
531 >            txt += '    for out_file in $file_list ; do\n'
532 >            txt += '        echo "Trying to copy output file to $SE"\n'
533 >            txt += '        cmscp $out_file ${SE} ${SE_PATH} $out_file $middleware\n'
534 >            txt += '        copy_exit_status=$?\n'
535 >            txt += '        echo "COPY_EXIT_STATUS = $copy_exit_status"\n'
536 >            txt += '        echo "STAGE_OUT = $copy_exit_status"\n'
537 >            txt += '        if [ $copy_exit_status -ne 0 ]; then\n'
538 >            txt += '            echo "Problem copying $out_file to $SE $SE_PATH"\n'
539 >            txt += '            echo "StageOutExitStatus = $copy_exit_status " | tee -a $RUNTIME_AREA/$repo\n'
540 >            txt += '            copy_exit_status=60307\n'
541 >            txt += '        else\n'
542 >            txt += '            echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
543 >            txt += '            echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
544 >            txt += '            echo "output copied into $SE/$SE_PATH directory"\n'
545 >            txt += '            echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
546 >            txt += '        fi\n'
547 >            txt += '    done\n'
548 >            txt += '    if [ $copy_exit_status -ne 0 ]; then\n'
549 >            txt += '        SE=""\n'
550 >            txt += '        echo "SE = $SE"\n'
551 >            txt += '        SE_PATH=""\n'
552 >            txt += '        echo "SE_PATH = $SE_PATH"\n'
553 >            txt += '    fi\n'
554 >            txt += 'fi\n'
555 >            txt += 'exit_status=$copy_exit_status\n'
556              pass
557 <        return jid
557 >        return txt
558  
559 <    def queryStatus(self, id):
560 <        """ Query a status of the job with id """
561 <        cmd0 = 'edg-job-status '
562 <        cmd = cmd0 + id
559 >    def loggingInfo(self, id):
560 >        """
561 >        retrieve the logging info from logging and bookkeeping and return it
562 >        """
563 >        self.checkProxy()
564 >        cmd = 'edg-job-get-logging-info -v 2 ' + id
565          cmd_out = runCommand(cmd)
566 <        if cmd_out == None:
104 <            common.logger.message('Error. No output from `'+cmd+'`')
105 <            return None
106 <        # parse output
107 <        status_prefix = 'Current Status:'
108 <        status_index = string.find(cmd_out, status_prefix)
109 <        if status_index == -1:
110 <            common.logger.message('Error. Bad output of `'+cmd0+'`:\n'+cmd_out)
111 <            return None
112 <        status = cmd_out[(status_index+len(status_prefix)):]
113 <        nl = string.find(status,'\n')
114 <        status = string.strip(status[0:nl])
115 <        return status
566 >        return cmd_out
567  
568      def queryDetailedStatus(self, id):
569          """ Query a detailed status of the job with id """
# Line 120 | Line 571 | class SchedulerEdg(Scheduler):
571          cmd_out = runCommand(cmd)
572          return cmd_out
573  
574 <    def getOutput(self, id):
575 <        """
125 <        Get output for a finished job with id.
126 <        Returns the name of directory with results.
127 <        """
128 <        cmd = 'edg-job-get-output --dir ' + common.work_space.resDir() +' '+id
129 <        cmd_out = runCommand(cmd)
574 >    def findSites_(self, n):
575 >        itr4 =[]
576  
577 <        # Determine the output directory name
578 <        dir = common.work_space.resDir()
579 <        dir += os.getlogin()
580 <        dir += '_' + os.path.basename(id)
581 <        return dir
582 <
583 <    def cancel(self, id):
584 <        """ Cancel the EDG job with id """
585 <        cmd = 'edg-job-cancel --noint ' + id
586 <        cmd_out = runCommand(cmd)
587 <        return cmd_out
577 >        sites = common.jobDB.destination(n)
578 >
579 >        if len(sites)>0 and sites[0]=="":
580 >            return itr4
581 >
582 >        itr = ''
583 >        if sites != [""]:#CarlosDaniele
584 >            ##Addedd Daniele
585 >            replicas = self.blackWhiteListParser.checkBlackList(sites,n)
586 >            if len(replicas)!=0:
587 >                replicas = self.blackWhiteListParser.checkWhiteList(replicas,n)
588 >              
589 >            if len(replicas)==0:
590 >                itr = itr + 'target.GlueSEUniqueID=="NONE" '
591 >                #msg = 'No sites remaining that host any part of the requested data! Exiting... '
592 >                #raise CrabException(msg)
593 >            #####        
594 >           # for site in sites:
595 >            for site in replicas:
596 >                #itr = itr + 'target.GlueSEUniqueID==&quot;'+site+'&quot; || '
597 >                itr = itr + 'target.GlueSEUniqueID=="'+site+'" || '
598 >            itr = itr[0:-4]
599 >            itr4.append( itr )
600 >        return itr4
601  
602 <    def checkProxy_(self):
602 >    def createXMLSchScript(self, nj, argsList):
603 >      
604          """
605 <        Function to check the Globus proxy.
605 >        Create a XML-file for BOSS4.
606          """
607 <        cmd = 'grid-proxy-info -timeleft'
148 <        cmd_out = runCommand(cmd)
149 <        ok = 1
150 <        timeleft = -999
151 <        try: timeleft = int(cmd_out)
152 <        except ValueError: ok=0
153 <        except TypeError: ok=0
154 <        if timeleft < 1:  ok=0
155 <
156 <        if ok==0:
157 <            msg = 'No valid proxy found !\n'
158 <            msg += "Please do 'grid-proxy-init'."
159 <            raise CrabException(msg)
160 <        return
161 <    
162 <    def createJDL(self, nj):
607 >  #      job = common.job_list[nj]
608          """
609 <        Create a JDL-file for EDG.
609 >        INDY
610 >        [begin] FIX-ME:
611 >        I would pass jobType instead of job
612          """
613 <
614 <        job = common.job_list[nj]
613 >        index = nj - 1
614 >        job = common.job_list[index]
615          jbt = job.type()
169 #        jbt.loadJobInfo()
170        inp_sandbox = jbt.inputSandbox(nj)
171        out_sandbox = jbt.outputSandbox(nj)
172        inp_storage_subdir = ''#jbt.inputStorageSubdir()
616          
617 <        title = '# This JDL was generated by '+\
618 <                common.prog_name+' (version '+common.prog_version_str+')\n'
617 >        inp_sandbox = jbt.inputSandbox(index)
618 >        #out_sandbox = jbt.outputSandbox(index)
619 >        """
620 >        [end] FIX-ME
621 >        """
622 >
623 >        
624 >        title = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'
625          jt_string = ''
626          
627 <        SPL = inp_storage_subdir
628 <        if ( SPL and SPL[-1] != '/' ) : SPL = SPL + '/'
627 >        xml_fname = str(self.jobtypeName)+'.xml'
628 >        xml = open(common.work_space.shareDir()+'/'+xml_fname, 'a')
629  
630 <        jdl_fname = job.jdlFilename()
631 <        jdl = open(jdl_fname, 'w')
632 <        jdl.write(title)
630 >        #TaskName  
631 >        dir = string.split(common.work_space.topDir(), '/')
632 >        taskName = dir[len(dir)-2]
633 >  
634 >        to_write = ''
635 >
636 >        req=' '
637 >        req = req + jbt.getRequirements()
638 >
639 >        if self.EDG_requirements:
640 >            if (req == ' '):
641 >                req = req + self.EDG_requirements
642 >            else:
643 >                req = req +  ' && ' + self.EDG_requirements
644 >        if self.EDG_ce_white_list:
645 >            ce_white_list = string.split(self.EDG_ce_white_list,',')
646 >            for i in range(len(ce_white_list)):
647 >                if i == 0:
648 >                    if (req == ' '):
649 >                        req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
650 >                    else:
651 >                        req = req +  ' && ((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
652 >                    pass
653 >                else:
654 >                    req = req +  ' || (RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
655 >            req = req + ')'
656 >        
657 >        if self.EDG_ce_black_list:
658 >            ce_black_list = string.split(self.EDG_ce_black_list,',')
659 >            for ce in ce_black_list:
660 >                if (req == ' '):
661 >                    req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
662 >                else:
663 >                    req = req +  ' && (!RegExp("' + ce + '", other.GlueCEUniqueId))'
664 >                pass
665 >        if self.EDG_clock_time:
666 >            if (req == ' '):
667 >                req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
668 >            else:
669 >                req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
670 >
671 >        if self.EDG_cpu_time:
672 >            if (req == ' '):
673 >                req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
674 >            else:
675 >                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
676 >                                                                                          
677 >        if ( self.EDG_retry_count ):              
678 >            to_write = to_write + 'RetryCount = "'+self.EDG_retry_count+'"\n'
679 >            pass
680  
681 <        script = job.scriptFilename()
682 <        jdl.write('Executable = "' + os.path.basename(script) +'";\n')
683 <        jdl.write(jt_string)
681 >        if ( self.EDG_shallow_retry_count ):              
682 >            to_write = to_write + 'ShallowRetryCount = "'+self.EDG_shallow_retry_count+'"\n'
683 >            pass
684 >
685 >        to_write = to_write + 'MyProxyServer = "&quot;' + self.proxyServer + '&quot;"\n'
686 >        to_write = to_write + 'VirtualOrganisation = "&quot;' + self.VO + '&quot;"\n'
687 >
688 >        #TaskName  
689 >        dir = string.split(common.work_space.topDir(), '/')
690 >        taskName = dir[len(dir)-2]
691 >
692 >        xml.write(str(title))
693 >        #xml.write('<task name="' +str(taskName)+'" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache">\n')
694 >
695 >        #xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + '" task_info="' + os.path.expandvars('X509_USER_PROXY') + '">\n')
696 >        x509_cmd = 'ls /tmp/x509up_u`id -u`'
697 >        x509=runCommand(x509_cmd).strip()
698 >        xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + ' task_info="' + str(x509) + '">\n')
699 >        xml.write(jt_string)
700 >        
701 >        if (to_write != ''):
702 >            xml.write('<extraTags\n')
703 >            xml.write(to_write)
704 >            xml.write('/>\n')
705 >            pass
706 >
707 >        xml.write('<iterator>\n')
708 >        xml.write('\t<iteratorRule name="ITR1">\n')
709 >        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ' </ruleElement>\n')
710 >        xml.write('\t</iteratorRule>\n')
711 >        xml.write('\t<iteratorRule name="ITR2">\n')
712 >        for arg in argsList:
713 >            xml.write('\t\t<ruleElement> <![CDATA[\n'+ arg + '\n\t\t]]> </ruleElement>\n')
714 >            pass
715 >        xml.write('\t</iteratorRule>\n')
716 >        #print jobList
717 >        xml.write('\t<iteratorRule name="ITR3">\n')
718 >        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ':1:6 </ruleElement>\n')
719 >        xml.write('\t</iteratorRule>\n')
720 >
721 >        '''
722 >        indy: here itr4
723 >        '''
724 >        
725 >        xml.write('<chain name="' +str(taskName)+'__ITR1_" scheduler="'+str(self.schedulerName)+'">\n')
726 >       # xml.write('<chain scheduler="'+str(self.schedulerName)+'">\n')
727 >        xml.write(jt_string)
728 >
729 >        #executable
730  
731 <        inp_box = 'InputSandbox = { '
732 <        inp_box = inp_box + '"' + script + '",'
731 >        """
732 >        INDY
733 >        script depends on jobType: it should be probably get in a different way
734 >        """        
735 >        script = job.scriptFilename()
736 >        xml.write('<program>\n')
737 >        xml.write('<exec> ' + os.path.basename(script) +' </exec>\n')
738 >        xml.write(jt_string)
739 >
740 >        xml.write('<args> <![CDATA[\n _ITR2_ \n]]> </args>\n')
741 >        xml.write('<program_types> crabjob </program_types>\n')
742 >        inp_box = common.work_space.pathForTgz() + 'job/' + jbt.scriptName + ','
743  
744          if inp_sandbox != None:
745              for fl in inp_sandbox:
746 <                inp_box = inp_box + ' "' + fl + '",'
746 >                inp_box = inp_box + '' + fl + ','
747                  pass
748              pass
749  
750 <        #if common.use_jam:
751 <        #   inp_box = inp_box+' "'+common.bin_dir+'/'+common.run_jam+'",'
752 <
753 <        # ??? Should be local, i.e. self.additional_inbox_files
754 <        #     and filled in ctor from cfg_params
755 <        #for addFile in common.additional_inbox_files:
204 <        #    addFile = os.path.abspath(addFile)
205 <        #    inp_box = inp_box+' "'+addFile+'",'
206 <        #    pass
750 > #        if (not jbt.additional_inbox_files == []):
751 > #            inp_box = inp_box + ','
752 > #            for addFile in jbt.additional_inbox_files:
753 > #                #addFile = os.path.abspath(addFile)
754 > #                inp_box = inp_box+''+addFile+','
755 > #                pass
756  
757          if inp_box[-1] == ',' : inp_box = inp_box[:-1]
758 <        inp_box = inp_box + ' };\n'
759 <        jdl.write(inp_box)
758 >        inp_box = '<infiles> <![CDATA[\n' + inp_box + '\n]]> </infiles>\n'
759 >        xml.write(inp_box)
760 >        
761 >        base = jbt.name()
762 >        stdout = base + '__ITR3_.stdout'
763 >        stderr = base + '__ITR3_.stderr'
764 >        
765 >        xml.write('<stderr> ' + stderr + '</stderr>\n')
766 >        xml.write('<stdout> ' + stdout + '</stdout>\n')
767 >        
768  
769 <        jdl.write('StdOutput     = "' + job.stdout() + '";\n')
770 <        jdl.write('StdError      = "' + job.stderr() + '";\n')
769 >        out_box = stdout + ',' + \
770 >                  stderr + ',.BrokerInfo,'
771  
772 +        """
773 +        if int(self.return_data) == 1:
774 +            if out_sandbox != None:
775 +                for fl in out_sandbox:
776 +                    out_box = out_box + '' + fl + ','
777 +                    pass
778 +                pass
779 +            pass
780 +        """
781  
782 < ### SL check if stdout==stderr: in case put just one in the out_box
783 <        if job.stdout() == job.stderr():
784 <          out_box = 'OutputSandbox = { "' + \
785 <                    job.stdout() + '", ".BrokerInfo",'
786 <        else:
787 <          out_box = 'OutputSandbox = { "' + \
788 <                    job.stdout() + '", "' + \
789 <                    job.stderr() + '", ".BrokerInfo",'
790 <          pass
791 <
792 <        #if common.flag_return_data :
793 <        #    for fl in job.outputDataFiles():
794 <        #        out_box = out_box + ' "' + fl + '",'
795 <        #        pass
230 <        #    pass
231 <
232 <        if out_sandbox != None:
233 <            for fl in out_sandbox:
234 <                out_box = out_box + ' "' + fl + '",'
782 >        """
783 >        INDY
784 >        something similar should be also done for infiles (if it makes sense!)
785 >        """
786 >        # Stuff to be returned _always_ via sandbox
787 >        for fl in jbt.output_file_sandbox:
788 >            out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
789 >            pass
790 >        pass
791 >
792 >        # via sandbox iif required return_data
793 >        if int(self.return_data) == 1:
794 >            for fl in jbt.output_file:
795 >                out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
796                  pass
797              pass
798  
799          if out_box[-1] == ',' : out_box = out_box[:-1]
800 <        out_box = out_box + ' };'
801 <        jdl.write(out_box+'\n')
800 >        out_box = '<outfiles> <![CDATA[\n' + out_box + '\n]]></outfiles>\n'
801 >        xml.write(out_box)
802 >
803 >        xml.write('<BossAttr> crabjob.INTERNAL_ID=_ITR1_ </BossAttr>\n')
804  
805 <        # If CloseCE is used ...
806 <        #if common.flag_usecloseCE and job.inputDataFiles():
244 <        #    indata = 'InputData = { '
245 <        #    for fl in job.inputDataFiles():
246 <        #       indata = indata + ' "lfn:' + SPL + fl + '",'
247 <        #    if indata[-1] == ',' : indata = indata[:-1]
248 <        #    indata = indata + ' };'
249 <        #    jdl.write(indata+'\n')
250 <        #    jdl.write('DataAccessProtocol = { "gsiftp" };\n')
251 <
252 <        if common.analisys_common_info['sites']:
253 <           if common.analisys_common_info['sw_version']:
254 <
255 <             req='Requirements = '
256 <         ### First ORCA version
257 <             req=req + 'Member("VO-cms-' + \
258 <                 common.analisys_common_info['sw_version'] + \
259 <                 '", other.GlueHostApplicationSoftwareRunTimeEnvironment)'
260 <         ## then sites
261 <             if len(common.analisys_common_info['sites'])>0:
262 <               req = req + ' && ('
263 <             for i in range(len(common.analisys_common_info['sites'])):
264 <                req = req + 'other.GlueCEInfoHostName == "' \
265 <                      + common.analisys_common_info['sites'][i] + '"'
266 <                if ( i < (int(len(common.analisys_common_info['sites']) - 1)) ):
267 <                    req = req + ' || '
268 <             req = req + ')'
269 <         ## then user requirement
270 <             if self.EDG_requirements:
271 <               req = req +  ' && ' + self.EDG_requirements
272 <             req = req + ';\n'
273 <        jdl.write(req)
805 >        xml.write('</program>\n')
806 >        xml.write('</chain>\n')
807  
808 <        jdl.write('VirtualOrganisation = "' + self.VO + '";\n')
808 >        xml.write('</iterator>\n')
809 >        xml.write('</task>\n')
810  
811 <        if ( self.EDG_retry_count ):              
812 <            jdl.write('RetryCount = '+self.EDG_retry_count+';\n')
811 >        xml.close()
812 >      
813 >
814 >        return
815 >
816 >    def checkProxy(self):
817 >        """
818 >        Function to check the Globus proxy.
819 >        """
820 >        if (self.proxyValid): return
821 >
822 >        ### Just return if asked to do so
823 >        if (self.dontCheckProxy==1):
824 >            self.proxyValid=1
825 >            return
826 >
827 >        minTimeLeft=10*3600 # in seconds
828 >
829 >        minTimeLeftServer = 100 # in hours
830 >
831 >        mustRenew = 0
832 >        timeLeftLocal = runCommand('voms-proxy-info -timeleft 2>/dev/null')
833 >        timeLeftServer = -999
834 >        if not timeLeftLocal or int(timeLeftLocal) <= 0 or not isInt(timeLeftLocal):
835 >            mustRenew = 1
836 >        else:
837 >            timeLeftServer = runCommand('voms-proxy-info -actimeleft 2>/dev/null | head -1')
838 >            if not timeLeftServer or not isInt(timeLeftServer):
839 >                mustRenew = 1
840 >            elif timeLeftLocal<minTimeLeft or timeLeftServer<minTimeLeft:
841 >                mustRenew = 1
842              pass
843 +        pass
844  
845 <        jdl.close()
845 >        if mustRenew:
846 >            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")
847 >            cmd = 'voms-proxy-init -voms '+self.VO
848 >            if self.group:
849 >                cmd += ':/'+self.VO+'/'+self.group
850 >            if self.role:
851 >                cmd += '/role='+self.role
852 >            cmd += ' -valid 192:00'
853 >            try:
854 >                # SL as above: damn it!
855 >                common.logger.debug(10,cmd)
856 >                out = os.system(cmd)
857 >                if (out>0): raise CrabException("Unable to create a valid proxy!\n")
858 >            except:
859 >                msg = "Unable to create a valid proxy!\n"
860 >                raise CrabException(msg)
861 >            pass
862 >
863 >        ## now I do have a voms proxy valid, and I check the myproxy server
864 >        renewProxy = 0
865 >        cmd = 'myproxy-info -d -s '+self.proxyServer
866 >        cmd_out = runCommand(cmd,0,20)
867 >        if not cmd_out:
868 >            common.logger.message('No credential delegated to myproxy server '+self.proxyServer+' will do now')
869 >            renewProxy = 1
870 >        else:
871 >            ## minimum time: 5 days
872 >            minTime = 4 * 24 * 3600
873 >            ## regex to extract the right information
874 >            myproxyRE = re.compile("timeleft: (?P<hours>[\\d]*):(?P<minutes>[\\d]*):(?P<seconds>[\\d]*)")
875 >            for row in cmd_out.split("\n"):
876 >                g = myproxyRE.search(row)
877 >                if g:
878 >                    hours = g.group("hours")
879 >                    minutes = g.group("minutes")
880 >                    seconds = g.group("seconds")
881 >                    timeleft = int(hours)*3600 + int(minutes)*60 + int(seconds)
882 >                    if timeleft < minTime:
883 >                        renewProxy = 1
884 >                        common.logger.message('Your proxy will expire in:\n\t'+hours+' hours '+minutes+' minutes '+seconds+' seconds\n')
885 >                        common.logger.message('Need to renew it:')
886 >                    pass
887 >                pass
888 >            pass
889 >        
890 >        # if not, create one.
891 >        if renewProxy:
892 >            cmd = 'myproxy-init -d -n -s '+self.proxyServer
893 >            out = os.system(cmd)
894 >            if (out>0):
895 >                raise CrabException("Unable to delegate the proxy to myproxyserver "+self.proxyServer+" !\n")
896 >            pass
897 >
898 >        # cache proxy validity
899 >        self.proxyValid=1
900          return
901 +
902 +    def configOpt_(self):
903 +        edg_ui_cfg_opt = ' '
904 +        if self.edg_config:
905 +            edg_ui_cfg_opt = ' -c ' + self.edg_config + ' '
906 +        if self.edg_config_vo:
907 +            edg_ui_cfg_opt += ' --config-vo ' + self.edg_config_vo + ' '
908 +        return edg_ui_cfg_opt
909 +
910 +    def submitTout(self, list):
911 +        return 120
912 +
913 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines