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

Comparing COMP/CRAB/python/SchedulerPbs.py (file contents):
Revision 1.1 by mcinquil, Thu Oct 8 15:15:17 2009 UTC vs.
Revision 1.2 by farinafa, Tue May 11 13:39:50 2010 UTC

# Line 41 | Line 41 | class SchedulerPbs(SchedulerLocal) :
41          else:
42              common.logger.info(" The default queue of local PBS configuration will be used")
43  
44        #self.return_data = cfg_params.get('USER.return_data', 0)
45        #self.copy_data   = cfg_params.get("USER.copy_data", 0)
46
47        #if ( int(self.return_data) == 0 and int(self.copy_data) == 0 ):
48        #    msg = 'Error: return_data and copy_data cannot be set both to 0\n'
49        #    msg = msg + 'Please modify your crab.cfg file\n'
50        #    raise CrabException(msg)
51
52        #if ( int(self.return_data) == 1 and int(self.copy_data) == 1 ):
53        #    msg = 'Error: return_data and copy_data cannot be set both to 1\n'
54        #    msg = msg + 'Please modify your crab.cfg file\n'
55        #    raise CrabException(msg)
56
57        #if ( int(self.copy_data) == 0 and int(self.publish_data) == 1 ):
58        #    msg = 'Warning: publish_data = 1 must be used with copy_data = 1\n'
59        #    msg = msg + 'Please modify copy_data value in your crab.cfg file\n'
60        #    common.logger.info(msg)
61        #    raise CrabException(msg)
62
63        #if int(self.copy_data) == 1:
64        #    self.SE = cfg_params.get('USER.storage_element', None)
65        #    if not self.SE:
66        #        msg = "Error. The [USER] section has no 'storage_element'"
67        #        common.logger.info(msg)
68        #        raise CrabException(msg)
69
70        #    self.proxyValid = 0
71        #    self.dontCheckProxy = int(cfg_params.get("GRID.dont_check_proxy",0))
72        #    self.proxyServer = cfg_params.get("GRID.proxy_server",'myproxy.cern.ch')
73        #    common.logger.debug('Setting myproxy server to ' + self.proxyServer)
74
75        #    self.group = cfg_params.get("GRID.group", None)
76        #    self.role  = cfg_params.get("GRID.role", None)
77        #    self.VO    = cfg_params.get('GRID.virtual_organization', 'cms')
78
79        #    self.checkProxy()
80
44          return
45  
46  
# Line 95 | Line 58 | class SchedulerPbs(SchedulerLocal) :
58          params={'jobScriptDir':common.work_space.jobDir(),
59                  'jobResDir':common.work_space.resDir()
60                 }
98 #                'use_proxy': 0}
61  
62          for s in ('resources', 'queue'):
63              params.update({s:cfg_params.get(self.name().upper()+'.'+s,'')})
64  
103        #if 'PBS.use_proxy' in cfg_params:
104        #    if cfg_params['PBS.use_proxy'] == "1" or cfg_params['PBS.use_proxy'] == "0":
105        #        params['use_proxy'] = int(cfg_params['PBS.use_proxy'])
106        #        if params['use_proxy'] == 1:
107        #            import os
108        #            params['user_proxy'] = os.path.join(params['jobScriptDir'],'pbs_proxy')
109
65          return params
66  
67      def listMatch(self, dest, full):

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines