Changeset 8e6fe4d for fedd/federation/protogeni_access.py

Timestamp:

Mar 5, 2010 4:58:48 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

c5b28bf

Parents:

444790d

Message:

checkpoint and SLSL error catching

File:

• fedd/federation/protogeni_access.py (modified) (2 diffs)

fedd/federation/protogeni_access.py

@@ -11 +11 @@
 
 from threading import *
+from M2Crypto.SSL import SSLError
 
 from util import *
@@ -881 +882 @@
             if not fn:
                 fn = po.path.rpartition('/')[2]
-            try:
-                conn = httplib.HTTPSConnection(po.hostname, port=po.port, 
-                        cert_file=cf, key_file=cf)
-                conn.putrequest('GET', po.path)
-                conn.endheaders()
-                response = conn.getresponse()
-
-                lf = open("%s/%s" % (destdir, fn), "w")
-                buf = response.read(4096)
-                while buf:
-                    lf.write(buf)
+            retries = 0
+            ok = False
+            while not ok and retries < 5:
+                try:
+                    conn = httplib.HTTPSConnection(po.hostname, port=po.port, 
+                            cert_file=cf, key_file=cf)
+                    conn.putrequest('GET', po.path)
+                    conn.endheaders()
+                    response = conn.getresponse()
+
+                    lf = open("%s/%s" % (destdir, fn), "w")
                     buf = response.read(4096)
-                lf.close()
-            except IOError, e:
-                print e
+                    while buf:
+                        lf.write(buf)
+                        buf = response.read(4096)
+                    lf.close()
+                    ok = True
+                except IOError, e:
+                    print e
+                    raise service_error(service_error.internal,
+                            "Error writing tempfile: %s" %e)
+                except httplib.HTTPException, e:
+                    print e
+                    raise service_error(service_error.internal, 
+                            "Error retrieving data: %s" % e)
+                except SSLError, e:
+                    print "SSL error %s" %e
+                    retries += 1
+
+            if retries > 5:
                 raise service_error(service_error.internal,
-                        "Error writing tempfile: %s" %e)
-            except httplib.HTTPException, e:
-                print e
-                raise service_error(service_error.internal, 
-                        "Error retrieving data: %s" % e)
+                        "Repeated SSL failures")
+
 
         configs = set(('hosts', 'ssh_pubkey', 'ssh_secretkey'))