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

Comparing COMP/CRAB/python/PhEDExDatasvcInfo.py (file contents):
Revision 1.9 by spiga, Fri Oct 10 14:38:00 2008 UTC vs.
Revision 1.17 by spiga, Sat Nov 22 12:01:33 2008 UTC

# Line 15 | Line 15 | class PhEDExDatasvcInfo:
15          self.datasvc_url = cfg_params.get("USER.datasvc_url",url)
16  
17          self.FacOps_savannah = 'https://savannah.cern.ch/support/?func=additem&group=cmscompinfrasup'
18 <
18 >        stage_out_faq='https://twiki.cern.ch/twiki/bin/view/CMS/SWGuideCrabFaq#How_to_store_output_with_CRAB_2'
19 >        self.dataPub_faq = 'https://twiki.cern.ch/twiki/bin/view/CMS/SWGuideCrabForPublication'
20  
21          self.srm_version = cfg_params.get("USER.srm_version",'srmv2')
22          self.node = cfg_params.get('USER.storage_element',None)
23          
24 +
25 +
26 +        self.user_lfn = cfg_params.get("USER.lfn",'')
27          self.publish_data = cfg_params.get("USER.publish_data",0)
28          self.usenamespace = cfg_params.get("USER.usenamespace",0)
29 <        self.user_remote_dir = cfg_params.get("USER.remote_dir",'')
29 >        self.user_remote_dir = cfg_params.get("USER.user_remote_dir",'')
30          if self.user_remote_dir:
31              if ( self.user_remote_dir[-1] != '/' ) : self.user_remote_dir = self.user_remote_dir + '/'
32 <            
32 >        if self.user_lfn:    
33 >            msg  = 'Warning: lfn has been deprecated, CRAB will ignore it.\n'
34 >            msg += '\t Please use only user_remote_dir removing lfn from your crab.cfg\n'
35 >            msg += '\t For further information please visit : \n\t%s'%stage_out_faq
36 >            common.logger.message(msg)
37 >          
38          self.datasetpath = cfg_params.get("CMSSW.datasetpath")
39          self.publish_data_name = cfg_params.get('USER.publish_data_name','')
40  
32        self.user_lfn = cfg_params.get("USER.lfn",'')
33        if self.user_lfn:
34            if ( self.user_lfn[-1] != '/' ) : self.user_lfn = self.user_lfn + '/'
35            
41          self.user_port = cfg_params.get("USER.storage_port",'8443')
42          self.user_se_path = cfg_params.get("USER.storage_path",'')
43          if self.user_se_path:
44              if ( self.user_se_path[-1] != '/' ) : self.user_se_path = self.user_se_path + '/'
45                                                      
41      
46          #check if using "private" Storage
47          self.usePhedex = True
48 +        if not self.node :
49 +            msg = 'Please specify the storage_element name in your crab.cfg section [USER].\n'
50 +            msg +='\tFor further information please visit : %s'%stage_out_faq
51 +            raise CrabException(msg)
52          if (self.node.find('T1_') + self.node.find('T2_')+self.node.find('T3_')) == -3: self.usePhedex = False
53 <        if not self.usePhedex and ( self.user_lfn == '' or self.user_se_path == '' ):
53 >
54 >        if not self.usePhedex and ( self.user_remote_dir == '' or self.user_se_path == '' ):
55              msg = 'You are asking to stage out without using CMS Storage Name convention. In this case you \n'
56 <            msg += '      must specify both lfn and storage_path in the crab.cfg section [USER].\n '
57 <            msg += '      For further information please visit: ADD_TWIKI_LINK'
56 >            msg += '\t must specify both user_remote_dir and storage_path in the crab.cfg section [USER].\n '
57 >            msg += '\t For further information please visit : \n\t%s'%stage_out_faq
58              raise CrabException(msg)
59          self.sched = common.scheduler.name().upper()
60          self.protocol = self.srm_version
61          if self.sched in ['CAF','LSF']:self.protocol = 'direct'
62  
63 +        self.forced_path = '/store/user/'
64 +        if not self.usePhedex:
65 +            self.forced_path = self.user_remote_dir
66          return
67  
68      def getEndpoint(self):  
# Line 78 | Line 90 | class PhEDExDatasvcInfo:
90              if self.protocol == 'direct':
91                  query=endpoint
92                  SE_PATH = endpoint
81                ### FEDE added SE ###
93                  SE = self.sched
94              else:
95                  url = 'http://'+endpoint.split('://')[1]
# Line 90 | Line 101 | class PhEDExDatasvcInfo:
101              USER = (query.split('user')[1]).split('/')[1]
102          else:
103              SE = self.node
104 <            SE_PATH = self.user_se_path + self.user_lfn
104 >            SE_PATH = self.user_se_path + self.user_remote_dir
105              try:
106                  USER = (self.lfn.split('user')[1]).split('/')[1]
107              except:
# Line 110 | Line 121 | class PhEDExDatasvcInfo:
121              ## check if storage_name is a T2 (siteDB query)
122              ## if yes :match self.user_lfn with LFNBaseName...
123              ##     if NOT : raise (you are using a T2. It's not allowed stage out into self.user_path+self.user_lfn)  
124 <            lfn = self.user_lfn
124 >            lfn = self.user_remote_dir
125              return lfn
126          if self.publish_data_name == '' and int(self.publish_data) == 1:
127 <            msg = "Eeror. The [USER] section does not have 'publish_data_name'"
127 >            msg = "Error. The [USER] section does not have 'publish_data_name'\n"
128 >            msg += '\tFor further information please visit : \n\t%s'%self.dataPub_faq
129              raise CrabException(msg)
130          if self.publish_data_name == '' and int(self.usenamespace) == 1:
131             self.publish_data_name = "DefaultDataset"
132          if int(self.publish_data) == 1 or int(self.usenamespace) == 1:
133              if self.sched in ['CAF']: l_User=True
134              primaryDataset = self.computePrimaryDataset()
135 <            lfn = LFNBase(primaryDataset,self.publish_data_name,LocalUser=l_User)  + '/${PSETHASH}/'    
135 >            lfn = LFNBase(self.forced_path, primaryDataset, self.publish_data_name, LocalUser=l_User)  + '/${PSETHASH}/'    
136          else:
137              if self.sched in ['CAF','LSF']: l_User=True
138 <            lfn = LFNBase(self.user_remote_dir,LocalUser=l_User)
138 >            lfn = LFNBase(self.forced_path,self.user_remote_dir,LocalUser=l_User)
139          return lfn
140  
141      def computePrimaryDataset(self):
# Line 211 | Line 223 | class PhEDExDatasvcInfo:
223                  msg+='       OriginalSubmission: stageout path is not retrieved from %s \n'%fullurl
224                  raise CrabException(msg)
225          else:
226 <            stageoutpfn = 'srm://'+self.node+':'+self.user_port+self.user_se_path+self.lfn
226 >            if self.sched in ['CAF','LSF'] :
227 >                stageoutpfn = self.user_se_path+self.lfn
228 >            else:
229 >                stageoutpfn = 'srm://'+self.node+':'+self.user_port+self.user_se_path+self.lfn
230  
231          return stageoutpfn
232  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines