Changeset 4966

Timestamp:

12/02/09 17:36:02 (12 years ago)

Author:

cbyrom

Message:

Add failsave for sporadic eXist failures - retry query three times
if an xmlrpclib.Failure is thrown since this really shouldn't be.

File:

• ndgCommon/trunk/ndg/common/src/clients/xmldb/eXist/xmlrpcclient.py (modified) (4 diffs)

ndgCommon/trunk/ndg/common/src/clients/xmldb/eXist/xmlrpcclient.py

@@ -8 +8 @@
 import dbconstants as dc
 from xml.etree import cElementTree as ET
-from ndg.common.src.lib.ETxmlView import et2text
 from ndg.common.src.clients.xmldb.interfacexmldbclient import InterfaceXMLDBClient
 
@@ -25 +24 @@
         @keyword port: Port to access DB on.  Default, '8080'
         '''
-        logging.debug("Setting up xmlrpc connection to eXist")
+        logging.debug("Initialising XMLRPCClient")
         self.xmlrpc = self.__getXMLRPCConnection(host, userID, pw, 
                                                  basePath, xmlrpcBasePath, port)
-        logging.debug("Xml-rpc connection to eXist set up")
+        logging.debug("XMLRPCClient initialised")
 
 
@@ -98 +97 @@
                 # set to arbitrary big number
                 noResults = 100000
-            return self.__executeChunkedQuery(xquery, offset, noResults, params)
+                
+            result = None
+            attempt = 0
+            while not result:
+                try:
+                    result = self.__executeChunkedQuery(xquery, offset, 
+                                                        noResults, params)
+                except xmlrpclib.Fault, f:
+                    if attempt < 3:
+                        attempt += 1
+                        logging.error("XMLRPCLib Fault caught - retrying xquery (attempt %s)" %attempt)
+                        continue
+                    else:
+                        logging.error("Retry limit exceeded - giving up")
+                        raise f
         
         id, summary = self.__executeQuery(xquery, params)
@@ -147 +160 @@
         results=[]
         for el in x.getchildren():
-            results.append(et2text(el))
+            results.append(ET.tostring(el))
         
         logging.debug("XQuery executed")