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

Comparing COMP/CRAB/python/SchedulerRemoteglidein.py (file contents):
Revision 1.15 by belforte, Thu Feb 7 16:57:51 2013 UTC vs.
Revision 1.19 by belforte, Fri Aug 9 08:47:30 2013 UTC

# Line 5 | Line 5 | Implements the Remote Glidein scheduler
5   from SchedulerGrid  import SchedulerGrid
6   from crab_exceptions import CrabException
7   from crab_util import runCommand
8 + from crab_util import gethnUserNameFromSiteDB
9   from ServerConfig import *
9 from WMCore.SiteScreening.BlackWhiteListParser import SEBlackWhiteListParser
10   import Scram
11  
12   import common
# Line 121 | Line 121 | class SchedulerRemoteglidein(SchedulerGr
121              raise CrabException(msg)
122  
123          return
124    
125    def userName(self):
126        """ return the user name """
127        tmp=runCommand("voms-proxy-info -identity 2>/dev/null")
128        return tmp.strip()
124  
125 + #
126      def envUniqueID(self):
127          taskHash = sha1(common._db.queryTask('name')).hexdigest()
128          id = "https://" + socket.gethostname() + '/' + taskHash + "/${NJob}"
# Line 160 | Line 156 | class SchedulerRemoteglidein(SchedulerGr
156          cmsver=re.split('_', cmsVersion)
157          numericCmsVersion = "%s%.2d%.2d" %(cmsver[1], int(cmsver[2]), int(cmsver[3]))
158  
159 +        jobParams += '+DESIRED_CMSDataset ="' +self.datasetPath+'";'
160          jobParams += '+DESIRED_CMSVersion ="' +cmsVersion+'";'
161          jobParams += '+DESIRED_CMSVersionNr ="' +numericCmsVersion+'";'
162          jobParams += '+DESIRED_CMSScramArch ="' +scramArch+'";'
163 +
164 +        userName = gethnUserNameFromSiteDB()
165 +        jobParams += '+AccountingGroup ="' + userName+'";'
166          
167          myscheddName = self.remoteHost
168  
# Line 170 | Line 170 | class SchedulerRemoteglidein(SchedulerGr
170                       '//' + self.submissionDay + '//$(Cluster).$(Process)"; '
171  
172          if (self.EDG_clock_time):
173 <            glideinTime = "%d" % (int(self.EDG_clock_time)+5) # 5 min to wrapup
173 >            glideinTime = "%d" % (int(self.EDG_clock_time)+20) # 20 min to wrapup
174              jobParams += '+MaxWallTimeMins = '+ glideinTime + '; '
175          else:
176 <            jobParams += '+MaxWallTimeMins = %d; ' % (60*22 - 5) # 22h default in glidein, 5min to wrap
176 >            jobParams += '+MaxWallTimeMins = %d; ' % (21*60+55) #  21:55h  (unit = min)
177 >
178  
179          if self.max_rss :
180              jobParams += 'request_memory = '+self.max_rss+';'

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines