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.13 by slacapra, Wed Sep 27 14:17:57 2006 UTC vs.
Revision 1.18 by slacapra, Fri Nov 16 11:09:31 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)
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)
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 >        self.args ="No replicas exists for fileblock: "+FileBlock+"\n"
32 >        exceptions.Exception.__init__(self, self.args)
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
51 <        jobtype = self.cfg_params['CRAB.jobtype']
52 <        if type=="DLS_TYPE_DLI":
51 >        if type=="DLS_TYPE_DBS":
52 >            #
53 >            # use dbs_url as dls_endpoint if dls_type is dbs
54 >            #
55              try:
56 <                endpoint=self.cfg_params['CMSSW.dls_endpoint']
56 >                endpoint=self.cfg_params['CMSSW.dbs_url']
57              except KeyError:
58 <                endpoint="prod-lfc-cms-central.cern.ch/grid/cms/DLS/LFC"
69 <
70 <            try:
71 <                import xml.dom.ext.reader
72 <            except:
73 <                crabdir=os.getenv('CRABDIR')
74 < ## Let the  user set up PyXML by hand
75 <                msg="There is no setup of PyXML python module required by DLS (DLI). Do the following:\n"
76 <                msg+=" - check that in  %s/configure  the function configureDLSAPI is not commented \n"%crabdir
77 <                msg+=" - uncomment it and re-run the configuration :"
78 <                msg+="\n    cd %s\n"%crabdir
79 <                msg+="     ./configure\n"
80 <                msg+="     source crab.(c)sh\n"
81 <                raise CrabException(msg)
82 <
83 <        elif type=="DLS_TYPE_MYSQL":
84 <            try:
85 <                endpoint=self.cfg_params['CMSSW.dls_endpoint']
86 <            except KeyError:
87 <                endpoint="lxgate10.cern.ch:18081"
58 >                endpoint="http://cmsdbsprod.cern.ch/cms_dbs_prod_global/servlet/DBSServlet"
59          else:
60              msg = "DLS type %s not among the supported DLS ( DLS_TYPE_DLI and DLS_TYPE_MYSQL ) "%type
61              raise CrabException(msg)
# Line 93 | Line 64 | class DLSInfo:
64          try:
65              self.api = dlsClient.getDlsApi(dls_type=type,dls_endpoint=endpoint)
66          except dlsApi.DlsApiError, inst:
67 <            msg = "Error when binding the DLS interface: %s  Server %s"%(str(inst),self.DLSServer_)
67 >            msg = "Error when binding the DLS interface: %s  Server %s"%(str(inst),endpoint)
68              #print msg
69              raise CrabException(msg)
70  
# Line 106 | Line 77 | class DLSInfo:
77          try:
78              entryList=self.api.getLocations([fileblocks])
79          except dlsApi.DlsApiError, inst:
80 <            msg = "Error in the DLS query: %s." % str(inst)
80 >            #msg = "Error in the DLS query: %s." % str(inst)
81              #print msg
82              raise DLSNoReplicas(fileblocks)
83  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines