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.15 by ewv, Tue Nov 25 22:24:23 2008 UTC vs.
Revision 1.21 by spiga, Fri Mar 6 16:54:42 2009 UTC

# Line 10 | Line 10 | from crab_exceptions import CrabExceptio
10  
11   import common
12   import os
13 <
13 > import socket
14 > import sha
15  
16   class SchedulerCondor(SchedulerLocal) :
17      """
# Line 24 | 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 34 | Line 38 | class SchedulerCondor(SchedulerLocal) :
38          """
39  
40          SchedulerLocal.configure(self, cfg_params)
41 <        self.environment_unique_identifier = '${HOSTNAME}_${CONDOR_ID}_' \
42 <                                             + common._db.queryTask('name')
41 >        taskHash = sha.new(common._db.queryTask('name')).hexdigest()
42 >        self.environment_unique_identifier = "https://" + \
43 >            socket.gethostname() + '/' + taskHash + "/${NJob}"
44  
45          try:
46              tmp =  cfg_params['CMSSW.datasetpath']
# Line 52 | 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  
55 –        if ( int(self.return_data) == 0 and int(self.copy_data) == 0 ):
56 –            msg = 'Error: return_data and copy_data cannot be set both to 0\n'
57 –            msg = msg + 'Please modify your crab.cfg file\n'
58 –            raise CrabException(msg)
59 –
60 –        if ( int(self.return_data) == 1 and int(self.copy_data) == 1 ):
61 –            msg = 'Error: return_data and copy_data cannot be set both to 1\n'
62 –            msg = msg + 'Please modify your crab.cfg file\n'
63 –            raise CrabException(msg)
64 –
65 –        if ( int(self.copy_data) == 0 and int(self.publish_data) == 1 ):
66 –            msg = 'Warning: publish_data = 1 must be used with copy_data = 1\n'
67 –            msg = msg + 'Please modify copy_data value in your crab.cfg file\n'
68 –            common.logger.message(msg)
69 –            raise CrabException(msg)
70 –
60          if int(self.copy_data) == 1:
72 –            self.SE = cfg_params.get('USER.storage_element', None)
73 –            if not self.SE:
74 –                msg = "Error. The [USER] section has no 'storage_element'"
75 –                common.logger.message(msg)
76 –                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 86 | Line 70 | class SchedulerCondor(SchedulerLocal) :
70  
71              self.checkProxy()
72  
73 +        self.role  = None
74 +
75          return
76  
77  
# Line 121 | Line 107 | class SchedulerCondor(SchedulerLocal) :
107          Check the compatibility of available resources
108          """
109  
110 <        if self.selectNoInput:
125 <            return [True]
126 <        else:
127 <            return SchedulerLocal.listMatch(self, seList, full)
110 >        return [True]
111  
112  
113      def decodeLogInfo(self, fileName):

Diff Legend

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