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.55 by corvo, Wed May 3 08:44:30 2006 UTC vs.
Revision 1.65 by gutsche, Tue Jun 27 15:39:58 2006 UTC

# Line 152 | Line 152 | class SchedulerEdg(Scheduler):
152          sys.path.append(libPath)
153  
154          self.proxyValid=0
155 +
156 +        try:
157 +            self._taskId = cfg_params['taskId']
158 +        except:
159 +            self._taskId = ''
160 +
161          return
162      
163  
# Line 175 | Line 181 | class SchedulerEdg(Scheduler):
181          Returns part of a job script which does scheduler-specific work.
182          """
183          txt = ''
184 +        txt += "# job number (first parameter for job wrapper)\n"
185 +        txt += "NJob=$1\n"
186 +
187 +        txt += '# job identification to DashBoard \n'
188 +        txt += 'MonitorJobID=`echo ${NJob}_$EDG_WL_JOBID`\n'
189 +        txt += 'SyncGridJobId=`echo $EDG_WL_JOBID`\n'
190 +        txt += 'MonitorID=`echo ' + self._taskId + '`\n'
191 +        txt += 'echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
192 +        txt += 'echo "SyncGridJobId=`echo $SyncGridJobId`" | tee -a $RUNTIME_AREA/$repo \n'
193 +        txt += 'echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
194 +
195          txt += 'echo "middleware discovery " \n'
196 <        txt += 'if [ $VO_CMS_SW_DIR ]; then\n'
196 >        txt += 'if [ $VO_CMS_SW_DIR ]; then \n'
197          txt += '    middleware=LCG \n'
198 +        txt += '    echo "SyncCE=`edg-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
199 +        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
200          txt += '    echo "middleware =$middleware" \n'
201          txt += 'elif [ $GRID3_APP_DIR ]; then\n'
202          txt += '    middleware=OSG \n'
203 +        txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
204 +        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
205          txt += '    echo "middleware =$middleware" \n'
206          txt += 'elif [ $OSG_APP ]; then \n'
207          txt += '    middleware=OSG \n'
208 +        txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
209 +        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
210          txt += '    echo "middleware =$middleware" \n'
211          txt += 'else \n'
212 <        txt += '    echo "SET_CMS_ENV 1 ==> middleware not identified" \n'
213 <        txt += '    echo "JOB_EXIT_STATUS = 1"\n'
214 <        txt += '    exit 1\n'
215 <        txt += 'fi\n'
216 <
212 >        txt += '    echo "SET_CMS_ENV 10030 ==> middleware not identified" \n'
213 >        txt += '    echo "JOB_EXIT_STATUS = 10030" \n'
214 >        txt += '    echo "JobExitCode=10030" | tee -a $RUNTIME_AREA/$repo \n'
215 >        txt += '    dumpStatus $RUNTIME_AREA/$repo \n'
216 >        txt += '    rm -f $RUNTIME_AREA/$repo \n'
217 >        txt += '    echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
218 >        txt += '    echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
219 >        txt += '    exit 1 \n'
220 >        txt += 'fi \n'
221 >
222 >        txt += '# report first time to DashBoard \n'
223 >        txt += 'dumpStatus $RUNTIME_AREA/$repo \n'
224 >        txt += 'rm -f $RUNTIME_AREA/$repo \n'
225 >        txt += 'echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
226 >        txt += 'echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
227 >        
228          txt += '\n\n'
229  
196 –        txt += 'if [ $middleware == LCG ]; then \n'
197 –        txt += '    echo "SyncGridJobId=`echo $EDG_WL_JOBID`" | tee -a $RUNTIME_AREA/$repo\n'
198 –        txt += 'fi\n'
199 –
230          if int(self.copy_data) == 1:
231             if self.SE:
232                txt += 'export SE='+self.SE+'\n'
# Line 256 | Line 286 | class SchedulerEdg(Scheduler):
286          txt += '    if [ $OSG_JOB_CONTACT ]; then \n'
287          txt += '        CE=`echo $OSG_JOB_CONTACT | /usr/bin/awk -F\/ \'{print $1}\'` \n'
288          txt += '    else \n'
289 <        txt += '        echo "SET_ENV 1 ==> ERROR in setting CE name - OSG mode -" \n'
289 >        txt += '        echo "SET_CMS_ENV 10099 ==> OSG mode: ERROR in setting CE name from OSG_JOB_CONTACT" \n'
290 >        txt += '        echo "JOB_EXIT_STATUS = 10099" \n'
291 >        txt += '        echo "JobExitCode=10099" | tee -a $RUNTIME_AREA/$repo \n'
292 >        txt += '        dumpStatus $RUNTIME_AREA/$repo \n'
293 >        txt += '        rm -f $RUNTIME_AREA/$repo \n'
294 >        txt += '        echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
295 >        txt += '        echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
296          txt += '        exit 1 \n'
297          txt += '    fi \n'
298          txt += 'fi \n'
# Line 330 | Line 366 | class SchedulerEdg(Scheduler):
366             ## OLI_Daniele globus-* for OSG, lcg-* for LCG
367             txt += '        if [ $middleware == OSG ]; then\n'
368             txt += '           echo "globus-url-copy file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
369 <           txt += '           copy_exit_status=`globus-url-copy file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
370 <           #txt += '           exitstring=`globus-url-copy file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
369 >           txt += '           globus-url-copy file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1 \n'
370 >           txt += '           copy_exit_status=$? \n'
371             txt += '        elif [ $middleware == LCG ]; then \n'
372             txt += '           echo "lcg-cp --vo cms -t 1200 file://`pwd`/$out_file gsiftp://${SE}${SE_PATH}$out_file"\n'
373 <           txt += '           copy_exit_status=`lcg-cp --vo cms -t 1200 file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
374 <           #txt += '           exitstring=`lcg-cp --vo cms -t 30 file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1`\n'
373 >           txt += '           lcg-cp --vo cms -t 1200 file://\`pwd\`/$out_file gsiftp://${SE}${SE_PATH}$out_file 2>&1\n'
374 >           txt += '           copy_exit_status=$? \n'
375             txt += '        fi \n'
340 –           #txt += '        copy_exit_status=$?\n'
376             txt += '        echo "COPY_EXIT_STATUS = $copy_exit_status"\n'
377             txt += '        echo "STAGE_OUT = $copy_exit_status"\n'
378             txt += '        if [ $copy_exit_status -ne 0 ]; then\n'
# Line 497 | Line 532 | class SchedulerEdg(Scheduler):
532          [sites.append(it) for it in CEs if not sites.count(it)]
533  
534          common.logger.debug(5,"All Sites :"+str(sites))
535 +        common.logger.message("Matched Sites :"+str(sites))
536          return len(sites)
537  
538      def noMatchFound_(self, jdl):
# Line 633 | Line 669 | class SchedulerEdg(Scheduler):
669          jdl.write(jt_string)
670  
671          ### only one .sh  JDL has arguments:
636 –        firstEvent = common.jobDB.firstEvent(nj)
637 –        maxEvents = common.jobDB.maxEvents(nj)
638 –        jdl.write('Arguments = "' + str(nj+1)+' '+str(firstEvent)+' '+str(maxEvents)+'";\n')
672  
673 +        ### Fabio
674 +        jdl.write('Arguments = "' + str(nj+1)+' '+ jbt.getJobTypeArguments(nj, "EDG") +'";\n')
675          inp_box = 'InputSandbox = { '
676          inp_box = inp_box + '"' + script + '",'
677  
# Line 694 | Line 729 | class SchedulerEdg(Scheduler):
729  
730  
731          req='Requirements = '
732 +        noreq=req
733          req = req + jbt.getRequirements()
698 – #        ### if at least a CE exists ...
699 – #        if common.analisys_common_info['sites']:
700 – #           if common.analisys_common_info['sw_version']:
701 – #                req='Requirements = '
702 – #                req=req + 'Member("VO-cms-' + \
703 – #                     common.analisys_common_info['sw_version'] + \
704 – #                     '", other.GlueHostApplicationSoftwareRunTimeEnvironment)'
705 – #            if len(common.analisys_common_info['sites'])>0:
706 – #                req = req + ' && ('
707 – #                for i in range(len(common.analisys_common_info['sites'])):
708 – #                    req = req + 'other.GlueCEInfoHostName == "' \
709 – #                         + common.analisys_common_info['sites'][i] + '"'
710 – #                    if ( i < (int(len(common.analisys_common_info['sites']) - 1)) ):
711 – #                        req = req + ' || '
712 – #            req = req + ')'
734          #### and USER REQUIREMENT
735          if self.EDG_requirements:
736 <            if (req == 'Requirement = '):
737 <                req = req + self.EDG_requirements
738 <            else:
718 <                req = req +  ' && ' + self.EDG_requirements
736 >            if (req != noreq):
737 >                req = req +  ' && '
738 >            req = req + self.EDG_requirements
739          #### FEDE #####
740          if self.EDG_ce_white_list:
741              ce_white_list = string.split(self.EDG_ce_white_list,',')
742              #print "req = ", req
743              for i in range(len(ce_white_list)):
744                  if i == 0:
745 <                    if (req == 'Requirement = '):
746 <                        req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
747 <                    else:
728 <                        req = req +  ' && ((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
745 >                    if (req != noreq):
746 >                        req = req +  ' && '
747 >                    req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
748                      pass
749                  else:
750                      req = req +  ' || (RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
# Line 734 | Line 753 | class SchedulerEdg(Scheduler):
753          if self.EDG_ce_black_list:
754              ce_black_list = string.split(self.EDG_ce_black_list,',')
755              for ce in ce_black_list:
756 <                if (req == 'Requirement = '):
757 <                    req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
758 <                else:
740 <                    req = req +  ' && (!RegExp("' + ce + '", other.GlueCEUniqueId))'
756 >                if (req != noreq):
757 >                    req = req +  ' && '
758 >                req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
759                  pass
760 +
761          ###############
762 +        clockTime=480
763          if self.EDG_clock_time:
764 <            if (req == 'Requirement = '):
765 <                req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
766 <            else:
767 <                req = req + ' && other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
764 >            clockTime= self.EDG_clock_time
765 >        if (req != noreq):
766 >            req = req + ' && '
767 >        req = req + '((other.GlueCEPolicyMaxWallClockTime == 0) || (other.GlueCEPolicyMaxWallClockTime>='+str(clockTime)+'))'
768  
769 +        cpuTime=1000
770          if self.EDG_cpu_time:
771 <            if (req == 'Requirement = '):
772 <                req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
773 <            else:
774 <                req = req + ' && other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
775 <        if (req != 'Requirement = '):
771 >            cpuTime=self.EDG_cpu_time
772 >        if (req != noreq):
773 >            req = req + ' && '
774 >        req = req + '((other.GlueCEPolicyMaxCPUTime == 0) || (other.GlueCEPolicyMaxCPUTime>='+str(cpuTime)+'))'
775 >
776 >        if (req != noreq):
777              req = req + ';\n'
778              jdl.write(req)
779                                                                                                                                                              
# Line 793 | Line 815 | class SchedulerEdg(Scheduler):
815          pass
816  
817          if mustRenew:
818 <            common.logger.message( "No valid proxy found or timeleft too short!\n Creating a user proxy with default length of 24h\n")
819 <            cmd = 'voms-proxy-init -voms cms -valid 24:00'
818 >            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")
819 >            cmd = 'voms-proxy-init -voms cms -valid 96:00'
820              try:
821                  # SL as above: damn it!
822                  out = os.system(cmd)

Diff Legend

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