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.10 by ewv, Tue Aug 5 18:48:52 2008 UTC vs.
Revision 1.21 by spiga, Fri Mar 6 16:54:42 2009 UTC

# Line 7 | Line 7 | __version__ = "$Revision$"
7  
8   from SchedulerLocal  import SchedulerLocal
9   from crab_exceptions import CrabException
10 #from crab_logger import Logger
10  
11   import common
12   import os
13 <
14 < # Naming convention:  Methods starting with 'ws' provide the corresponding part of the job script
16 < # ('ws' stands for 'write script').
13 > import socket
14 > import sha
15  
16   class SchedulerCondor(SchedulerLocal) :
17      """
18      Class to implement the vanilla (local) Condor scheduler
19 +     Naming convention:  Methods starting with 'ws' provide
20 +     the corresponding part of the job script
21 +     ('ws' stands for 'write script').
22      """
23  
24      def __init__(self):
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}_' + 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 48 | Line 54 | class SchedulerCondor(SchedulerLocal) :
54              msg = "Error: datasetpath not defined "
55              raise CrabException(msg)
56  
57 +        self.return_data = cfg_params.get('USER.return_data', 0)
58 +        self.copy_data   = cfg_params.get("USER.copy_data", 0)
59 +
60 +        if int(self.copy_data) == 1:
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')
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
74 +
75          return
76  
77  
# Line 71 | Line 95 | class SchedulerCondor(SchedulerLocal) :
95          """
96  
97          tmpDir = os.path.join(common.work_space.shareDir(),'.condor_temp')
98 <        params = {'tmpDir':tmpDir}
98 >        tmpDir = os.path.join(common.work_space.shareDir(),'.condor_temp')
99 >        jobDir = common.work_space.jobDir()
100 >        params = {'tmpDir':tmpDir,
101 >                  'jobDir':jobDir}
102          return params
103  
104  
# Line 80 | Line 107 | class SchedulerCondor(SchedulerLocal) :
107          Check the compatibility of available resources
108          """
109  
110 <        if self.selectNoInput:
84 <            return [True]
85 <        else:
86 <            return SchedulerLocal.listMatch(self, seList, full)
110 >        return [True]
111  
112  
113      def decodeLogInfo(self, fileName):
# Line 97 | Line 121 | class SchedulerCondor(SchedulerLocal) :
121          return reason
122  
123  
124 +    def wsCopyOutput(self):
125 +        """
126 +        Write a CopyResults part of a job script, e.g.
127 +        to copy produced output into a storage element.
128 +        """
129 +        txt = self.wsCopyOutput_comm()
130 +        return txt
131 +
132 +
133      def wsExitFunc(self):
134          """
135          Returns the part of the job script which runs prior to exit
# Line 111 | Line 144 | class SchedulerCondor(SchedulerLocal) :
144          txt += self.wsExitFunc_common()
145  
146          txt += '    tar zcvf ${out_files}.tgz  ${final_list}\n'
147 <        txt += '    cp  ${out_files}.tgz $ORIG_WD/\n'
148 <        txt += '    cp  crab_fjr_$NJob.xml $ORIG_WD/\n'
147 >        txt += '    cp  ${out_files}.tgz $_CONDOR_SCRATCH_DIR/\n'
148 >        txt += '    cp  crab_fjr_$NJob.xml $_CONDOR_SCRATCH_DIR/\n'
149  
150          txt += '    exit $job_exit_code\n'
151          txt += '}\n'
# Line 129 | Line 162 | class SchedulerCondor(SchedulerLocal) :
162          txt += 'printenv | sort\n'
163  
164          txt += 'middleware='+self.name()+' \n'
165 +        txt += 'if [ -e /opt/d-cache/srm/bin ]; then\n'
166 +        txt += '  export PATH=${PATH}:/opt/d-cache/srm/bin\n'
167 +        txt += 'fi\n'
168 +
169          txt += """
170   if [ $_CONDOR_SCRATCH_DIR ] && [ -d $_CONDOR_SCRATCH_DIR ]; then
171 <    ORIG_WD=`pwd`
135 <    echo "Change from $ORIG_WD to Condor scratch directory: $_CONDOR_SCRATCH_DIR"
171 >    echo "cd to Condor scratch directory: $_CONDOR_SCRATCH_DIR"
172      if [ -e ../default.tgz ] ;then
173        echo "Found ISB in parent directory (Local Condor)"
174        cp ../default.tgz $_CONDOR_SCRATCH_DIR

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines