ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/SchedulerSge.py
(Generate patch)

Comparing COMP/CRAB/python/SchedulerSge.py (file contents):
Revision 1.4 by spiga, Sat Mar 7 16:40:03 2009 UTC vs.
Revision 1.5 by ewv, Mon Mar 9 15:56:26 2009 UTC

# Line 27 | Line 27 | class SchedulerSge(SchedulerLocal) :
27  
28          #self.role = cfg_params.get("EDG.role", None)
29          self.role = None
30 <        
30 >
31          self.pool = cfg_params.get('USER.storage_pool',None)
32          ## default is 48 hours CPU time, 2G memrory
33          self.cpu = cfg_params.get('USER.cpu',172800)
34          self.vmem = cfg_params.get('USER.vmem',2)
35          return
36  
37 <    def Env_uniqueId(self):
37 >    def envUniqueID(self):
38          id = "https://"+common.scheduler.name()+":/${JOB_ID}-"+ \
39              string.replace(common._db.queryTask('name'),"_","-")
40          return id
41  
42      def realSchedParams(self,cfg_params):
43          """
44 <        Return dictionary with specific parameters, to use
45 <        with real scheduler  
44 >        Return dictionary with specific parameters, to use
45 >        with real scheduler
46          """
47          params = {}
48          return  params
# Line 89 | Line 89 | class SchedulerSge(SchedulerLocal) :
89          txt += self.wsExitFunc_common()
90  
91          txt += '    cp ${SGE_STDOUT_PATH} CMSSW_${NJob}.stdout \n'
92 <        txt += '    cp ${SGE_STDERR_PATH} CMSSW_${NJob}.stderr \n'        
92 >        txt += '    cp ${SGE_STDERR_PATH} CMSSW_${NJob}.stderr \n'
93          txt += '    tar zcvf ${out_files}.tgz  ${filesToCheck}\n'
94          txt += '    exit $job_exit_code\n'
95          txt += '}\n'
# Line 98 | Line 98 | class SchedulerSge(SchedulerLocal) :
98  
99      def listMatch(self, dest, full):
100          """
101 <        """
102 <        #if len(dest)!=0:
101 >        """
102 >        #if len(dest)!=0:
103          sites = [self.blackWhiteListParser.cleanForBlackWhiteList(dest,'list')]
104 <        #else:    
105 <        #    sites = [str(getLocalDomain(self))]  
106 <        return sites    
104 >        #else:
105 >        #    sites = [str(getLocalDomain(self))]
106 >        return sites
107  
108      def wsCopyOutput(self):
109          txt=self.wsCopyOutput_comm(self.pool)
# Line 119 | Line 119 | class SchedulerSge(SchedulerLocal) :
119          tmp=tmp.rstrip(',')
120          tmp=tmp.rstrip(',')
121  
122 <            
122 >
123          return "/CN="+tmp.strip()

Diff Legend

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