ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/SchedulerGlite.py
(Generate patch)

Comparing COMP/CRAB/python/SchedulerGlite.py (file contents):
Revision 1.35 by fanzago, Mon Mar 3 16:41:24 2008 UTC vs.
Revision 1.36 by spiga, Mon Mar 3 20:40:56 2008 UTC

# Line 27 | Line 27 | class SchedulerGlite(SchedulerGrid):
27              rb_param_file = 'WMSconfig = '+glite_config+';\n'
28          return rb_param_file
29  
30 <    def sched_parameter(self):
30 >    def ce_list(self):
31          """
32 <        Returns file with requirements and scheduler-specific parameters
32 >        Returns string with requirement CE related    
33          """
34 <        index = int(common.jobDB.nJobs()) - 1
35 <        job = common.job_list[index]
36 <        jbt = job.type()
37 <
38 <        lastDest=''
39 <        first = []
40 <        last  = []
41 <        for n in range(common.jobDB.nJobs()):
42 <            currDest=common.jobDB.destination(n)
43 <            if (currDest!=lastDest):
44 <                lastDest = currDest
45 <                first.append(n)
46 <                if n != 0:last.append(n-1)
47 <        if len(first)>len(last) :last.append(common.jobDB.nJobs())
48 <
49 <        req = ''
50 <        req = req + jbt.getRequirements()
51 <
52 <
53 <        if self.EDG_requirements:
54 <            if (not req == ' '): req = req +  ' && '
55 <            req = req + self.EDG_requirements
56 <
34 >        req = ''  
35          if self.EDG_ce_white_list:
36              ce_white_list = self.EDG_ce_white_list
37              tmpCe=[]
38              concString = '&&'
39              for ce in ce_white_list:
40                  tmpCe.append('RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId)')
63            ### MATTY' FIX: if more then one CE: && -> ||
64            #print "list CE: " + str(tmpCe)
41              if len(tmpCe) == 1:
42                  req +=  " && (" + concString.join(tmpCe) + ") "
43              elif len(tmpCe) > 1:
44                  firstCE = 0
45                  for reqTemp in tmpCe:
70                    #print reqTemp
46                      if firstCE == 0:
72                        #print "adding: "+str(" && ( (" + reqTemp + ") ")
47                          req += " && ( (" + reqTemp + ") "
48                          firstCE = 1
49                      elif firstCE > 0:
76                        #print "adding: "+str(" || (" + reqTemp + ") ")
50                          req += " || (" + reqTemp + ") "
51                  if firstCE > 0:
52                      req += ") "
80            ## old code
81 #            if len(tmpCe): req = req + " && (" + concString.join(tmpCe) + ") "
53  
54          if self.EDG_ce_black_list:
55              ce_black_list = self.EDG_ce_black_list
# Line 86 | Line 57 | class SchedulerGlite(SchedulerGrid):
57              concString = '&&'
58              for ce in ce_black_list:
59                  tmpCe.append('(!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))')
60 <            if len(tmpCe): req = req + " && (" + concString.join(tmpCe) + ") "
60 >            if len(tmpCe): req += " && (" + concString.join(tmpCe) + ") "
61 >
62 >        # requirement added to skip gliteCE
63 >        req += '&& (!RegExp("blah", other.GlueCEUniqueId))'
64 >
65 >        return req
66 >
67 >    def se_list(self, id):
68 >        """
69 >        Returns string with requirement SE related    
70 >        """  
71 >        hostList=self.findSites_(id)
72 >        req=''
73 >        reqtmp=[]
74 >        concString = '||'
75 >
76 >        for arg in hostList:
77 >            reqtmp.append(' Member("'+arg+'" , other.GlueCESEBindGroupSEUniqueID) ')
78 >
79 >        if len(reqtmp): req += " && (" + concString.join(reqtmp) + ") "
80  
81 +        return req
82 +
83 +    def jdlParam(self):
84 +        """
85 +        Returns
86 +        """
87 +        req=''
88 +        if self.EDG_addJdlParam:
89 +            if self.EDG_addJdlParam[-1] == '': self.EDG_addJdlParam= self.EDG_addJdlParam[:-1]
90 +            for p in self.EDG_addJdlParam:
91 +             #   param_file.write(string.strip(p)+';\n')
92 +                req+=string.strip(p)+';\n' ## BL--DS
93 +        return req
94 +
95 +    def specific_req(self):
96 +        """
97 +        Returns string with specific requirements
98 +        """
99 +        req=''
100          if self.EDG_clock_time:
101              if (not req == ' '): req = req + ' && '
102              req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
# Line 95 | Line 104 | class SchedulerGlite(SchedulerGrid):
104          if self.EDG_cpu_time:
105              if (not req == ' '): req = req + ' && '
106              req = req + ' other.GlueCEPolicyMaxCPUTime>='+self.EDG_cpu_time
107 +        
108 +        return req
109  
110 <        for i in range(len(first)): # Add loop DS
111 <            self.param='sched_param_'+str(i)+'.clad'
112 <            param_file = open(common.work_space.shareDir()+'/'+self.param, 'w')
113 <
114 <            itr4=self.findSites_(first[i])
115 <            reqSites=''
116 <            reqtmp=[]
117 <            concString = '||'
118 <
119 <            #############
120 <            # MC Changed matching syntax to avoid gang matching
121 <            #############
122 <            for arg in itr4:
123 <                reqtmp.append(' Member("'+arg+'" , other.GlueCESEBindGroupSEUniqueID) ')
124 <
125 <            if len(reqtmp): reqSites = reqSites + " && (" + concString.join(reqtmp) + ") "
126 <
127 <            # requirement added to skip gliteCE
128 <            reqSites = reqSites + '&& (!RegExp("blah", other.GlueCEUniqueId));\n'
118 <
119 <            param_file.write('Requirements = ' + req + reqSites )
110 >    def sched_parameter(self):
111 >        """
112 >        Returns string with requirements and scheduler-specific parameters
113 >        """
114 >        index = int(common._db.nJobs()) - 1
115 >        job = common.job_list[index]
116 >        jbt = job.type()
117 >
118 >      ### To Be Removed BL--DS
119 >      #  lastDest=''
120 >      #  first = []
121 >      #  last  = []
122 >      #  for n in range(common.jobDB.nJobs()):
123 >      #      currDest=common.jobDB.destination(n)
124 >      #      if (currDest!=lastDest):
125 >      #          lastDest = currDest
126 >      #          first.append(n)
127 >      #          if n != 0:last.append(n-1)
128 >      #  if len(first)>len(last) :last.append(common.jobDB.nJobs())
129  
130 <            if (self.rb_param_file):
131 <                param_file.write(self.rb_param_file)
130 >        req = ''
131 >        req = req + jbt.getRequirements()
132  
133 <            if self.EDG_addJdlParam:
134 <                if self.EDG_addJdlParam[-1] == '': self.EDG_addJdlParam= self.EDG_addJdlParam[:-1]
135 <                for p in self.EDG_addJdlParam:
136 <                    param_file.write(string.strip(p)+';\n')
133 >        if self.EDG_requirements:
134 >            if (not req == ' '): req = req +  ' && '
135 >            req = req + self.EDG_requirements
136 >        sched_param=''
137 >        sched_param='""pippo""'
138  
139 <            param_file.close()
139 >        ### Temporary Problem with quote and py2sqlite.... under investigation..        
140 >        for i in range(index):
141 >           # sched_param+='Requirements = ' + req +self.specific_req() + self.se_list(i) +\
142 >           #                                 self.ce_list() +';\n' ## BL--DS
143 >           # if self.EDG_addJdlParam: sched_param+=self.jdlParam() ## BL--DS
144 >           # if (self.rb_param_file): sched_param+=self.rb_param_file ## BL--DS
145 >           # print sched_param
146 >            run_jobReq={'schedulerAttributes':sched_param}## DS--BL
147 >            common._db.updateRunJob_(i,run_jobReq)        
148  
149      def wsSetupEnvironment(self):
150          """
# Line 142 | Line 160 | class SchedulerGlite(SchedulerGrid):
160          txt += "NJob=${args[0]}; export NJob\n"
161  
162          txt += '# job identification to DashBoard \n'
163 <        #txt += 'MonitorJobID=`echo ${NJob}_$GLITE_WMS_JOBID`\n'
164 <        #txt += 'SyncGridJobId=`echo $GLITE_WMS_JOBID`\n'
165 <        #txt += 'MonitorID=`echo ' + self._taskId + '`\n'
166 <        txt += 'MonitorJobID=${NJob}_$GLITE_WMS_JOBID \n'
167 <        txt += 'SyncGridJobId=$GLITE_WMS_JOBID \n'
168 <        txt += 'MonitorID='+self._taskId+' \n'
151 <        txt += 'echo "MonitorJobID=$MonitorJobID" > $RUNTIME_AREA/$repo \n'
152 <        txt += 'echo "SyncGridJobId=$SyncGridJobId" >> $RUNTIME_AREA/$repo \n'
153 <        txt += 'echo "MonitorID=$MonitorID" >> $RUNTIME_AREA/$repo\n'
154 <        #txt += 'echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
155 <        #txt += 'echo "SyncGridJobId=`echo $SyncGridJobId`" | tee -a $RUNTIME_AREA/$repo \n'
156 <        #txt += 'echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
163 >        txt += 'MonitorJobID=`echo ${NJob}_$GLITE_WMS_JOBID`\n'
164 >        txt += 'SyncGridJobId=`echo $GLITE_WMS_JOBID`\n'
165 >        txt += 'MonitorID=`echo ' + self._taskId + '`\n'
166 >        txt += 'echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
167 >        txt += 'echo "SyncGridJobId=`echo $SyncGridJobId`" | tee -a $RUNTIME_AREA/$repo \n'
168 >        txt += 'echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
169  
170 <        #txt += 'echo "middleware discovery: " \n'
159 <        txt += 'echo ">>> GridFlavour discovery: " \n'
170 >        txt += 'echo "middleware discovery: " \n'
171          txt += 'if [ $VO_CMS_SW_DIR ]; then \n'
172 <        txt += '    middleware=LCG\n'
173 <        #txt += '    echo "SyncCE=`glite-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
174 <        txt += '    echo "SyncCE=`glite-brokerinfo getCE`" >> $RUNTIME_AREA/$repo \n'
175 <        #txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
165 <        txt += '    echo "GridFlavour=$middleware" | tee -a $RUNTIME_AREA/$repo \n'
166 <        #txt += '    echo ">>> middleware =$middleware" \n'
172 >        txt += '    middleware=LCG \n'
173 >        txt += '    echo "SyncCE=`glite-brokerinfo getCE`" | tee -a $RUNTIME_AREA/$repo \n'
174 >        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
175 >        txt += '    echo ">>> middleware =$middleware" \n'
176          txt += 'elif [ $OSG_APP ]; then \n'
177          txt += '    middleware=OSG \n'
178          txt += '    if [ $OSG_JOB_CONTACT ]; then \n'
179          txt += '        SyncCE="$OSG_JOB_CONTACT"; \n'
180 <        #txt += '        echo "SyncCE=$SyncCE" | tee -a $RUNTIME_AREA/$repo ;\n'
172 <        txt += '        echo "SyncCE=$SyncCE" >> $RUNTIME_AREA/$repo ;\n'
180 >        txt += '        echo "SyncCE=$SyncCE" | tee -a $RUNTIME_AREA/$repo ;\n'
181          txt += '    else\n'
182          txt += '        echo "not reporting SyncCE";\n'
183          txt += '    fi\n';
184 <        txt += '    echo "GridFlavour=$middleware" | tee -a $RUNTIME_AREA/$repo \n'
185 <        #txt += '    echo ">>> middleware =$middleware" \n'
184 >        txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
185 >        txt += '    echo ">>> middleware =$middleware" \n'
186          txt += 'else \n'
187 <        txt += '    echo "ERROR ==> GridFlavour not identified" \n'
188 <        txt += '    job_exit_code=10030\n'
189 <        txt += '    func_exit \n'
190 <        #txt += '    echo "SET_CMS_ENV 10030 ==> middleware not identified" \n'
191 <        #txt += '    echo "JOB_EXIT_STATUS = 10030" \n'
184 <        #txt += '    echo "JobExitCode=10030" | tee -a $RUNTIME_AREA/$repo \n'
185 <        #txt += '    dumpStatus $RUNTIME_AREA/$repo \n'
186 <        #txt += '    exit 1 \n'
187 >        txt += '    echo "SET_CMS_ENV 10030 ==> middleware not identified" \n'
188 >        txt += '    echo "JOB_EXIT_STATUS = 10030" \n'
189 >        txt += '    echo "JobExitCode=10030" | tee -a $RUNTIME_AREA/$repo \n'
190 >        txt += '    dumpStatus $RUNTIME_AREA/$repo \n'
191 >        txt += '    exit 1 \n'
192          txt += 'fi \n'
193  
194          txt += 'dumpStatus $RUNTIME_AREA/$repo \n'
# Line 228 | Line 233 | class SchedulerGlite(SchedulerGrid):
233          cmd_out = runCommand(cmd)
234          return cmd_out
235  
231    def findSites_(self, n):
232        itr4 =[]
233        sites = common.jobDB.destination(n)
234        if len(sites)>0 and sites[0]=="":
235            return itr4
236        if sites != [""]:
237            ##Addedd Daniele
238            replicas = self.blackWhiteListParser.checkBlackList(sites,n)
239            if len(replicas)!=0:
240                replicas = self.blackWhiteListParser.checkWhiteList(replicas,n)
241
242            itr4 = replicas
243            #####
244        return itr4
236  
237      def tOut(self, list):
238          return 180

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines