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.8 by afanfani, Tue May 30 23:33:58 2006 UTC vs.
Revision 1.14 by slacapra, Wed Jan 17 18:17:58 2007 UTC

# Line 5 | Line 5 | from crab_exceptions import *
5   from crab_util import *
6   import common
7  
8 < try:
9 <    import dlsApi
10 <    import dlsClient
11 <    from dlsDataObjects import DlsLocation, DlsFileBlock, DlsEntry
12 < except:
13 <    try:
14 <        Crabpydir=commands.getoutput('which crab')
15 <        Topdir=string.replace(Crabpydir,'/python/crab','')
16 <        sys.path.append(Topdir+'/DLSAPI')
17 <        import dlsApi
18 <        import dlsClient
19 <        from dlsDataObjects import DlsLocation, DlsFileBlock, DlsEntry
20 <    except:
21 <        msg="ERROR no DLS API available"
22 <        raise CrabException(msg)
8 > import dlsApi
9 > import dlsClient
10 > from dlsDataObjects import DlsLocation, DlsFileBlock, DlsEntry
11                                                                                              
12   ## for python 2.2 add the pyexpat.so to PYTHONPATH
13   pythonV=sys.version.split(' ')[0]
14   if pythonV.find('2.2') >= 0 :
15 < Crabpydir=commands.getoutput('which crab')
16 < Topdir=string.replace(Crabpydir,'/python/crab','')
17 < extradir=Topdir+'/DLSAPI/extra'
18 < if sys.path.count(extradir) <= 0:
19 <   if os.path.exists(extradir):
20 <    sys.path.insert(0, extradir)
15 >    Crabpydir=commands.getoutput('which crab')
16 >    Topdir=string.replace(Crabpydir,'/python/crab','')
17 >    extradir=Topdir+'/DLSAPI/extra'
18 >    if sys.path.count(extradir) <= 0:
19 >         if os.path.exists(extradir):
20 >            sys.path.insert(0, extradir)
21  
22  
23   class DLSError:
# Line 40 | Line 28 | class DLSError:
28  
29   class DLSNoReplicas(exceptions.Exception):
30      def __init__(self, FileBlock):
31 <        args ="No replicas exists for fileblock: "+FileBlock+"\n"
32 <        exceptions.Exception.__init__(self, args)
31 >        exceptions.Exception.__init__(self, self.args)
32 >        self.args ="No replicas exists for fileblock: "+FileBlock+"\n"
33          pass
34  
35      def getClassName(self):
# Line 58 | Line 46 | class DLSNoReplicas(exceptions.Exception
46   ##############################################################################
47  
48   class DLSInfo:
49 <    def __init__(self, type):
49 >    def __init__(self, type, cfg_params):
50 >        self.cfg_params = cfg_params
51          if type=="DLS_TYPE_DLI":
52 <           endpoint="lfc-cms-test.cern.ch/grid/cms/DLS/LFCProto"
53 <           try:
54 <             import xml.dom.ext.reader
55 <           except:
56 <             crabdir=os.getenv('CRABDIR')
57 < ## Let the user set up PyXML by hand
58 <             msg="There is no setup of PyXML python module required by DLS (DLI). Do the following:\n"
59 <             msg+=" - check that in  %s/configure  the function configureDLSAPI is not commented \n"%crabdir
60 <             msg+=" - uncomment it and re-run the configuration :"
61 <             msg+="\n    cd %s\n"%crabdir
62 <             msg+="     ./configure\n"
63 <             msg+="     source crab.(c)sh\n"
64 <             raise CrabException(msg)
52 >            try:
53 >                endpoint=self.cfg_params['CMSSW.dls_endpoint']
54 >            except KeyError:
55 >                endpoint="prod-lfc-cms-central.cern.ch/grid/cms/DLS/LFC"
56 >
57 >            try:
58 >                import xml.dom.ext.reader
59 >            except:
60 >                crabdir=os.getenv('CRABDIR')
61 > ## Let the  user set up PyXML by hand
62 >                msg="There is no setup of PyXML python module required by DLS (DLI). Do the following:\n"
63 >                msg+=" - check that in  %s/configure  the function configureDLSAPI is not commented \n"%crabdir
64 >                msg+=" - uncomment it and re-run the configuration :"
65 >                msg+="\n    cd %s\n"%crabdir
66 >                msg+="     ./configure\n"
67 >                msg+="     source crab.(c)sh\n"
68 >                raise CrabException(msg)
69  
70          elif type=="DLS_TYPE_MYSQL":
71 <           endpoint="lxgate10.cern.ch:18081"
71 >            try:
72 >                endpoint=self.cfg_params['CMSSW.dls_endpoint']
73 >            except KeyError:
74 >                endpoint="lxgate10.cern.ch:18081"
75          else:
76 <           msg = "DLS type %s not among the supported DLS ( DLS_TYPE_DLI and DLS_TYPE_MYSQL ) "%type
77 <           raise CrabException(msg)
76 >            msg = "DLS type %s not among the supported DLS ( DLS_TYPE_DLI and DLS_TYPE_MYSQL ) "%type
77 >            raise CrabException(msg)
78  
79 +        common.logger.debug(5,"DLS interface: %s Server %s"%(type,endpoint))      
80          try:
81 <          self.api = dlsClient.getDlsApi(dls_type=type,dls_endpoint=endpoint)
81 >            self.api = dlsClient.getDlsApi(dls_type=type,dls_endpoint=endpoint)
82          except dlsApi.DlsApiError, inst:
83 <          msg = "Error when binding the DLS interface: %s  Server %s"%(str(inst),self.DLSServer_)
84 <          #print msg
85 <          raise CrabException(msg)
86 <
83 >            msg = "Error when binding the DLS interface: %s  Server %s"%(str(inst),endpoint)
84 >            #print msg
85 >            raise CrabException(msg)
86 >
87   # ####################################
88      def getReplicas(self,fileblocks):
89          """
# Line 94 | Line 91 | class DLSInfo:
91          """
92          ##
93          try:
94 <          entryList=self.api.getLocations([fileblocks])
94 >            entryList=self.api.getLocations([fileblocks])
95          except dlsApi.DlsApiError, inst:
96 <          msg = "Error in the DLS query: %s." % str(inst)
97 <          #print msg
98 <          raise DLSNoReplicas(fileblocks)
96 >            #msg = "Error in the DLS query: %s." % str(inst)
97 >            #print msg
98 >            raise DLSNoReplicas(fileblocks)
99  
100          ListSites=[]
101          for entry in entryList:
102 <         for loc in entry.locations:
103 <           ListSites.append(str(loc.host))
102 >            for loc in entry.locations:
103 >                ListSites.append(str(loc.host))
104          if len(ListSites)<=0:
105 <          raise DLSNoReplicas(fileblocks)
105 >            raise DLSNoReplicas(fileblocks)
106  
107          return ListSites        

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines