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

Comparing COMP/CRAB/python/SchedulerCondor.py (file contents):
Revision 1.21 by spiga, Fri Mar 6 16:54:42 2009 UTC vs.
Revision 1.28 by spiga, Sat Dec 12 16:35:39 2009 UTC

# Line 11 | Line 11 | from crab_exceptions import CrabExceptio
11   import common
12   import os
13   import socket
14 < import sha
14 > from crab_util import hashlib_wrap
15  
16   class SchedulerCondor(SchedulerLocal) :
17      """
# Line 38 | Line 38 | class SchedulerCondor(SchedulerLocal) :
38          """
39  
40          SchedulerLocal.configure(self, cfg_params)
41        taskHash = sha.new(common._db.queryTask('name')).hexdigest()
42        self.environment_unique_identifier = "https://" + \
43            socket.gethostname() + '/' + taskHash + "/${NJob}"
41  
42          try:
43              tmp =  cfg_params['CMSSW.datasetpath']
# Line 57 | Line 54 | class SchedulerCondor(SchedulerLocal) :
54          self.return_data = cfg_params.get('USER.return_data', 0)
55          self.copy_data   = cfg_params.get("USER.copy_data", 0)
56  
57 <        if int(self.copy_data) == 1:
57 >        self.proxyValid = 0
58 >        self.dontCheckProxy = int(cfg_params.get("GRID.dont_check_proxy", 0))
59 >        self.proxyServer = cfg_params.get("GRID.proxy_server", 'myproxy.cern.ch')
60 >        common.logger.debug('Setting myproxy server to ' + self.proxyServer)
61 >
62 >        self.group = cfg_params.get("GRID.group", None)
63 >        self.role  = cfg_params.get("GRID.role", None)
64 >        self.VO    = cfg_params.get('GRID.virtual_organization', 'cms')
65  
66 <            self.proxyValid = 0
63 <            self.dontCheckProxy = int(cfg_params.get("EDG.dont_check_proxy", 0))
64 <            self.proxyServer = cfg_params.get("EDG.proxy_server", 'myproxy.cern.ch')
65 <            common.logger.debug(5,'Setting myproxy server to ' + self.proxyServer)
66 <
67 <            self.group = cfg_params.get("EDG.group", None)
68 <            self.role  = cfg_params.get("EDG.role", None)
69 <            self.VO    = cfg_params.get('EDG.virtual_organization', 'cms')
70 <
71 <            self.checkProxy()
72 <
73 <        self.role  = None
66 >        self.checkProxy()
67  
68          return
69  
70 +    def envUniqueID(self):
71 +        taskHash = hashlib_wrap(common._db.queryTask('name'))
72 +        id = "https://" + socket.gethostname() + '/' + taskHash + "/${NJob}"
73 +        return id
74  
75      def sched_parameter(self, i, task):
76          """
77          Return scheduler-specific parameters
78          """
79 +        req = ''
80 +        if self.EDG_addJdlParam:
81 +            if self.EDG_addJdlParam[-1] == '':
82 +                self.EDG_addJdlParam = self.EDG_addJdlParam[:-1]
83 +            for p in self.EDG_addJdlParam:
84 +                req += p.strip()+';\n'
85  
86 <        index = int(common._db.nJobs()) - 1
84 <        schedParam = ''
85 <
86 <        for i in range(index):
87 <            pass
88 <
89 <        return schedParam
86 >        return req
87  
88  
89      def realSchedParams(self, cfg_params):
# Line 178 | Line 175 | fi
175   """
176  
177          return txt
178 +
179 +
180 +    def sched_fix_parameter(self):
181 +        """
182 +        Returns string with requirements and scheduler-specific parameters
183 +        """
184 +
185 +        if self.EDG_requirements:
186 +            req = self.EDG_requirements
187 +            taskReq = {'commonRequirements':req}
188 +            common._db.updateTask_(taskReq)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines