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.17 by ewv, Mon Feb 9 21:16:34 2009 UTC vs.
Revision 1.21 by spiga, Fri Mar 6 16:54:42 2009 UTC

# Line 25 | Line 25 | class SchedulerCondor(SchedulerLocal) :
25          SchedulerLocal.__init__(self,"CONDOR")
26          self.datasetPath   = None
27          self.selectNoInput = None
28 +        self.return_data   = 0
29 +        self.copy_data     = 0
30 +
31          self.environment_unique_identifier = None
32          return
33  
# Line 36 | Line 39 | class SchedulerCondor(SchedulerLocal) :
39  
40          SchedulerLocal.configure(self, cfg_params)
41          taskHash = sha.new(common._db.queryTask('name')).hexdigest()
42 <        self.environment_unique_identifier = "https://" + socket.gethostname() + \
43 <                                              '/' + taskHash + "/${NJob}"
42 >        self.environment_unique_identifier = "https://" + \
43 >            socket.gethostname() + '/' + taskHash + "/${NJob}"
44  
45          try:
46              tmp =  cfg_params['CMSSW.datasetpath']
# Line 54 | Line 57 | class SchedulerCondor(SchedulerLocal) :
57          self.return_data = cfg_params.get('USER.return_data', 0)
58          self.copy_data   = cfg_params.get("USER.copy_data", 0)
59  
57        if ( int(self.return_data) == 0 and int(self.copy_data) == 0 ):
58            msg = 'Error: return_data and copy_data cannot be set both to 0\n'
59            msg = msg + 'Please modify your crab.cfg file\n'
60            raise CrabException(msg)
61
62        if ( int(self.return_data) == 1 and int(self.copy_data) == 1 ):
63            msg = 'Error: return_data and copy_data cannot be set both to 1\n'
64            msg = msg + 'Please modify your crab.cfg file\n'
65            raise CrabException(msg)
66
67        if ( int(self.copy_data) == 0 and int(self.publish_data) == 1 ):
68            msg = 'Warning: publish_data = 1 must be used with copy_data = 1\n'
69            msg = msg + 'Please modify copy_data value in your crab.cfg file\n'
70            common.logger.message(msg)
71            raise CrabException(msg)
72
60          if int(self.copy_data) == 1:
74            self.SE = cfg_params.get('USER.storage_element', None)
75            if not self.SE:
76                msg = "Error. The [USER] section has no 'storage_element'"
77                common.logger.message(msg)
78                raise CrabException(msg)
61  
62              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')
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)
# Line 87 | Line 69 | class SchedulerCondor(SchedulerLocal) :
69              self.VO    = cfg_params.get('EDG.virtual_organization', 'cms')
70  
71              self.checkProxy()
72 +
73          self.role  = None
74  
75          return

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines