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.9.4.1 by spiga, Wed Sep 13 17:32:42 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 60 | Line 48 | class DLSNoReplicas(exceptions.Exception
48   class DLSInfo:
49      def __init__(self, type, cfg_params):
50          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
51          if type=="DLS_TYPE_DLI":
52 <            if jobtype.count('orca')>0:
53 <                endpoint="lfc-cms-test.cern.ch/grid/cms/DLS/LFCProto"
54 <            else:  
55 <                try:
70 <                    endpoint=self.cfg_params['CMSSW.dls_endpoint']
71 <                except KeyError:
72 <                    endpoint="lfc-cms-test.cern.ch/grid/cms/DLS/LFC"
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
# Line 85 | Line 68 | class DLSInfo:
68                  raise CrabException(msg)
69  
70          elif type=="DLS_TYPE_MYSQL":
71 <            if jobtype.count('orca')>0:
72 <                endpoint="lfc-cms-test.cern.ch/grid/cms/DLS/LFCProto"
73 <            else:  
74 <                try:
92 <                    endpoint=self.cfg_params['CMSSW.dls_endpoint']
93 <                except KeyError:
94 <                    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)
# Line 100 | Line 80 | class DLSInfo:
80          try:
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_)
83 >            msg = "Error when binding the DLS interface: %s  Server %s"%(str(inst),endpoint)
84              #print msg
85              raise CrabException(msg)
86  
# Line 113 | Line 93 | class DLSInfo:
93          try:
94              entryList=self.api.getLocations([fileblocks])
95          except dlsApi.DlsApiError, inst:
96 <            msg = "Error in the DLS query: %s." % str(inst)
96 >            #msg = "Error in the DLS query: %s." % str(inst)
97              #print msg
98              raise DLSNoReplicas(fileblocks)
99  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines