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

Comparing COMP/CRAB/python/SchedulerGlidein.py (file contents):
Revision 1.2 by ewv, Thu Apr 17 21:23:07 2008 UTC vs.
Revision 1.11 by ewv, Fri May 2 19:33:17 2008 UTC

# Line 4 | Line 4 | import common
4   __revision__ = "$Id$"
5   __version__ = "$Revision$"
6  
7 # All of the content moved to SchedulerCondorCommon.
8
7   class SchedulerGlidein(SchedulerCondorCommon):
8    def __init__(self):
9      SchedulerCondorCommon.__init__(self,"GLIDEIN")
# Line 17 | Line 15 | class SchedulerGlidein(SchedulerCondorCo
15      """
16      jobParams = SchedulerCondorCommon.sched_parameter(self,i,task)
17  
18 <    seDest = self.blackWhiteListParser.cleanForBlackWhiteList(eval(task.jobs[i-1]['dlsDestination']))
19 <    #ceDest = self.getCEfromSE(seDest)
22 <
23 <    # FIXME: Translate seDest into glidein name using SiteDB
18 >    ceDest = self.seListToCElist(task.jobs[i-1]['dlsDestination'], onlyOSG=False)
19 >    ceString = ','.join(ceDest)
20  
21 <    jobParams += '+DESIRED_Sites = "T2_US_UCSD"; '
21 >    jobParams += '+DESIRED_Gatekeepers = "'+ceString+'"; '
22      jobParams += '+DESIRED_Archs = "INTEL,X86_64"; '
23 <    jobParams += "Requirements = stringListMember(GLIDEIN_Site,DESIRED_Sites) &&  stringListMember(Arch,DESIRED_Archs); "
23 >    jobParams += "Requirements = stringListMember(GLIDEIN_Gatekeeper,DESIRED_Gatekeepers) &&  stringListMember(Arch,DESIRED_Archs); "
24 >    if (self.EDG_clock_time):
25 >      jobParams += '+MaxWallTimeMins = '+self.EDG_clock_time+'; '
26  
27      common._db.updateTask_({'jobType':jobParams})
28      return jobParams # Not sure I even need to return anything
29 +
30 +  def listMatch(self, seList):
31 +    ceDest = SchedulerCondorCommon.listMatch(seList, onlyOSG=False)
32 +    return ceDest
33 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines