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.12 by gutsche, Fri Sep 22 14:47:33 2006 UTC

# Line 58 | Line 58 | class DLSNoReplicas(exceptions.Exception
58   ##############################################################################
59  
60   class DLSInfo:
61 <    def __init__(self, type):
61 >    def __init__(self, type, cfg_params):
62 >        self.cfg_params = cfg_params
63 >        jobtype = self.cfg_params['CRAB.jobtype']
64 >        ##SL I don't like all this hardcoded and jobtype dependent info put here
65          if type=="DLS_TYPE_DLI":
66 <           endpoint="lfc-cms-test.cern.ch/grid/cms/DLS/LFCProto"
67 <           try:
68 <             import xml.dom.ext.reader
69 <           except:
70 <             crabdir=os.getenv('CRABDIR')
71 < ## Let the user set up PyXML by hand
72 <             msg="There is no setup of PyXML python module required by DLS (DLI). Do the following:\n"
73 <             msg+=" - check that in  %s/configure  the function configureDLSAPI is not commented \n"%crabdir
74 <             msg+=" - uncomment it and re-run the configuration :"
75 <             msg+="\n    cd %s\n"%crabdir
76 <             msg+="     ./configure\n"
77 <             msg+="     source crab.(c)sh\n"
78 <             raise CrabException(msg)
66 >            if jobtype.count('orca')>0:
67 >                endpoint="lfc-cms-test.cern.ch/grid/cms/DLS/LFCProto"
68 >            else:  
69 >                try:
70 >                    endpoint=self.cfg_params['CMSSW.dls_endpoint']
71 >                except KeyError:
72 >                    endpoint="prod-lfc-cms-central.cern.ch/grid/cms/DLS/LFC"
73 >
74 >            try:
75 >                import xml.dom.ext.reader
76 >            except:
77 >                crabdir=os.getenv('CRABDIR')
78 > ## Let the  user set up PyXML by hand
79 >                msg="There is no setup of PyXML python module required by DLS (DLI). Do the following:\n"
80 >                msg+=" - check that in  %s/configure  the function configureDLSAPI is not commented \n"%crabdir
81 >                msg+=" - uncomment it and re-run the configuration :"
82 >                msg+="\n    cd %s\n"%crabdir
83 >                msg+="     ./configure\n"
84 >                msg+="     source crab.(c)sh\n"
85 >                raise CrabException(msg)
86  
87          elif type=="DLS_TYPE_MYSQL":
88 <           endpoint="lxgate10.cern.ch:18081"
88 >            if jobtype.count('orca')>0:
89 >                endpoint="lfc-cms-test.cern.ch/grid/cms/DLS/LFCProto"
90 >            else:  
91 >                try:
92 >                    endpoint=self.cfg_params['CMSSW.dls_endpoint']
93 >                except KeyError:
94 >                    endpoint="lxgate10.cern.ch:18081"
95          else:
96 <           msg = "DLS type %s not among the supported DLS ( DLS_TYPE_DLI and DLS_TYPE_MYSQL ) "%type
97 <           raise CrabException(msg)
96 >            msg = "DLS type %s not among the supported DLS ( DLS_TYPE_DLI and DLS_TYPE_MYSQL ) "%type
97 >            raise CrabException(msg)
98  
99 +        common.logger.debug(5,"DLS interface: %s Server %s"%(type,endpoint))      
100          try:
101 <          self.api = dlsClient.getDlsApi(dls_type=type,dls_endpoint=endpoint)
101 >            self.api = dlsClient.getDlsApi(dls_type=type,dls_endpoint=endpoint)
102          except dlsApi.DlsApiError, inst:
103 <          msg = "Error when binding the DLS interface: %s  Server %s"%(str(inst),self.DLSServer_)
104 <          #print msg
105 <          raise CrabException(msg)
106 <
103 >            msg = "Error when binding the DLS interface: %s  Server %s"%(str(inst),self.DLSServer_)
104 >            #print msg
105 >            raise CrabException(msg)
106 >
107   # ####################################
108      def getReplicas(self,fileblocks):
109          """
# Line 94 | Line 111 | class DLSInfo:
111          """
112          ##
113          try:
114 <          entryList=self.api.getLocations([fileblocks])
114 >            entryList=self.api.getLocations([fileblocks])
115          except dlsApi.DlsApiError, inst:
116 <          msg = "Error in the DLS query: %s." % str(inst)
117 <          #print msg
118 <          raise DLSNoReplicas(fileblocks)
116 >            msg = "Error in the DLS query: %s." % str(inst)
117 >            #print msg
118 >            raise DLSNoReplicas(fileblocks)
119  
120          ListSites=[]
121          for entry in entryList:
122 <         for loc in entry.locations:
123 <           ListSites.append(str(loc.host))
122 >            for loc in entry.locations:
123 >                ListSites.append(str(loc.host))
124          if len(ListSites)<=0:
125 <          raise DLSNoReplicas(fileblocks)
125 >            raise DLSNoReplicas(fileblocks)
126  
127          return ListSites        

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines