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.62 by slacapra, Tue Jun 20 15:37:51 2006 UTC vs.
Revision 1.108 by slacapra, Wed Dec 6 10:27:30 2006 UTC

# Line 5 | Line 5 | 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 18 | 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:
27 <            RB = cfg_params["EDG.rb"]
28 <            edgConfig = EdgConfig(RB)
28 <            self.edg_config = edgConfig.config()
29 <            self.edg_config_vo = edgConfig.configVO()
27 >            RB=cfg_params["EDG.rb"]
28 >            self.rb_param_file=self.rb_configure(RB)
29          except KeyError:
30 <            self.edg_config = ''
31 <            self.edg_config_vo = ''
33 <
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  
43 –        try: self.EDG_requirements = cfg_params['EDG.requirements']
44 –        except KeyError: self.EDG_requirements = ''
45 –
46 –        try: self.EDG_retry_count = cfg_params['EDG.retry_count']
47 –        except KeyError: self.EDG_retry_count = ''
48 –
51          try:
52              self.EDG_ce_black_list = cfg_params['EDG.ce_black_list']
51 –            #print "self.EDG_ce_black_list = ", self.EDG_ce_black_list
53          except KeyError:
54              self.EDG_ce_black_list  = ''
55  
56          try:
57              self.EDG_ce_white_list = cfg_params['EDG.ce_white_list']
57 –            #print "self.EDG_ce_white_list = ", self.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.return_data = cfg_params['USER.return_data']
64 <        except KeyError: self.return_data = 1
65 <
66 <        try:
67 <             self.copy_input_data = common.analisys_common_info['copy_input_data']
68 <             #print "self.copy_input_data = ", self.copy_input_data
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 = 0
68 +
69          try:
70              self.copy_data = cfg_params["USER.copy_data"]
71              if int(self.copy_data) == 1:
# Line 128 | Line 126 | class SchedulerEdg(Scheduler):
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 158 | Line 162 | class SchedulerEdg(Scheduler):
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 >            groupReq = req
252 >            self.param='sched_param_'+str(i)+'.clad'
253              param_file = open(common.work_space.shareDir()+'/'+self.param, 'w')
254 <            param_file.write('RBconfig = "'+self.edg_config+'";\n')  
255 <            param_file.write('RBconfigVO = "'+self.edg_config_vo+'";')
254 >
255 >            itr4=self.findSites_(first[i])
256 >            for arg in itr4:
257 >                groupReq = groupReq + ' && anyMatch(other.storage.CloseSEs, ('+str(arg)+'))'
258 >            param_file.write('Requirements = '+groupReq +';\n')  
259 >  
260 >            if (self.rb_param_file != ''):
261 >                param_file.write(self.rb_param_file)  
262 >
263 >            if len(self.EDG_addJdlParam):
264 >                for p in self.EDG_addJdlParam:
265 >                    param_file.write(p)
266 >
267              param_file.close()  
268 <            return 1
176 <        else:
177 <            return 0
268 >
269  
270      def wsSetupEnvironment(self):
271          """
272          Returns part of a job script which does scheduler-specific work.
273          """
274          txt = ''
275 +        txt += '# strip arguments\n'
276 +        txt += 'echo "strip arguments"\n'
277 +        txt += 'args=("$@")\n'
278 +        txt += 'nargs=$#\n'
279 +        txt += 'shift $nargs\n'
280          txt += "# job number (first parameter for job wrapper)\n"
281 <        txt += "NJob=$1\n"
281 >        #txt += "NJob=$1\n"
282 >        txt += "NJob=${args[0]}\n"
283  
284          txt += '# job identification to DashBoard \n'
285 <        txt += 'echo "MonitorJobID=`echo ${NJob}_$EDG_WL_JOBID`" | tee -a $RUNTIME_AREA/$repo \n'
286 <        txt += 'echo "SyncGridJobId=`echo $EDG_WL_JOBID`" | tee -a $RUNTIME_AREA/$repo \n'
287 <        txt += 'echo "MonitorID=`echo ' + self._taskId + '`" | tee -a $RUNTIME_AREA/$repo\n'
285 >        txt += 'MonitorJobID=`echo ${NJob}_$EDG_WL_JOBID`\n'
286 >        txt += 'SyncGridJobId=`echo $EDG_WL_JOBID`\n'
287 >        txt += 'MonitorID=`echo ' + self._taskId + '`\n'
288 >        txt += 'echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
289 >        txt += 'echo "SyncGridJobId=`echo $SyncGridJobId`" | tee -a $RUNTIME_AREA/$repo \n'
290 >        txt += 'echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
291  
292          txt += 'echo "middleware discovery " \n'
293 <        txt += 'if [ $VO_CMS_SW_DIR ]; then \n'
194 <        txt += '    middleware=LCG \n'
195 <        txt += '    echo "SyncCE=`edg-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
196 <        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
197 <        txt += '    echo "middleware =$middleware" \n'
198 <        txt += 'elif [ $GRID3_APP_DIR ]; then\n'
293 >        txt += 'if [ $GRID3_APP_DIR ]; then\n'
294          txt += '    middleware=OSG \n'
295          txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
296          txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
# Line 205 | Line 300 | class SchedulerEdg(Scheduler):
300          txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
301          txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
302          txt += '    echo "middleware =$middleware" \n'
303 +        txt += 'elif [ $VO_CMS_SW_DIR ]; then \n'
304 +        txt += '    middleware=LCG \n'
305 +        txt += '    echo "SyncCE=`edg-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
306 +        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
307 +        txt += '    echo "middleware =$middleware" \n'
308          txt += 'else \n'
309          txt += '    echo "SET_CMS_ENV 10030 ==> middleware not identified" \n'
310          txt += '    echo "JOB_EXIT_STATUS = 10030" \n'
311          txt += '    echo "JobExitCode=10030" | tee -a $RUNTIME_AREA/$repo \n'
312          txt += '    dumpStatus $RUNTIME_AREA/$repo \n'
313 +        txt += '    rm -f $RUNTIME_AREA/$repo \n'
314 +        txt += '    echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
315 +        txt += '    echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
316          txt += '    exit 1 \n'
317          txt += 'fi \n'
318  
319          txt += '# report first time to DashBoard \n'
320          txt += 'dumpStatus $RUNTIME_AREA/$repo \n'
321 <
321 >        txt += 'rm -f $RUNTIME_AREA/$repo \n'
322 >        txt += 'echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
323 >        txt += 'echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
324 >        
325          txt += '\n\n'
326  
327          if int(self.copy_data) == 1:
# Line 228 | Line 334 | class SchedulerEdg(Scheduler):
334                txt += 'echo "SE_PATH = $SE_PATH"\n'
335  
336          txt += 'export VO='+self.VO+'\n'
337 <        ### FEDE: add some line for LFC catalog setting
337 >        ### add some line for LFC catalog setting
338          txt += 'if [ $middleware == LCG ]; then \n'
339          txt += '    if [[ $LCG_CATALOG_TYPE != \''+self.lcg_catalog_type+'\' ]]; then\n'
340          txt += '        export LCG_CATALOG_TYPE='+self.lcg_catalog_type+'\n'
# Line 281 | Line 387 | class SchedulerEdg(Scheduler):
387          txt += '        echo "JOB_EXIT_STATUS = 10099" \n'
388          txt += '        echo "JobExitCode=10099" | tee -a $RUNTIME_AREA/$repo \n'
389          txt += '        dumpStatus $RUNTIME_AREA/$repo \n'
390 +        txt += '        rm -f $RUNTIME_AREA/$repo \n'
391 +        txt += '        echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
392 +        txt += '        echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
393          txt += '        exit 1 \n'
394          txt += '    fi \n'
395          txt += 'fi \n'
# Line 292 | Line 401 | class SchedulerEdg(Scheduler):
401          Copy input data from SE to WN    
402          """
403          txt = ''
404 <        try:
405 <            self.copy_input_data = common.analisys_common_info['copy_input_data']
297 <            #print "self.copy_input_data = ", self.copy_input_data
298 <        except KeyError: self.copy_input_data = 0
299 <        if int(self.copy_input_data) == 1:
404 >        if not self.copy_input_data: return txt
405 >
406          ## OLI_Daniele deactivate for OSG (wait for LCG UI installed on OSG)
407 <           txt += 'if [ $middleware == OSG ]; then\n'
408 <           txt += '   #\n'
409 <           txt += '   #   Copy Input Data from SE to this WN deactivated in OSG mode\n'
410 <           txt += '   #\n'
411 <           txt += '   echo "Copy Input Data from SE to this WN deactivated in OSG mode"\n'
412 <           txt += 'elif [ $middleware == LCG ]; then \n'
413 <           txt += '   #\n'
414 <           txt += '   #   Copy Input Data from SE to this WN\n'
415 <           txt += '   #\n'
416 < ### changed by georgia (put a loop copying more than one input files per jobs)          
417 <           txt += '   for input_file in $cur_file_list \n'
418 <           txt += '   do \n'
419 <           txt += '    lcg-cp --vo $VO lfn:$input_lfn/$input_file file:`pwd`/$input_file 2>&1\n'
420 <           txt += '    copy_input_exit_status=$?\n'
421 <           txt += '    echo "COPY_INPUT_EXIT_STATUS = $copy_input_exit_status"\n'
422 <           txt += '    if [ $copy_input_exit_status -ne 0 ]; then \n'
423 <           txt += '       echo "Problems with copying to WN" \n'
424 <           txt += '    else \n'
425 <           txt += '       echo "input copied into WN" \n'
426 <           txt += '    fi \n'
427 <           txt += '   done \n'
428 < ### copy a set of PU ntuples (same for each jobs -- but accessed randomly)
429 <           txt += '   for file in $cur_pu_list \n'
430 <           txt += '   do \n'
431 <           txt += '    lcg-cp --vo $VO lfn:$pu_lfn/$file file:`pwd`/$file 2>&1\n'
432 <           txt += '    copy_input_exit_status=$?\n'
433 <           txt += '    echo "COPY_INPUT_PU_EXIT_STATUS = $copy_input_pu_exit_status"\n'
434 <           txt += '    if [ $copy_input_pu_exit_status -ne 0 ]; then \n'
435 <           txt += '       echo "Problems with copying pu to WN" \n'
436 <           txt += '    else \n'
437 <           txt += '       echo "input pu files copied into WN" \n'
438 <           txt += '    fi \n'
439 <           txt += '   done \n'
440 <           txt += '   \n'
441 <           txt += '   ### Check SCRATCH space available on WN : \n'
442 <           txt += '   df -h \n'
443 <           txt += 'fi \n'
407 >        txt += 'if [ $middleware == OSG ]; then\n'
408 >        txt += '   #\n'
409 >        txt += '   #   Copy Input Data from SE to this WN deactivated in OSG mode\n'
410 >        txt += '   #\n'
411 >        txt += '   echo "Copy Input Data from SE to this WN deactivated in OSG mode"\n'
412 >        txt += 'elif [ $middleware == LCG ]; then \n'
413 >        txt += '   #\n'
414 >        txt += '   #   Copy Input Data from SE to this WN\n'
415 >        txt += '   #\n'
416 >        ### changed by georgia (put a loop copying more than one input files per jobs)          
417 >        txt += '   for input_file in $cur_file_list \n'
418 >        txt += '   do \n'
419 >        txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$input_lfn/$input_file file:`pwd`/$input_file 2>&1\n'
420 >        txt += '      copy_input_exit_status=$?\n'
421 >        txt += '      echo "COPY_INPUT_EXIT_STATUS = $copy_input_exit_status"\n'
422 >        txt += '      if [ $copy_input_exit_status -ne 0 ]; then \n'
423 >        txt += '         echo "Problems with copying to WN" \n'
424 >        txt += '      else \n'
425 >        txt += '         echo "input copied into WN" \n'
426 >        txt += '      fi \n'
427 >        txt += '   done \n'
428 >        ### copy a set of PU ntuples (same for each jobs -- but accessed randomly)
429 >        txt += '   for file in $cur_pu_list \n'
430 >        txt += '   do \n'
431 >        txt += '      lcg-cp --vo $VO --verbose -t 1200 lfn:$pu_lfn/$file file:`pwd`/$file 2>&1\n'
432 >        txt += '      copy_input_pu_exit_status=$?\n'
433 >        txt += '      echo "COPY_INPUT_PU_EXIT_STATUS = $copy_input_pu_exit_status"\n'
434 >        txt += '      if [ $copy_input_pu_exit_status -ne 0 ]; then \n'
435 >        txt += '         echo "Problems with copying pu to WN" \n'
436 >        txt += '      else \n'
437 >        txt += '         echo "input pu files copied into WN" \n'
438 >        txt += '      fi \n'
439 >        txt += '   done \n'
440 >        txt += '   \n'
441 >        txt += '   ### Check SCRATCH space available on WN : \n'
442 >        txt += '   df -h \n'
443 >        txt += 'fi \n'
444            
445          return txt
446  
# Line 348 | Line 454 | class SchedulerEdg(Scheduler):
454             txt += '#\n'
455             txt += '#   Copy output to SE = $SE\n'
456             txt += '#\n'
457 <           txt += 'if [ $exe_result -eq 0 ]; then\n'
457 >           txt += '    if [ $middleware == OSG ]; then\n'
458 >           txt += '        echo "X509_USER_PROXY = $X509_USER_PROXY"\n'
459 >           txt += '        echo "source $OSG_APP/glite/setup_glite_ui.sh"\n'
460 >           txt += '        source $OSG_APP/glite/setup_glite_ui.sh\n'
461 >           txt += '        export X509_CERT_DIR=$OSG_APP/glite/etc/grid-security/certificates\n'
462 >           txt += '        echo "export X509_CERT_DIR=$X509_CERT_DIR"\n'
463 >           txt += '    fi \n'
464 >
465             txt += '    for out_file in $file_list ; do\n'
466 <           txt += '        echo "Trying to copy output file to $SE "\n'
467 <           ## OLI_Daniele globus-* for OSG, lcg-* for LCG
468 <           txt += '        if [ $middleware == OSG ]; then\n'
469 <           txt += '           echo "globus-url-copy file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
470 <           txt += '           copy_exit_status=`globus-url-copy file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
471 <           #txt += '           exitstring=`globus-url-copy file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
472 <           txt += '        elif [ $middleware == LCG ]; then \n'
473 <           txt += '           echo "lcg-cp --vo cms -t 1200 file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
474 <           txt += '           copy_exit_status=`lcg-cp --vo cms -t 1200 file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
475 <           #txt += '           exitstring=`lcg-cp --vo cms -t 30 file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
476 <           txt += '        fi \n'
477 <           #txt += '        copy_exit_status=$?\n'
365 <           txt += '        echo "COPY_EXIT_STATUS = $copy_exit_status"\n'
466 >           txt += '        echo "Trying to copy output file to $SE using srmcp"\n'
467 >           txt += '        echo "mkdir -p $HOME/.srmconfig"\n'
468 >           txt += '        mkdir -p $HOME/.srmconfig\n'
469 >           txt += '        if [ $middleware == LCG ]; then\n'
470 >           txt += '           echo "srmcp -retry_num 3 -retry_timeout 480000 file:////`pwd`/$out_file srm://${SE}:8443${SE_PATH}$out_file"\n'
471 >           txt += '           exitstring=`srmcp -retry_num 3 -retry_timeout 480000 file:////\`pwd\`/$out_file srm://${SE}:8443${SE_PATH}$out_file 2>&1`\n'
472 >           txt += '        elif [ $middleware == OSG ]; then\n'
473 >           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'
474 >           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'
475 >           txt += '        fi \n'
476 >           txt += '        copy_exit_status=$?\n'
477 >           txt += '        echo "COPY_EXIT_STATUS for srmcp = $copy_exit_status"\n'
478             txt += '        echo "STAGE_OUT = $copy_exit_status"\n'
479 +
480             txt += '        if [ $copy_exit_status -ne 0 ]; then\n'
481 <           txt += '            echo "Problems with SE = $SE"\n'
481 >           txt += '            echo "Possible problem with SE = $SE"\n'
482             txt += '            echo "StageOutExitStatus = 198" | tee -a $RUNTIME_AREA/$repo\n'
483             txt += '            echo "StageOutExitStatusReason = $exitstring" | tee -a $RUNTIME_AREA/$repo\n'
484 +           txt += '            echo "srmcp failed, attempting lcg-cp."\n'
485 +           if common.logger.debugLevel() >= 5:
486 +               txt += '            echo "lcg-cp --vo $VO -t 2400 --verbose file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
487 +               txt += '            exitstring=`lcg-cp --vo $VO -t 2400 --verbose file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
488 +           else:              
489 +               txt += '            echo "lcg-cp --vo $VO -t 2400 file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
490 +               txt += '            exitstring=`lcg-cp --vo $VO -t 2400 file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
491 +           txt += '            copy_exit_status=$?\n'
492 +           txt += '            echo "COPY_EXIT_STATUS for lcg-cp = $copy_exit_status"\n'
493 +           txt += '            echo "STAGE_OUT = $copy_exit_status"\n'
494 +
495 +           txt += '            if [ $copy_exit_status -ne 0 ]; then\n'
496 +           txt += '               echo "Problems with SE = $SE"\n'
497 +           txt += '               echo "StageOutExitStatus = 198" | tee -a $RUNTIME_AREA/$repo\n'
498 +           txt += '               echo "StageOutExitStatusReason = $exitstring" | tee -a $RUNTIME_AREA/$repo\n'
499 +           txt += '               echo "srmcp and lcg-cp and failed!"\n'
500 +           txt += '            else\n'
501 +           txt += '               echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
502 +           txt += '               echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
503 +           txt += '               echo "output copied into $SE/$SE_PATH directory"\n'
504 +           txt += '               echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
505 +           txt += '               echo "lcg-cp succeeded"\n'
506 +           txt += '            fi\n'
507             txt += '        else\n'
508             txt += '            echo "StageOutSE = $SE" | tee -a $RUNTIME_AREA/$repo\n'
509             txt += '            echo "StageOutCatalog = " | tee -a $RUNTIME_AREA/$repo\n'
510             txt += '            echo "output copied into $SE/$SE_PATH directory"\n'
511             txt += '            echo "StageOutExitStatus = 0" | tee -a $RUNTIME_AREA/$repo\n'
512 +           txt += '            echo "srmcp succeeded"\n'
513             txt += '         fi\n'
514             txt += '     done\n'
378 –           txt += 'fi\n'
515          return txt
516  
517      def wsRegisterOutput(self):
# Line 395 | Line 531 | class SchedulerEdg(Scheduler):
531             txt += '#\n'
532             txt += '#  Register output to LFC\n'
533             txt += '#\n'
534 <           txt += '   if [[ $exe_result -eq 0 && $copy_exit_status -eq 0 ]]; then\n'
534 >           txt += '   if [ $copy_exit_status -eq 0 ]; then\n'
535             txt += '      for out_file in $file_list ; do\n'
536             txt += '         echo "Trying to register the output file into LFC"\n'
537 <           txt += '         echo "lcg-rf -l $LFN/$out_file --vo $VO sfn://$SE$SE_PATH/$out_file"\n'
538 <           txt += '         lcg-rf -l $LFN/$out_file --vo $VO sfn://$SE$SE_PATH/$out_file 2>&1 \n'
537 >           txt += '         echo "lcg-rf -l $LFN/$out_file --vo $VO -t 1200 sfn://$SE$SE_PATH/$out_file 2>&1"\n'
538 >           txt += '         lcg-rf -l $LFN/$out_file --vo $VO -t 1200 sfn://$SE$SE_PATH/$out_file 2>&1 \n'
539             txt += '         register_exit_status=$?\n'
540             txt += '         echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
541             txt += '         echo "STAGE_OUT = $register_exit_status"\n'
542             txt += '         if [ $register_exit_status -ne 0 ]; then \n'
543             txt += '            echo "Problems with the registration to LFC" \n'
544             txt += '            echo "Try with srm protocol" \n'
545 <           txt += '            echo "lcg-rf -l $LFN/$out_file --vo $VO srm://$SE$SE_PATH/$out_file"\n'
546 <           txt += '            lcg-rf -l $LFN/$out_file --vo $VO srm://$SE$SE_PATH/$out_file 2>&1 \n'
545 >           txt += '            echo "lcg-rf -l $LFN/$out_file --vo $VO -t 1200 srm://$SE$SE_PATH/$out_file 2>&1"\n'
546 >           txt += '            lcg-rf -l $LFN/$out_file --vo $VO -t 1200 srm://$SE$SE_PATH/$out_file 2>&1 \n'
547             txt += '            register_exit_status=$?\n'
548             txt += '            echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
549             txt += '            echo "STAGE_OUT = $register_exit_status"\n'
# Line 419 | Line 555 | class SchedulerEdg(Scheduler):
555             txt += '         fi \n'
556             txt += '         echo "StageOutExitStatus = $register_exit_status" | tee -a $RUNTIME_AREA/$repo\n'
557             txt += '      done\n'
558 <           txt += '   elif [[ $exe_result -eq 0 && $copy_exit_status -ne 0 ]]; then \n'
558 >           txt += '   else \n'
559             txt += '      echo "Trying to copy output file to CloseSE"\n'
560             txt += '      CLOSE_SE=`edg-brokerinfo getCloseSEs | head -1`\n'
561             txt += '      for out_file in $file_list ; do\n'
562 <           txt += '         echo "lcg-cr -v -l lfn:${LFN}/$out_file -d $CLOSE_SE -P $LFN/$out_file --vo $VO file://`pwd`/$out_file" \n'
563 <           txt += '         lcg-cr -v -l lfn:${LFN}/$out_file -d $CLOSE_SE -P $LFN/$out_file --vo $VO file://`pwd`/$out_file 2>&1 \n'
562 >           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'
563 >           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'
564             txt += '         register_exit_status=$?\n'
565             txt += '         echo "REGISTER_EXIT_STATUS = $register_exit_status"\n'
566             txt += '         echo "STAGE_OUT = $register_exit_status"\n'
567             txt += '         if [ $register_exit_status -ne 0 ]; then \n'
568 <           txt += '            echo "Problems with CloseSE" \n'
568 >           txt += '            echo "Problems with CloseSE or Catalog" \n'
569             txt += '         else \n'
570             txt += '            echo "The program was successfully executed"\n'
571             txt += '            echo "SE = $CLOSE_SE"\n'
# Line 437 | Line 573 | class SchedulerEdg(Scheduler):
573             txt += '         fi \n'
574             txt += '         echo "StageOutExitStatus = $register_exit_status" | tee -a $RUNTIME_AREA/$repo\n'
575             txt += '      done\n'
440 –           txt += '   else\n'
441 –           txt += '      echo "Problem with the executable"\n'
576             txt += '   fi \n'
577 +           txt += '   exit_status=$register_exit_status\n'
578             txt += 'fi \n'
579          return txt
580  
# Line 449 | Line 584 | class SchedulerEdg(Scheduler):
584          """
585          self.checkProxy()
586          cmd = 'edg-job-get-logging-info -v 2 ' + id
452 –        #cmd_out = os.popen(cmd)
587          cmd_out = runCommand(cmd)
588          return cmd_out
589  
456 –    def listMatch(self, nj):
457 –        """
458 –        Check the compatibility of available resources
459 –        """
460 –        self.checkProxy()
461 –        jdl = common.job_list[nj].jdlFilename()
462 –        cmd = 'edg-job-list-match ' + self.configOpt_() + jdl
463 –        cmd_out = runCommand(cmd,0,10)
464 –        if not cmd_out:
465 –            raise CrabException("ERROR: "+cmd+" failed!")
466 –
467 –        return self.parseListMatch_(cmd_out, jdl)
468 –
469 –    def parseListMatch_(self, out, jdl):
470 –        """
471 –        Parse the f* output of edg-list-match and produce something sensible
472 –        """
473 –        reComment = re.compile( r'^\**$' )
474 –        reEmptyLine = re.compile( r'^$' )
475 –        reVO = re.compile( r'Selected Virtual Organisation name.*' )
476 –        reLine = re.compile( r'.*')
477 –        reCE = re.compile( r'(.*:.*)')
478 –        reCEId = re.compile( r'CEId.*')
479 –        reNO = re.compile( r'No Computing Element matching' )
480 –        reRB = re.compile( r'Connecting to host' )
481 –        next = 0
482 –        CEs=[]
483 –        Match=0
484 –
485 –        #print out
486 –        lines = reLine.findall(out)
487 –
488 –        i=0
489 –        CEs=[]
490 –        for line in lines:
491 –            string.strip(line)
492 –            #print line
493 –            if reNO.match( line ):
494 –                common.logger.debug(5,line)
495 –                return 0
496 –                pass
497 –            if reVO.match( line ):
498 –                VO =reVO.match( line ).group()
499 –                common.logger.debug(5,"VO "+VO)
500 –                pass
501 –
502 –            if reRB.match( line ):
503 –                RB = reRB.match(line).group()
504 –                common.logger.debug(5,"RB "+RB)
505 –                pass
506 –
507 –            if reCEId.search( line ):
508 –                for lineCE in lines[i:-1]:
509 –                    if reCE.match( lineCE ):
510 –                        CE = string.strip(reCE.search(lineCE).group(1))
511 –                        CEs.append(CE.split(':')[0])
512 –                        pass
513 –                    pass
514 –                pass
515 –            i=i+1
516 –            pass
517 –
518 –        common.logger.debug(5,"All CE :"+str(CEs))
519 –
520 –        sites = []
521 –        [sites.append(it) for it in CEs if not sites.count(it)]
522 –
523 –        common.logger.debug(5,"All Sites :"+str(sites))
524 –        common.logger.message("Matched Sites :"+str(sites))
525 –        return len(sites)
526 –
527 –    def noMatchFound_(self, jdl):
528 –        reReq = re.compile( r'Requirements' )
529 –        reString = re.compile( r'"\S*"' )
530 –        f = file(jdl,'r')
531 –        for line in f.readlines():
532 –            line= line.strip()
533 –            if reReq.match(line):
534 –                for req in reString.findall(line):
535 –                    if re.search("VO",req):
536 –                        common.logger.message( "SW required: "+req)
537 –                        continue
538 –                    if re.search('"\d+',req):
539 –                        common.logger.message("Other req  : "+req)
540 –                        continue
541 –                    common.logger.message( "CE required: "+req)
542 –                break
543 –            pass
544 –        raise CrabException("No compatible resources found!")
545 –
546 –    def submit(self, nj):
547 –        """
548 –        Submit one EDG job.
549 –        """
550 –
551 –        self.checkProxy()
552 –        jid = None
553 –        jdl = common.job_list[nj].jdlFilename()
554 –
555 –        cmd = 'edg-job-submit ' + self.configOpt_() + jdl
556 –        cmd_out = runCommand(cmd)
557 –        if cmd_out != None:
558 –            reSid = re.compile( r'https.+' )
559 –            jid = reSid.search(cmd_out).group()
560 –            pass
561 –        return jid
562 –
563 –    def resubmit(self, nj_list):
564 –        """
565 –        Prepare jobs to be submit
566 –        """
567 –        return
568 –
569 –    def getExitStatus(self, id):
570 –        return self.getStatusAttribute_(id, 'exit_code')
571 –
572 –    def queryStatus(self, id):
573 –        return self.getStatusAttribute_(id, 'status')
574 –
575 –    def queryDest(self, id):  
576 –        return self.getStatusAttribute_(id, 'destination')
577 –
578 –
579 –    def getStatusAttribute_(self, id, attr):
580 –        """ Query a status of the job with id """
581 –
582 –        self.checkProxy()
583 –        hstates = {}
584 –        Status = importName('edg_wl_userinterface_common_LbWrapper', 'Status')
585 –        # Bypass edg-job-status interfacing directly to C++ API
586 –        # Job attribute vector to retrieve status without edg-job-status
587 –        level = 0
588 –        # Instance of the Status class provided by LB API
589 –        jobStat = Status()
590 –        st = 0
591 –        jobStat.getStatus(id, level)
592 –        err, apiMsg = jobStat.get_error()
593 –        if err:
594 –            common.logger.debug(5,'Error caught' + apiMsg)
595 –            return None
596 –        else:
597 –            for i in range(len(self.states)):
598 –                # Fill an hash table with all information retrieved from LB API
599 –                hstates[ self.states[i] ] = jobStat.loadStatus(st)[i]
600 –            result = jobStat.loadStatus(st)[ self.states.index(attr) ]
601 –            return result
602 –
590      def queryDetailedStatus(self, id):
591          """ Query a detailed status of the job with id """
592          cmd = 'edg-job-status '+id
593          cmd_out = runCommand(cmd)
594          return cmd_out
595  
596 <    def getOutput(self, id):
596 >    ##### FEDE ######        
597 >    def findSites_(self, n):
598 >        itr4 =[]
599 >        sites = common.jobDB.destination(n)
600 >        if len(sites)>0 and sites[0]=="Any":
601 >            return itr4
602 >        itr = ''
603 >        if sites != [""]:#CarlosDaniele
604 >            for site in sites:
605 >                #itr = itr + 'target.GlueSEUniqueID==&quot;'+site+'&quot; || '
606 >                itr = itr + 'target.GlueSEUniqueID=="'+site+'" || '
607 >            itr = itr[0:-4]
608 >            itr4.append( itr )
609 >        return itr4
610 >
611 >    def createXMLSchScript(self, nj, argsList):
612 >      
613          """
614 <        Get output for a finished job with id.
612 <        Returns the name of directory with results.
614 >        Create a XML-file for BOSS4.
615          """
616 <
615 <        self.checkProxy()
616 <        cmd = 'edg-job-get-output --dir ' + common.work_space.resDir() + ' ' + id
617 <        cmd_out = runCommand(cmd)
618 <
619 <        # Determine the output directory name
620 <        dir = common.work_space.resDir()
621 <        dir += os.environ['USER']
622 <        dir += '_' + os.path.basename(id)
623 <        return dir
624 <
625 <    def cancel(self, id):
626 <        """ Cancel the EDG job with id """
627 <        self.checkProxy()
628 <        cmd = 'edg-job-cancel --noint ' + id
629 <        cmd_out = runCommand(cmd)
630 <        return cmd_out
631 <
632 <    def createSchScript(self, nj):
616 >  #      job = common.job_list[nj]
617          """
618 <        Create a JDL-file for EDG.
618 >        INDY
619 >        [begin] FIX-ME:
620 >        I would pass jobType instead of job
621          """
622 <
623 <        job = common.job_list[nj]
622 >        index = nj - 1
623 >        job = common.job_list[index]
624          jbt = job.type()
639 –        inp_sandbox = jbt.inputSandbox(nj)
640 –        out_sandbox = jbt.outputSandbox(nj)
641 –        inp_storage_subdir = ''
625          
626 <        title = '# This JDL was generated by '+\
627 <                common.prog_name+' (version '+common.prog_version_str+')\n'
626 >        inp_sandbox = jbt.inputSandbox(index)
627 >        out_sandbox = jbt.outputSandbox(index)
628 >        """
629 >        [end] FIX-ME
630 >        """
631 >
632 >        
633 >        title = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'
634          jt_string = ''
635 +        
636 +        xml_fname = str(self.jobtypeName)+'.xml'
637 +        xml = open(common.work_space.shareDir()+'/'+xml_fname, 'a')
638 +
639 +        #TaskName  
640 +        dir = string.split(common.work_space.topDir(), '/')
641 +        taskName = dir[len(dir)-2]
642 +  
643 +        to_writeReq = ''
644 +        to_write = ''
645 +
646 +        req=' '
647 +        req = req + jbt.getRequirements()
648 +
649 +        if self.EDG_requirements:
650 +            if (req == ' '):
651 +                req = req + self.EDG_requirements
652 +            else:
653 +                req = req +  ' && ' + self.EDG_requirements
654 +        if self.EDG_ce_white_list:
655 +            ce_white_list = string.split(self.EDG_ce_white_list,',')
656 +            for i in range(len(ce_white_list)):
657 +                if i == 0:
658 +                    if (req == ' '):
659 +                        req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
660 +                    else:
661 +                        req = req +  ' && ((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
662 +                    pass
663 +                else:
664 +                    req = req +  ' || (RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
665 +            req = req + ')'
666 +        
667 +        if self.EDG_ce_black_list:
668 +            ce_black_list = string.split(self.EDG_ce_black_list,',')
669 +            for ce in ce_black_list:
670 +                if (req == ' '):
671 +                    req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
672 +                else:
673 +                    req = req +  ' && (!RegExp("' + ce + '", other.GlueCEUniqueId))'
674 +                pass
675 +        if self.EDG_clock_time:
676 +            if (req == ' '):
677 +                req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
678 +            else:
679 +                req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
680  
681 +        if self.EDG_cpu_time:
682 +            if (req == ' '):
683 +                req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
684 +            else:
685 +                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
686 +                                                                                          
687 +        if ( self.EDG_retry_count ):              
688 +            to_write = to_write + 'RetryCount = "'+self.EDG_retry_count+'"\n'
689 +            pass
690 +
691 +        if ( self.EDG_shallow_retry_count ):              
692 +            to_write = to_write + 'ShallowRetryCount = "'+self.EDG_shallow_retry_count+'"\n'
693 +            pass
694  
695 +        to_write = to_write + 'MyProxyServer = "&quot;' + self.proxyServer + '&quot;"\n'
696 +        to_write = to_write + 'VirtualOrganisation = "&quot;' + self.VO + '&quot;"\n'
697 +
698 +        #TaskName  
699 +        dir = string.split(common.work_space.topDir(), '/')
700 +        taskName = dir[len(dir)-2]
701 +
702 +        xml.write(str(title))
703 +        xml.write('<task name="' +str(taskName)+'" sub_path="' + common.work_space.bossCache() + '">\n')
704 +        xml.write(jt_string)
705          
706 <        SPL = inp_storage_subdir
707 <        if ( SPL and SPL[-1] != '/' ) : SPL = SPL + '/'
706 >        if (to_write != ''):
707 >            xml.write('<extraTags\n')
708 >            xml.write(to_write)
709 >            xml.write('/>\n')
710 >            pass
711  
712 <        jdl_fname = job.jdlFilename()
713 <        jdl = open(jdl_fname, 'w')
714 <        jdl.write(title)
712 >        xml.write('<iterator>\n')
713 >        xml.write('\t<iteratorRule name="ITR1">\n')
714 >        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ' </ruleElement>\n')
715 >        xml.write('\t</iteratorRule>\n')
716 >        xml.write('\t<iteratorRule name="ITR2">\n')
717 >        for arg in argsList:
718 >            xml.write('\t\t<ruleElement> <![CDATA[\n'+ arg + '\n\t\t]]> </ruleElement>\n')
719 >            pass
720 >        xml.write('\t</iteratorRule>\n')
721 >        #print jobList
722 >        xml.write('\t<iteratorRule name="ITR3">\n')
723 >        xml.write('\t\t<ruleElement> 1:'+ str(nj) + ':1:6 </ruleElement>\n')
724 >        xml.write('\t</iteratorRule>\n')
725 >
726 >        '''
727 >        indy: here itr4
728 >        '''
729 >        
730  
731 <        script = job.scriptFilename()
732 <        jdl.write('Executable = "' + os.path.basename(script) +'";\n')
658 <        jdl.write(jt_string)
731 >        xml.write('<chain scheduler="'+str(self.schedulerName)+'">\n')
732 >        xml.write(jt_string)
733  
734 <        ### only one .sh  JDL has arguments:
734 >        #executable
735  
736 <        ### Fabio
737 <        jdl.write('Arguments = "' + str(nj+1)+' '+ jbt.getJobTypeArguments(nj, "EDG") +'";\n')
738 <        inp_box = 'InputSandbox = { '
739 <        inp_box = inp_box + '"' + script + '",'
736 >        """
737 >        INDY
738 >        script depends on jobType: it should be probably get in a different way
739 >        """        
740 >        script = job.scriptFilename()
741 >        xml.write('<program>\n')
742 >        xml.write('<exec> ' + os.path.basename(script) +' </exec>\n')
743 >        xml.write(jt_string)
744 >
745 >        xml.write('<args> <![CDATA[\n _ITR2_ \n]]> </args>\n')
746 >        xml.write('<program_types> crabjob </program_types>\n')
747 >        inp_box = common.work_space.pathForTgz() + 'job/' + jbt.scriptName + ','
748  
749          if inp_sandbox != None:
750              for fl in inp_sandbox:
751 <                inp_box = inp_box + ' "' + fl + '",'
751 >                inp_box = inp_box + '' + fl + ','
752                  pass
753              pass
754  
673 –        #if common.use_jam:
674 –        #   inp_box = inp_box+' "'+common.bin_dir+'/'+common.run_jam+'",'
675 –
676 –        # Marco (VERY TEMPORARY ML STUFF)
677 –        inp_box = inp_box+' "' + os.path.abspath(os.environ['CRABDIR']+'/python/'+'report.py') + '", "' +\
678 –                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'DashboardAPI.py') + '", "'+\
679 –                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'Logger.py') + '", "'+\
680 –                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'ProcInfo.py') + '", "'+\
681 –                  os.path.abspath(os.environ['CRABDIR']+'/python/'+'apmon.py') + '"'
682 –        # End Marco
683 –
755          if (not jbt.additional_inbox_files == []):
756 <            inp_box = inp_box + ', '
756 >            inp_box = inp_box + ','
757              for addFile in jbt.additional_inbox_files:
758                  addFile = os.path.abspath(addFile)
759 <                inp_box = inp_box+' "'+addFile+'",'
759 >                inp_box = inp_box+''+addFile+','
760                  pass
761  
762          if inp_box[-1] == ',' : inp_box = inp_box[:-1]
763 <        inp_box = inp_box + ' };\n'
764 <        jdl.write(inp_box)
694 <
695 <        jdl.write('StdOutput     = "' + job.stdout() + '";\n')
696 <        jdl.write('StdError      = "' + job.stderr() + '";\n')
763 >        inp_box = '<infiles> <![CDATA[\n' + inp_box + '\n]]> </infiles>\n'
764 >        xml.write(inp_box)
765          
766 +        base = jbt.name()
767 +        stdout = base + '__ITR3_.stdout'
768 +        stderr = base + '__ITR3_.stderr'
769          
770 <        if job.stdout() == job.stderr():
771 <          out_box = 'OutputSandbox = { "' + \
772 <                    job.stdout() + '", ".BrokerInfo",'
773 <        else:
774 <          out_box = 'OutputSandbox = { "' + \
775 <                    job.stdout() + '", "' + \
705 <                    job.stderr() + '", ".BrokerInfo",'
770 >        xml.write('<stderr> ' + stderr + '</stderr>\n')
771 >        xml.write('<stdout> ' + stdout + '</stdout>\n')
772 >        
773 >
774 >        out_box = stdout + ',' + \
775 >                  stderr + ',.BrokerInfo,'
776  
777 +        """
778          if int(self.return_data) == 1:
779              if out_sandbox != None:
780                  for fl in out_sandbox:
781 <                    out_box = out_box + ' "' + fl + '",'
781 >                    out_box = out_box + '' + fl + ','
782                      pass
783                  pass
784              pass
785 <                                                                                                                                                            
715 <        if out_box[-1] == ',' : out_box = out_box[:-1]
716 <        out_box = out_box + ' };'
717 <        jdl.write(out_box+'\n')
785 >        """
786  
787 +        """
788 +        INDY
789 +        something similar should be also done for infiles (if it makes sense!)
790 +        """
791 +        # Stuff to be returned _always_ via sandbox
792 +        for fl in jbt.output_file_sandbox:
793 +            out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
794 +            pass
795 +        pass
796  
797 <        req='Requirements = '
798 <        noreq=req
799 <        req = req + jbt.getRequirements()
800 <        #### and USER REQUIREMENT
724 <        if self.EDG_requirements:
725 <            if (req != noreq):
726 <                req = req +  ' && '
727 <            req = req + self.EDG_requirements
728 <        #### FEDE #####
729 <        if self.EDG_ce_white_list:
730 <            ce_white_list = string.split(self.EDG_ce_white_list,',')
731 <            #print "req = ", req
732 <            for i in range(len(ce_white_list)):
733 <                if i == 0:
734 <                    if (req != noreq):
735 <                        req = req +  ' && '
736 <                    req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
737 <                    pass
738 <                else:
739 <                    req = req +  ' || (RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
740 <            req = req + ')'
741 <        
742 <        if self.EDG_ce_black_list:
743 <            ce_black_list = string.split(self.EDG_ce_black_list,',')
744 <            for ce in ce_black_list:
745 <                if (req != noreq):
746 <                    req = req +  ' && '
747 <                req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
797 >        # via sandbox iif required return_data
798 >        if int(self.return_data) == 1:
799 >            for fl in jbt.output_file:
800 >                out_box = out_box + '' + jbt.numberFile_(fl, '_ITR1_') + ','
801                  pass
802 +            pass
803  
804 <        ###############
805 <        clockTime=480
806 <        if self.EDG_clock_time:
807 <            clockTime= self.EDG_clock_time
808 <        if (req != noreq):
755 <            req = req + ' && '
756 <        req = req + '((other.GlueCEPolicyMaxWallClockTime == 0) || (other.GlueCEPolicyMaxWallClockTime>='+str(clockTime)+'))'
804 >        if out_box[-1] == ',' : out_box = out_box[:-1]
805 >        out_box = '<outfiles> <![CDATA[\n' + out_box + '\n]]></outfiles>\n'
806 >        xml.write(out_box)
807 >
808 >        xml.write('<BossAttr> crabjob.INTERNAL_ID=_ITR1_ </BossAttr>\n')
809  
810 <        cpuTime=1000
811 <        if self.EDG_cpu_time:
760 <            cpuTime=self.EDG_cpu_time
761 <        if (req != noreq):
762 <            req = req + ' && '
763 <        req = req + '((other.GlueCEPolicyMaxCPUTime == 0) || (other.GlueCEPolicyMaxCPUTime>='+str(cpuTime)+'))'
764 <
765 <        if (req != noreq):
766 <            req = req + ';\n'
767 <            jdl.write(req)
768 <                                                                                                                                                            
769 <        jdl.write('VirtualOrganisation = "' + self.VO + '";\n')
810 >        xml.write('</program>\n')
811 >        xml.write('</chain>\n')
812  
813 <        if ( self.EDG_retry_count ):              
814 <            jdl.write('RetryCount = '+self.EDG_retry_count+';\n')
773 <            pass
813 >        xml.write('</iterator>\n')
814 >        xml.write('</task>\n')
815  
816 <        jdl.write('MyProxyServer = "' + self.proxyServer + '";\n')
816 >        xml.close()
817 >      
818  
777 –        jdl.close()
819          return
820  
821      def checkProxy(self):
# Line 782 | Line 823 | class SchedulerEdg(Scheduler):
823          Function to check the Globus proxy.
824          """
825          if (self.proxyValid): return
826 +
827 +        ### Just return if asked to do so
828 +        if (self.dontCheckProxy):
829 +            self.proxyValid=1
830 +            return
831 +
832          timeleft = -999
833          minTimeLeft=10*3600 # in seconds
834  
835          minTimeLeftServer = 100 # in hours
836  
790 –        #cmd = 'voms-proxy-info -exists -valid '+str(minTimeLeft)+':00'
791 –        #cmd = 'voms-proxy-info -timeleft'
837          mustRenew = 0
838 <        timeLeftLocal = runCommand('voms-proxy-info -timeleft')
838 >        timeLeftLocal = runCommand('voms-proxy-info -timeleft 2>/dev/null')
839          timeLeftServer = -999
840          if not timeLeftLocal or int(timeLeftLocal) <= 0 or not isInt(timeLeftLocal):
841              mustRenew = 1
842          else:
843 <            timeLeftServer = runCommand('voms-proxy-info -actimeleft | head -1')
843 >            timeLeftServer = runCommand('voms-proxy-info -actimeleft 2>/dev/null | head -1')
844              if not timeLeftServer or not isInt(timeLeftServer):
845                  mustRenew = 1
846              elif timeLeftLocal<minTimeLeft or timeLeftServer<minTimeLeft:
# Line 804 | Line 849 | class SchedulerEdg(Scheduler):
849          pass
850  
851          if mustRenew:
852 <            common.logger.message( "No valid proxy found or remaining time of validity of already existing proxy shorter than 10 hours!\n Creating a user proxy with default length of 96h\n")
853 <            cmd = 'voms-proxy-init -voms cms -valid 96:00'
852 >            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")
853 >            cmd = 'voms-proxy-init -voms '+self.VO
854 >            if self.group:
855 >                cmd += ':/'+self.VO+'/'+self.group
856 >            if self.role:
857 >                cmd += '/role='+self.role
858 >            cmd += ' -valid 192:00'
859              try:
860                  # SL as above: damn it!
861 +                common.logger.debug(10,cmd)
862                  out = os.system(cmd)
863                  if (out>0): raise CrabException("Unable to create a valid proxy!\n")
864              except:
865                  msg = "Unable to create a valid proxy!\n"
866                  raise CrabException(msg)
816 –            # cmd = 'grid-proxy-info -timeleft'
817 –            # cmd_out = runCommand(cmd,0,20)
867              pass
868  
869          ## now I do have a voms proxy valid, and I check the myproxy server

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines