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

Comparing COMP/CRAB/python/DLSInfo.py (file contents):
Revision 1.24 by spiga, Tue Nov 18 11:06:20 2008 UTC vs.
Revision 1.37 by spiga, Tue May 4 15:42:36 2010 UTC

# Line 17 | Line 17 | class DLSError:
17  
18   class DLSNoReplicas(exceptions.Exception):
19      def __init__(self, FileBlock):
20 <        self.args ="No replicas exists for fileblock: "+FileBlock+"\n"
20 >        self.args ="No replicas exists for fileblock: %s \n"%str(FileBlock)
21          exceptions.Exception.__init__(self, self.args)
22          pass
23  
# Line 38 | Line 38 | class DLSInfo:
38      def __init__(self, type, cfg_params):
39          self.cfg_params = cfg_params
40          self.showCAF = False
41 +        self.showProd = False
42 +        self.subscribed = False    
43 +        subscribed =int(self.cfg_params.get('CMSSW.subscribed', 0))  
44 +        if subscribed == 1: self.subscribed = True
45 +        showProd = int(self.cfg_params.get('CMSSW.show_prod', 0))
46 +        if showProd == 1: self.showProd = True
47 +
48 +        phedexURL='http://cmsweb.cern.ch/phedex/datasvc/xml/prod/'
49 +        global_url="http://cmsdbsprod.cern.ch/cms_dbs_prod_global/servlet/DBSServlet"
50 +
51          if type=="DLS_TYPE_DBS":
52              # use dbs_url as dls_endpoint if dls_type is dbs
53 <            try:
44 <                endpoint=self.cfg_params['CMSSW.dbs_url']
45 <            except KeyError:
46 <                endpoint="http://cmsdbsprod.cern.ch/cms_dbs_prod_global/servlet/DBSServlet"
53 >            endpoint=self.cfg_params.get('CMSSW.dbs_url', global_url)
54          elif type=="DLS_TYPE_PHEDEX":
55 <            try:
49 <                endpoint=self.cfg_params['CMSSW.dls_phedex_url']
50 <            except KeyError:
51 <                endpoint='http://cmsweb.cern.ch/phedex/datasvc/xml/prod/'
55 >            endpoint=self.cfg_params.get('CMSSW.dls_phedex_url',phedexURL)
56              if self.cfg_params['CRAB.scheduler'].upper() == 'CAF':  self.showCAF = True
57          else:
58              msg = "DLS type %s not among the supported DLS ( DLS_TYPE_DLI and DLS_TYPE_MYSQL ) "%type
59              raise CrabException(msg)
60 <        common.logger.debug(5,"DLS interface: %s Server %s"%(type,endpoint))      
60 >        common.logger.debug("DLS interface: %s Server %s"%(type,endpoint))      
61          try:
62              self.api = dlsClient.getDlsApi(dls_type=type,dls_endpoint=endpoint)
63          except dlsApi.DlsApiError, inst:
64              msg = "Error when binding the DLS interface: %s  Server %s"%(str(inst),endpoint)
65              #print msg
66              raise CrabException(msg)
63
67  
68      def getReplicasBulk(self,fileblocks):
69          """
70          query DLS to get replicas
71 <        """
71 >        """              
72          ##
73          try:
74 <            entryList=self.api.getLocations(fileblocks,longList=True)
74 >            entryList=self.api.getLocations(fileblocks,longList=True,showCAF=self.showCAF,showProd=self.showProd,subscribed=self.subscribed)
75          except dlsApi.DlsApiError, inst:
76              raise DLSNoReplicas(fileblocks)
77          results = {}
# Line 77 | Line 80 | class DLSInfo:
80              for loc in entry.locations:
81                  ListSites.append(str(loc.host))
82              if len(ListSites)<=0:
83 <                raise DLSNoReplicas(fileblocks)
83 >                msg ="No replicas exists for fileblock: %s \n"%str(fileblocks)
84 >                raise CrabException(msg)
85              results[entry.fileBlock.name]=ListSites
86  
87          return results        
# Line 88 | Line 92 | class DLSInfo:
92          """
93          ##
94          try:
95 <            entryList=self.api.getLocations([fileblocks],showCAF=self.showCAF)
95 >            entryList=self.api.getLocations([fileblocks],showCAF=self.showCAF,subscribed=self.subscribed)
96          except dlsApi.DlsApiError, inst:
97              raise DLSNoReplicas(fileblocks)
98  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines