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.19 by ewv, Thu Feb 19 21:15:01 2009 UTC vs.
Revision 1.24 by ewv, Tue May 5 15:01:03 2009 UTC

# Line 25 | Line 25 | class SchedulerCondor(SchedulerLocal) :
25          SchedulerLocal.__init__(self,"CONDOR")
26          self.datasetPath   = None
27          self.selectNoInput = None
28        self.backup        = ''
28          self.return_data   = 0
29          self.copy_data     = 0
31        self.backup_copy   = 0
30  
31          self.environment_unique_identifier = None
32          return
# Line 40 | Line 38 | class SchedulerCondor(SchedulerLocal) :
38          """
39  
40          SchedulerLocal.configure(self, cfg_params)
43        taskHash = sha.new(common._db.queryTask('name')).hexdigest()
44        self.environment_unique_identifier = "https://" + \
45            socket.gethostname() + '/' + taskHash + "/${NJob}"
41  
42          try:
43              tmp =  cfg_params['CMSSW.datasetpath']
# Line 58 | Line 53 | class SchedulerCondor(SchedulerLocal) :
53  
54          self.return_data = cfg_params.get('USER.return_data', 0)
55          self.copy_data   = cfg_params.get("USER.copy_data", 0)
61        self.backup_copy = cfg_params.get('USER.backup_copy', 0)
62
63        if int(self.return_data) == 0 and int(self.copy_data) == 0:
64            msg =  'Error: return_data and copy_data cannot both be set to 0\n'
65            msg += 'Please modify your crab.cfg file\n'
66            raise CrabException(msg)
67
68        if int(self.return_data) == 1 and int(self.copy_data) == 1:
69            msg =  'Error: return_data and copy_data cannot both be set to 1\n'
70            msg += 'Please modify your crab.cfg file\n'
71            raise CrabException(msg)
72
73        if int(self.copy_data) == 0 and int(self.publish_data) == 1:
74            msg =  'Warning: publish_data=1 must be used with copy_data=1\n'
75            msg += 'Please modify the copy_data value in your crab.cfg file\n'
76            common.logger.message(msg)
77            raise CrabException(msg)
56  
57 <        if int(self.copy_data) == 0 and int(self.backup_copy) == 1:
58 <            msg =  'Error: copy_data = 0 and backup_data = 1 ==> to use the '
59 <            msg += 'backup_copy function, the copy_data value has to be = 1\n'
60 <            msg += 'Please modify copy_data value in your crab.cfg file\n'
61 <            raise CrabException(msg)
62 <
63 <        if int(self.backup_copy) == 1 and int(self.publish_data) == 1:
64 <            msg =  'Warning: currently the publication is not supported '
87 <            msg += 'with the backup copy. Work in progress....\n'
88 <            common.logger.message(msg)
89 <            raise CrabException(msg)
90 <
91 <        if int(self.copy_data) == 1:
92 <            self.SE = cfg_params.get('USER.storage_element', None)
93 <            if not self.SE:
94 <                msg = "Error. The [USER] section has no 'storage_element'"
95 <                common.logger.message(msg)
96 <                raise CrabException(msg)
97 <
98 <            self.proxyValid = 0
99 <            self.dontCheckProxy = int(cfg_params.get("EDG.dont_check_proxy", 0))
100 <            self.proxyServer = cfg_params.get("EDG.proxy_server", 'myproxy.cern.ch')
101 <            common.logger.debug(5,'Setting myproxy server to ' + self.proxyServer)
102 <
103 <            self.group = cfg_params.get("EDG.group", None)
104 <            self.role  = cfg_params.get("EDG.role", None)
105 <            self.VO    = cfg_params.get('EDG.virtual_organization', 'cms')
57 >        self.proxyValid = 0
58 >        self.dontCheckProxy = int(cfg_params.get("EDG.dont_check_proxy", 0))
59 >        self.proxyServer = cfg_params.get("EDG.proxy_server", 'myproxy.cern.ch')
60 >        common.logger.debug(5,'Setting myproxy server to ' + self.proxyServer)
61 >
62 >        self.group = cfg_params.get("EDG.group", None)
63 >        self.role  = cfg_params.get("EDG.role", None)
64 >        self.VO    = cfg_params.get('EDG.virtual_organization', 'cms')
65  
66 <            self.checkProxy()
108 <
109 <        if int(self.backup_copy) == 1:
110 <            self.backup = '--backup'
111 <
112 <        self.role  = None
66 >        self.checkProxy()
67  
68          return
69  
70 +    def envUniqueID(self):
71 +        taskHash = sha.new(common._db.queryTask('name')).hexdigest()
72 +        id = "https://" + socket.gethostname() + '/' + taskHash + "/${NJob}"
73 +        return id
74  
75      def sched_parameter(self, i, task):
76          """

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines