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.29 by ewv, Wed Dec 16 17:37:28 2009 UTC vs.
Revision 1.33 by belforte, Thu Jun 14 15:47:28 2012 UTC

# Line 11 | Line 11 | from crab_exceptions import CrabExceptio
11   import common
12   import os
13   import socket
14 +
15 + # FUTURE: for python 2.4 & 2.6
16   try:
17      from hashlib import sha1
18   except:
# Line 28 | Line 30 | class SchedulerCondor(SchedulerLocal) :
30          SchedulerLocal.__init__(self,"CONDOR")
31          self.datasetPath   = None
32          self.selectNoInput = None
33 <        self.return_data   = 0
32 <        self.copy_data     = 0
33 >        self.OSBsize = None
34  
35          self.environment_unique_identifier = None
36          return
# Line 42 | Line 43 | class SchedulerCondor(SchedulerLocal) :
43  
44          SchedulerLocal.configure(self, cfg_params)
45  
46 +        self.proxyValid=0
47 +        self.dontCheckProxy=int(cfg_params.get("GRID.dont_check_proxy",0))
48 +        self.space_token = cfg_params.get("USER.space_token",None)
49 +        try:
50 +            self.proxyServer = Downloader("http://cmsdoc.cern.ch/cms/LCG/crab/config/").config("myproxy_server.conf")
51 +            self.proxyServer = self.proxyServer.strip()
52 +            if self.proxyServer is None:
53 +                raise CrabException("myproxy_server.conf retrieved but empty")
54 +        except Exception, e:
55 +            common.logger.info("Problem setting myproxy server endpoint: using myproxy.cern.ch")
56 +            common.logger.debug(e)
57 +            self.proxyServer= 'myproxy.cern.ch'
58 +        self.group = cfg_params.get("GRID.group", None)
59 +        self.role = cfg_params.get("GRID.role", None)
60 +        self.VO = cfg_params.get('GRID.virtual_organization','cms')
61 +
62          try:
63              tmp =  cfg_params['CMSSW.datasetpath']
64              if tmp.lower() == 'none':
# Line 54 | Line 71 | class SchedulerCondor(SchedulerLocal) :
71              msg = "Error: datasetpath not defined "
72              raise CrabException(msg)
73  
57 –        self.return_data = cfg_params.get('USER.return_data', 0)
58 –        self.copy_data   = cfg_params.get("USER.copy_data", 0)
59 –
60 –        self.proxyValid = 0
61 –        self.dontCheckProxy = int(cfg_params.get("GRID.dont_check_proxy", 0))
62 –        self.proxyServer = cfg_params.get("GRID.proxy_server", 'myproxy.cern.ch')
63 –        common.logger.debug('Setting myproxy server to ' + self.proxyServer)
64 –
65 –        self.group = cfg_params.get("GRID.group", None)
66 –        self.role  = cfg_params.get("GRID.role", None)
67 –        self.VO    = cfg_params.get('GRID.virtual_organization', 'cms')
68 –
74          self.checkProxy()
75  
76          return

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines